From fadd6425d856d3330afd79428775ae0a0c1b7c3c Mon Sep 17 00:00:00 2001 From: EliseCastle23 <109446148+EliseCastle23@users.noreply.github.com> Date: Fri, 6 Dec 2024 09:35:52 -0700 Subject: [PATCH] fixing syntax error, updating comment, and removing checksum for deleted configmap. --- helm/metadata/templates/deployment.yaml | 1 - helm/sower/README.md | 2 +- helm/sower/templates/external-secret.yaml | 6 +++--- helm/sower/values.yaml | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/helm/metadata/templates/deployment.yaml b/helm/metadata/templates/deployment.yaml index e4c6ee87..58e06603 100644 --- a/helm/metadata/templates/deployment.yaml +++ b/helm/metadata/templates/deployment.yaml @@ -25,7 +25,6 @@ spec: {{- include "metadata.selectorLabels" . | nindent 8 }} {{- include "common.extraLabels" . | nindent 8 }} annotations: - checksum/config: {{ include (print $.Template.BasePath "/metadata.yaml") . | sha256sum }} {{- if .Values.metricsEnabled }} {{- include "common.grafanaAnnotations" . | nindent 8 }} {{- end }} diff --git a/helm/sower/README.md b/helm/sower/README.md index daff94c0..1c7ea709 100644 --- a/helm/sower/README.md +++ b/helm/sower/README.md @@ -179,7 +179,7 @@ A Helm chart for gen3 sower | sowerConfig[1].restart_policy | string | `"Never"` | | | sowerConfig[1].volumes[0].name | string | `"pelican-creds-volume"` | | | sowerConfig[1].volumes[0].secret.secretName | string | `"pelicanservice-g3auto"` | | -| sowerjobsG3auto | string | `"{\n \"index-object-manifest\": {\n \"job_requires\": {\n \"arborist_url\": \"http://arborist-service\",\n \"job_access_req\": []\n },\n \"bucket\": \"$bucketName\",\n \"indexd_user\": \"diirm\",\n \"indexd_password\": \"$indexdPassword\"\n },\n \"download-indexd-manifest\": {\n \"job_requires\": {\n \"arborist_url\": \"http://arborist-service\",\n \"job_access_req\": []\n },\n \"bucket\": \"$bucketName\"\n },\n \"get-dbgap-metadata\": {\n \"job_requires\": {\n \"arborist_url\": \"http://arborist-service\",\n \"job_access_req\": []\n },\n \"bucket\": \"$bucketName\"\n },\n \"ingest-metadata-manifest\": {\n \"job_requires\": {\n \"arborist_url\": \"http://arborist-service\",\n \"job_access_req\": []\n },\n \"bucket\": \"$bucketName\"\n }\n}\n"` | Additional configuration for Sower Jobs Passed in as a multiline string. | +| sowerjobsG3auto | string | `"{\n \"index-object-manifest\": {\n \"job_requires\": {\n \"arborist_url\": \"http://arborist-service\",\n \"job_access_req\": []\n },\n \"bucket\": \"$bucketName\",\n \"indexd_user\": \"diirm\",\n \"indexd_password\": \"$indexdPassword\"\n },\n \"download-indexd-manifest\": {\n \"job_requires\": {\n \"arborist_url\": \"http://arborist-service\",\n \"job_access_req\": []\n },\n \"bucket\": \"$bucketName\"\n },\n \"get-dbgap-metadata\": {\n \"job_requires\": {\n \"arborist_url\": \"http://arborist-service\",\n \"job_access_req\": []\n },\n \"bucket\": \"$bucketName\"\n },\n \"ingest-metadata-manifest\": {\n \"job_requires\": {\n \"arborist_url\": \"http://arborist-service\",\n \"job_access_req\": []\n },\n \"bucket\": \"$bucketName\"\n }\n}\n"` | Additional configuration for Sower Jobs Passed in as a multiline string. This secret can be mounted in sowerConfig. | | strategy | map | `{"rollingUpdate":{"maxSurge":1,"maxUnavailable":0},"type":"RollingUpdate"}` | Rolling update deployment strategy | | strategy.rollingUpdate.maxSurge | int | `1` | Number of additional replicas to add during rollout. | | strategy.rollingUpdate.maxUnavailable | int | `0` | Maximum amount of pods that can be unavailable during the update. | diff --git a/helm/sower/templates/external-secret.yaml b/helm/sower/templates/external-secret.yaml index d6fd534b..5296a3d0 100644 --- a/helm/sower/templates/external-secret.yaml +++ b/helm/sower/templates/external-secret.yaml @@ -20,18 +20,18 @@ spec: apiVersion: external-secrets.io/v1beta1 kind: ExternalSecret metadata: - name: pelicanservice-g3auto + name: sower-jobs-g3auto spec: refreshInterval: 5m secretStoreRef: name: {{include "common.SecretStore" .}} kind: SecretStore target: - name: pelicanservice-g3auto + name: sower-jobs-g3auto creationPolicy: Owner data: - secretKey: config.json remoteRef: #name of secret in secrets manager - key: {{include "pelicanservice-g3auto" .}} + key: {{include "sower-jobs-g3auto" .}} {{- end }} \ No newline at end of file diff --git a/helm/sower/values.yaml b/helm/sower/values.yaml index 55cb4d58..6459520e 100644 --- a/helm/sower/values.yaml +++ b/helm/sower/values.yaml @@ -341,7 +341,7 @@ sowerConfig: secretName: pelicanservice-g3auto restart_policy: Never -# -- (string) Additional configuration for Sower Jobs Passed in as a multiline string. +# -- (string) Additional configuration for Sower Jobs Passed in as a multiline string. This secret can be mounted in sowerConfig. sowerjobsG3auto: | { "index-object-manifest": {