From 9285ff5907e9bed90f4837ea107aa1909b2dd050 Mon Sep 17 00:00:00 2001 From: Yoan Blanc Date: Thu, 27 Jun 2024 09:36:01 +0200 Subject: [PATCH 1/6] chore: bump Argo-CD from 7.2.1 to 7.3.2 Signed-off-by: Yoan Blanc --- charts/argo-cd/Chart.lock | 6 +++--- charts/argo-cd/Chart.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/argo-cd/Chart.lock b/charts/argo-cd/Chart.lock index 455570e3..66f33701 100644 --- a/charts/argo-cd/Chart.lock +++ b/charts/argo-cd/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: argo-cd repository: https://argoproj.github.io/argo-helm - version: 7.2.1 -digest: sha256:1e134760a6b90ce1ba197ee0a78d7b03fd2cf8bfe63b9275b3a7ae817e5ca836 -generated: "2024-06-24T09:27:25.012153+02:00" + version: 7.3.2 +digest: sha256:9f21368a338ed8683b3e232c8247019a492127d262a66f5e67e9363f6de23741 +generated: "2024-06-27T09:34:32.725756+02:00" diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 4ae92a9f..ac90adc2 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 0.0.11 +version: 0.0.12 dependencies: - name: argo-cd - version: 7.2.1 + version: 7.3.2 repository: https://argoproj.github.io/argo-helm From ab10aed124daaefb17fdefd5212c5959da9bf30f Mon Sep 17 00:00:00 2001 From: Yoan Blanc Date: Thu, 27 Jun 2024 09:53:22 +0200 Subject: [PATCH 2/6] fixup! chore: bump Argo-CD from 7.2.1 to 7.3.2 Signed-off-by: Yoan Blanc --- charts/argo-cd/values.yaml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 08446cbb..59b35283 100644 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -11,7 +11,17 @@ argo-cd: notifications: enabled: false applicationSet: - enabled: true + metrics: + enabled: true + serviceMonitor: + enabled: true + controller: + metrics: + enabled: true + serviceMonitor: + enabled: true + rules: + enabled: true server: ingress: enabled: true @@ -36,3 +46,7 @@ argo-cd: - hosts: - grpc.argo-cd.build.chorus-tre.local secretName: argocd-ingress-grpc + metrics: + enabled: true + serviceMonitor: + enabled: true From 9979cb1e8e3810829370aca9a7fe8167e2969693 Mon Sep 17 00:00:00 2001 From: Nathalie Casati Date: Fri, 28 Jun 2024 13:21:37 +0200 Subject: [PATCH 3/6] fix: added helm dependency build --- .github/workflows/helm-checks.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/helm-checks.yml b/.github/workflows/helm-checks.yml index 9fe7d09c..d4b2a6f1 100644 --- a/.github/workflows/helm-checks.yml +++ b/.github/workflows/helm-checks.yml @@ -46,6 +46,13 @@ jobs: helm lint $chart done + - name: Fetch missing dependencies + if: env.MODIFIED_CHARTS != '' + run: | + for chart in ${{ env.MODIFIED_CHARTS }}; do + helm dependency build $chart + done + - name: Run helm template if: env.MODIFIED_CHARTS != '' run: | From 3af30afc8747e4fd3128c7afdfc7462bb32eae8e Mon Sep 17 00:00:00 2001 From: Nathalie Casati Date: Fri, 28 Jun 2024 13:31:46 +0200 Subject: [PATCH 4/6] fix: added helm repos --- .github/workflows/helm-checks.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/helm-checks.yml b/.github/workflows/helm-checks.yml index d4b2a6f1..e8bec796 100644 --- a/.github/workflows/helm-checks.yml +++ b/.github/workflows/helm-checks.yml @@ -39,6 +39,21 @@ jobs: echo "MODIFIED_CHARTS=$MODIFIED_CHARTS" >> $GITHUB_ENV fi + - name: Add Helm repositories + if: env.MODIFIED_CHARTS != '' + run: | + for chart in ${{ env.MODIFIED_CHARTS }}; do + # Extract the repositories from Chart.yaml files + REPOS=$(grep 'repository:' $chart/Chart.yaml | awk '{print $2}' | sort -u) + + # Add each repository + for repo in $REPOS; do + helm repo add $(basename $repo) $repo + done + + # Update Helm repositories + helm repo update + - name: Run helm lint if: env.MODIFIED_CHARTS != '' run: | From db12831c4b815125f9b9e23f2fe3fbc4b4ab9aeb Mon Sep 17 00:00:00 2001 From: Nathalie Casati Date: Fri, 28 Jun 2024 13:39:44 +0200 Subject: [PATCH 5/6] fix: added helm repos --- .github/workflows/helm-checks.yml | 1 + charts/didata/values-dev.yaml | 130 ++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+) create mode 100644 charts/didata/values-dev.yaml diff --git a/.github/workflows/helm-checks.yml b/.github/workflows/helm-checks.yml index e8bec796..0d2f2601 100644 --- a/.github/workflows/helm-checks.yml +++ b/.github/workflows/helm-checks.yml @@ -50,6 +50,7 @@ jobs: for repo in $REPOS; do helm repo add $(basename $repo) $repo done + done # Update Helm repositories helm repo update diff --git a/charts/didata/values-dev.yaml b/charts/didata/values-dev.yaml new file mode 100644 index 00000000..debb0f13 --- /dev/null +++ b/charts/didata/values-dev.yaml @@ -0,0 +1,130 @@ +# Default values for didata. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + repository: registry.build.chorus-tre.ch/didata + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "6.2.21" + +env: + url: "https://didata.dev.chorus-tre.ch" + router_base: "/" + +secret: + env_path_source: "/var/didata/env/didata.env" + env_path_dest: "/var/www/html/.env" + +imagePullSecrets: [] +nameOverride: "" +fullnameOverride: "" + +serviceAccount: + # Specifies whether a service account should be created + create: true + # Automatically mount a ServiceAccount's API credentials? + automount: 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: {} +podLabels: {} + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +service: + type: ClusterIP + port: 80 # container port + targetPort: 80 # pod port + +ingress: + enabled: true + className: "" + ingressClassName: "nginx" + annotations: + cert-manager.io/cluster-issuer: "letsencrypt-prod" + hosts: + - host: didata.dev.chorus-tre.ch + paths: + - path: / + pathType: Prefix + tls: + - secretName: didata-tls + hosts: + - didata.dev.chorus-tre.ch + +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 + +#livenessProbe: +# httpGet: +# path: / +# port: http +#readinessProbe: +# httpGet: +# path: / +# port: http + +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +# Additional volumes on the output Deployment definition. +volumes: + - name: didata-logs + emptyDir: + persistentVolumeClaim: + claimName: didata-logs-pvc + - name: didata-user-storage + emptyDir: + persistentVolumeClaim: + claimName: didata-user-storage-pvc + - name: didata-env + secret: + secretName: didata-env + optional: false + +# Additional volumeMounts on the output Deployment definition. +volumeMounts: + - name: didata-logs + mountPath: "/var/www/html/storage/logs" + readOnly: false + - name: didata-user-storage + mountPath: "/var/www/html/storage/user-storage" + readOnly: false + - name: didata-env + mountPath: "/var/didata/env" + readOnly: true + +nodeSelector: {} + +tolerations: [] + +affinity: {} From 0a8869246668429e000f938e1949c5f5b6e711e3 Mon Sep 17 00:00:00 2001 From: Nathalie Casati Date: Fri, 28 Jun 2024 13:43:17 +0200 Subject: [PATCH 6/6] fix: too many files --- charts/didata/values-dev.yaml | 130 ---------------------------------- 1 file changed, 130 deletions(-) delete mode 100644 charts/didata/values-dev.yaml diff --git a/charts/didata/values-dev.yaml b/charts/didata/values-dev.yaml deleted file mode 100644 index debb0f13..00000000 --- a/charts/didata/values-dev.yaml +++ /dev/null @@ -1,130 +0,0 @@ -# Default values for didata. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -replicaCount: 1 - -image: - repository: registry.build.chorus-tre.ch/didata - pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: "6.2.21" - -env: - url: "https://didata.dev.chorus-tre.ch" - router_base: "/" - -secret: - env_path_source: "/var/didata/env/didata.env" - env_path_dest: "/var/www/html/.env" - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -serviceAccount: - # Specifies whether a service account should be created - create: true - # Automatically mount a ServiceAccount's API credentials? - automount: 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: {} -podLabels: {} - -podSecurityContext: {} - # fsGroup: 2000 - -securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -service: - type: ClusterIP - port: 80 # container port - targetPort: 80 # pod port - -ingress: - enabled: true - className: "" - ingressClassName: "nginx" - annotations: - cert-manager.io/cluster-issuer: "letsencrypt-prod" - hosts: - - host: didata.dev.chorus-tre.ch - paths: - - path: / - pathType: Prefix - tls: - - secretName: didata-tls - hosts: - - didata.dev.chorus-tre.ch - -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 - -#livenessProbe: -# httpGet: -# path: / -# port: http -#readinessProbe: -# httpGet: -# path: / -# port: http - -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -# Additional volumes on the output Deployment definition. -volumes: - - name: didata-logs - emptyDir: - persistentVolumeClaim: - claimName: didata-logs-pvc - - name: didata-user-storage - emptyDir: - persistentVolumeClaim: - claimName: didata-user-storage-pvc - - name: didata-env - secret: - secretName: didata-env - optional: false - -# Additional volumeMounts on the output Deployment definition. -volumeMounts: - - name: didata-logs - mountPath: "/var/www/html/storage/logs" - readOnly: false - - name: didata-user-storage - mountPath: "/var/www/html/storage/user-storage" - readOnly: false - - name: didata-env - mountPath: "/var/didata/env" - readOnly: true - -nodeSelector: {} - -tolerations: [] - -affinity: {}