diff --git a/HelmCharts/mealie-chart/templates/mealie-deployment.yaml b/HelmCharts/mealie-chart/templates/mealie-deployment.yaml index 86e6beaf..feba7ebe 100644 --- a/HelmCharts/mealie-chart/templates/mealie-deployment.yaml +++ b/HelmCharts/mealie-chart/templates/mealie-deployment.yaml @@ -44,7 +44,8 @@ spec: value: "true" - name: TZ value: Europe/Madrid - image: hkotel/mealie:latest + image: hkotel/mealie:v0.5.0 + #image: hkotel/mealie:latest name: mealie ports: - containerPort: 80 diff --git a/HelmCharts/mealiev1/.helmignore b/HelmCharts/mealiev1/.helmignore new file mode 100644 index 00000000..0e8a0eb3 --- /dev/null +++ b/HelmCharts/mealiev1/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/HelmCharts/mealiev1/Chart.yaml b/HelmCharts/mealiev1/Chart.yaml new file mode 100644 index 00000000..8710b135 --- /dev/null +++ b/HelmCharts/mealiev1/Chart.yaml @@ -0,0 +1,24 @@ +apiVersion: v2 +name: mealie2 +description: A Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +# Versions are expected to follow Semantic Versioning (https://semver.org/) +version: 0.1.0 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. Versions are not expected to +# follow Semantic Versioning. They should reflect the version the application is using. +# It is recommended to use it with quotes. +appVersion: "1.16.0" diff --git a/Mealie/mealie-claim0-persistentvolumeclaim.yaml b/HelmCharts/mealiev1/templates/mealie-claim0-persistentvolumeclaim.yaml similarity index 74% rename from Mealie/mealie-claim0-persistentvolumeclaim.yaml rename to HelmCharts/mealiev1/templates/mealie-claim0-persistentvolumeclaim.yaml index fb378846..065b1d2f 100644 --- a/Mealie/mealie-claim0-persistentvolumeclaim.yaml +++ b/HelmCharts/mealiev1/templates/mealie-claim0-persistentvolumeclaim.yaml @@ -3,8 +3,8 @@ kind: PersistentVolumeClaim metadata: creationTimestamp: null labels: - io.kompose.service: mealie-claim0 - name: mealie-claim0 + io.kompose.service: mealiev1-claim0 + name: mealiev1-claim0 spec: accessModes: - ReadWriteOnce diff --git a/HelmCharts/mealiev1/templates/mealie-deployment.yaml b/HelmCharts/mealiev1/templates/mealie-deployment.yaml new file mode 100644 index 00000000..b8fbf3ee --- /dev/null +++ b/HelmCharts/mealiev1/templates/mealie-deployment.yaml @@ -0,0 +1,64 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + kompose.cmd: kompose convert + kompose.version: 1.26.0 (40646f47) + creationTimestamp: null + labels: + io.kompose.service: mealiev1 + name: mealiev1 +spec: + replicas: 1 + selector: + matchLabels: + io.kompose.service: mealiev1 + strategy: + type: Recreate + template: + metadata: + annotations: + kompose.cmd: kompose convert + kompose.version: 1.26.0 (40646f47) + creationTimestamp: null + labels: + io.kompose.service: mealiev1 + spec: + containers: + - name: mealiev1 + image: hkotel/mealie:latest + env: + - name: DB_ENGINE + value: "sqlite" + - name: POSTGRES_USER + value: "mealie" + - name: POSTGRES_PASSWORD + value: "mealie" + - name: POSTGRES_SERVER + value: "postgres" + - name: POSTGRES_PORT + value: "5432" + - name: POSTGRES_DB + value: "mealie" + - name: WEB_GUNICORN + value: "false" + - name: WORKERS_PER_CORE + value: "1" + - name: MAX_WORKERS + value: "1" + - name: WEB_CONCURRENCY + value: "1" + - name: TZ + value: Europe/Madrid + ports: + - containerPort: 80 + resources: {} + volumeMounts: + - mountPath: /app/data + name: mealiev1-claim0 + restartPolicy: Always + volumes: + - name: mealiev1-claim0 + persistentVolumeClaim: + claimName: mealiev1-claim0 +status: {} diff --git a/Mealie/mealie-service.yaml b/HelmCharts/mealiev1/templates/mealie-service.yaml similarity index 64% rename from Mealie/mealie-service.yaml rename to HelmCharts/mealiev1/templates/mealie-service.yaml index f1cb33ca..a8655236 100644 --- a/Mealie/mealie-service.yaml +++ b/HelmCharts/mealiev1/templates/mealie-service.yaml @@ -6,16 +6,16 @@ metadata: kompose.version: 1.26.0 (40646f47) creationTimestamp: null labels: - io.kompose.service: mealie - name: mealie + io.kompose.service: mealiev1 + name: mealiev1 spec: type: NodePort ports: - - name: "9925" - port: 9925 + - name: "9091" + port: 9091 nodePort: 30825 - targetPort: 80 + targetPort: 9000 selector: - io.kompose.service: mealie + io.kompose.service: mealiev1 status: loadBalancer: {} diff --git a/Mealie/pv-local-mealie.yaml b/HelmCharts/mealiev1/templates/pv-local-mealie.yaml similarity index 67% rename from Mealie/pv-local-mealie.yaml rename to HelmCharts/mealiev1/templates/pv-local-mealie.yaml index efaf1b64..654a8eca 100644 --- a/Mealie/pv-local-mealie.yaml +++ b/HelmCharts/mealiev1/templates/pv-local-mealie.yaml @@ -1,12 +1,12 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: mealie-folder + name: mealiev1-folder spec: capacity: storage: 10Gi accessModes: - ReadWriteOnce hostPath: - path: "/mnt/Externo/mealie/data" + path: "/mnt/Externo/mealiev1/data" diff --git a/HelmCharts/mealiev1/values.yaml b/HelmCharts/mealiev1/values.yaml new file mode 100644 index 00000000..aca913c9 --- /dev/null +++ b/HelmCharts/mealiev1/values.yaml @@ -0,0 +1,82 @@ +# Default values for mealie2. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + repository: nginx + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "" + +imagePullSecrets: [] +nameOverride: "" +fullnameOverride: "" + +serviceAccount: + # Specifies whether a service account should be created + create: true + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +podAnnotations: {} + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +service: + type: ClusterIP + port: 80 + +ingress: + enabled: false + className: "" + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + hosts: + - host: chart-example.local + paths: + - path: / + pathType: ImplementationSpecific + tls: [] + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + +resources: {} + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +nodeSelector: {} + +tolerations: [] + +affinity: {} diff --git a/Mealie/.secret b/Mealie/.secret deleted file mode 100644 index ce539a9b..00000000 --- a/Mealie/.secret +++ /dev/null @@ -1 +0,0 @@ -b172ba0373627f52305943b98ee8d93fad72ec4f8cfa72205edb878e58effb64 \ No newline at end of file diff --git a/Mealie/docker-compose.yml b/Mealie/docker-compose.yml deleted file mode 100644 index 94b919ae..00000000 --- a/Mealie/docker-compose.yml +++ /dev/null @@ -1,28 +0,0 @@ -version: "3.1" -services: - mealie: - container_name: mealie - image: hkotel/mealie:latest - restart: always - ports: - - 9925:80 - environment: - PUID: 1000 - PGID: 1000 - TZ: Europe/Madrid - - # Default Recipe Settings - RECIPE_PUBLIC: 'true' - RECIPE_SHOW_NUTRITION: 'true' - RECIPE_SHOW_ASSETS: 'true' - RECIPE_LANDSCAPE_VIEW: 'true' - RECIPE_DISABLE_COMMENTS: 'false' - RECIPE_DISABLE_AMOUNT: 'false' - - # Gunicorn - # WEB_CONCURRENCY: 2 - # WORKERS_PER_CORE: 0.5 - # MAX_WORKERS: 8 - volumes: - - /mnt/Externo/mealie/data/:/app/data - diff --git a/Mealie/mealie-deployment.yaml b/Mealie/mealie-deployment.yaml deleted file mode 100644 index 86e6beaf..00000000 --- a/Mealie/mealie-deployment.yaml +++ /dev/null @@ -1,60 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - kompose.cmd: kompose convert - kompose.version: 1.26.0 (40646f47) - creationTimestamp: null - labels: - io.kompose.service: mealie - name: mealie -spec: - replicas: 1 - selector: - matchLabels: - io.kompose.service: mealie - strategy: - type: Recreate - template: - metadata: - annotations: - kompose.cmd: kompose convert - kompose.version: 1.26.0 (40646f47) - creationTimestamp: null - labels: - io.kompose.service: mealie - spec: - containers: - - env: - - name: PGID - value: "1000" - - name: PUID - value: "1000" - - name: RECIPE_DISABLE_AMOUNT - value: "false" - - name: RECIPE_DISABLE_COMMENTS - value: "false" - - name: RECIPE_LANDSCAPE_VIEW - value: "true" - - name: RECIPE_PUBLIC - value: "true" - - name: RECIPE_SHOW_ASSETS - value: "true" - - name: RECIPE_SHOW_NUTRITION - value: "true" - - name: TZ - value: Europe/Madrid - image: hkotel/mealie:latest - name: mealie - ports: - - containerPort: 80 - resources: {} - volumeMounts: - - mountPath: /app/data - name: mealie-claim0 - restartPolicy: Always - volumes: - - name: mealie-claim0 - persistentVolumeClaim: - claimName: mealie-claim0 -status: {} diff --git a/Repostajes/templates/header.php b/Repostajes/templates/header.php index a81aa1a4..979f064a 100755 --- a/Repostajes/templates/header.php +++ b/Repostajes/templates/header.php @@ -4,7 +4,7 @@
- +