From 8d49b4630214cba7ddf32fa1aae844cae5921d70 Mon Sep 17 00:00:00 2001 From: krishna Date: Tue, 23 Dec 2025 09:35:33 -0600 Subject: [PATCH] Initial changes --- helm/cedar/Chart.yaml | 2 +- helm/cedar/README.md | 5 +++-- helm/cedar/templates/cedar-client-create-job.yaml | 2 +- helm/cedar/templates/cronjob.yaml | 4 ++-- helm/cedar/values.yaml | 9 +++++---- helm/gen3/Chart.yaml | 6 +++--- helm/gen3/README.md | 6 +++--- helm/wts/Chart.yaml | 2 +- helm/wts/README.md | 3 ++- helm/wts/templates/wts-oidc.yaml | 2 +- helm/wts/values.yaml | 3 +++ 11 files changed, 25 insertions(+), 19 deletions(-) diff --git a/helm/cedar/Chart.yaml b/helm/cedar/Chart.yaml index 030080f26..bb6c0edb4 100644 --- a/helm/cedar/Chart.yaml +++ b/helm/cedar/Chart.yaml @@ -15,7 +15,7 @@ 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.18 +version: 0.1.19 # 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 diff --git a/helm/cedar/README.md b/helm/cedar/README.md index 34a2b5c50..a1dbc59da 100644 --- a/helm/cedar/README.md +++ b/helm/cedar/README.md @@ -1,6 +1,6 @@ # cedar -![Version: 0.1.18](https://img.shields.io/badge/Version-0.1.18-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square) +![Version: 0.1.19](https://img.shields.io/badge/Version-0.1.19-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square) A Helm chart for gen3 cedar wrapper @@ -74,7 +74,6 @@ A Helm chart for gen3 cedar wrapper | image.repository | string | `"quay.io/cdis/cedar"` | Docker repository. | | image.tag | string | `"master"` | Overrides the image tag whose default is the chart appVersion. | | imagePullSecrets | list | `[]` | Docker image pull secrets. | -| ingestion | map | `{"image":"quay.io/cdis/awshelper:master"}` | Cedar configuration for ingestion job. | | metricsEnabled | bool | `nil` | Whether Metrics are enabled. | | nameOverride | string | `""` | Override the name of the chart. | | nodeSelector | map | `{}` | Node Selector for the pods | @@ -103,4 +102,6 @@ A Helm chart for gen3 cedar wrapper | serviceAccount.annotations | map | `{}` | Annotations to add to the service account. | | serviceAccount.create | bool | `true` | Specifies whether a service account should be created. | | serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template | +| service_images_for_jobs.awshelper | string | `"master"` | | +| service_images_for_jobs.fence | string | `"master"` | | | tolerations | list | `[]` | Tolerations for the pods | diff --git a/helm/cedar/templates/cedar-client-create-job.yaml b/helm/cedar/templates/cedar-client-create-job.yaml index d190eab5d..7dd5913e9 100644 --- a/helm/cedar/templates/cedar-client-create-job.yaml +++ b/helm/cedar/templates/cedar-client-create-job.yaml @@ -26,7 +26,7 @@ spec: containers: - name: fence-client # TODO: Make this configurable - image: "quay.io/cdis/fence:master" + image: "quay.io/cdis/fence:{{ .Values.service_images_for_jobs.fence }}" imagePullPolicy: {{ .Values.image.pullPolicy }} # TODO: ADD RESOURCES # resources: diff --git a/helm/cedar/templates/cronjob.yaml b/helm/cedar/templates/cronjob.yaml index 79a076f89..8b881ef1c 100644 --- a/helm/cedar/templates/cronjob.yaml +++ b/helm/cedar/templates/cronjob.yaml @@ -51,7 +51,7 @@ spec: secretName: cedar-g3auto initContainers: - name: cedar - image: {{ .Values.ingestion.image | default "quay.io/cdis/awshelper:master" }} + image: quay.io/cdis/awshelper:{{ .Values.service_images_for_jobs.awshelper | default "master" }} imagePullPolicy: Always env: - name: HOSTNAME @@ -110,7 +110,7 @@ spec: fi containers: - name: awshelper - image: {{ .Values.ingestion.image | default "quay.io/cdis/awshelper:master" }} + image: quay.io/cdis/awshelper:{{ .Values.service_images_for_jobs.awshelper | default "master" }} imagePullPolicy: Always env: - name: slackWebHook diff --git a/helm/cedar/values.yaml b/helm/cedar/values.yaml index 62f5c2f23..38a33307f 100644 --- a/helm/cedar/values.yaml +++ b/helm/cedar/values.yaml @@ -109,10 +109,6 @@ externalSecrets: # -- (int) Number of replicas for the deployment. replicaCount: 1 -# -- (map) Cedar configuration for ingestion job. -ingestion: - image: "quay.io/cdis/awshelper:master" - # -- (map) Docker image information. image: # -- (string) Docker repository. @@ -216,3 +212,8 @@ commonLabels: # -- (map) Whether or not to deploy the cedar ingestion job. cedarIngestion: enabled: true + +# Values for the service images being used in cedar jobs +service_images_for_jobs: + fence: "master" + awshelper: "master" diff --git a/helm/gen3/Chart.yaml b/helm/gen3/Chart.yaml index 079015239..6fd718584 100644 --- a/helm/gen3/Chart.yaml +++ b/helm/gen3/Chart.yaml @@ -29,7 +29,7 @@ dependencies: repository: "file://../aws-es-proxy" condition: aws-es-proxy.enabled - name: cedar - version: 0.1.18 + version: 0.1.19 repository: "file://../cedar" condition: cedar.enabled - name: cohort-middleware @@ -120,7 +120,7 @@ dependencies: condition: sower.enabled repository: "file://../sower" - name: wts - version: 0.1.34 + version: 0.1.35 repository: "file://../wts" condition: wts.enabled - name: gen3-network-policies @@ -177,7 +177,7 @@ type: application # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.2.115 +version: 0.2.116 # 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 diff --git a/helm/gen3/README.md b/helm/gen3/README.md index 44d913d7d..709edafd8 100644 --- a/helm/gen3/README.md +++ b/helm/gen3/README.md @@ -1,6 +1,6 @@ # gen3 -![Version: 0.2.115](https://img.shields.io/badge/Version-0.2.115-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square) +![Version: 0.2.116](https://img.shields.io/badge/Version-0.2.116-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square) Helm chart to deploy Gen3 Data Commons @@ -24,7 +24,7 @@ Helm chart to deploy Gen3 Data Commons | file://../argo-wrapper | argo-wrapper | 0.1.23 | | file://../audit | audit | 0.1.35 | | file://../aws-es-proxy | aws-es-proxy | 0.1.35 | -| file://../cedar | cedar | 0.1.18 | +| file://../cedar | cedar | 0.1.19 | | file://../cohort-middleware | cohort-middleware | 0.1.16 | | file://../common | common | 0.1.29 | | file://../dashboard | dashboard | 0.1.13 | @@ -53,7 +53,7 @@ Helm chart to deploy Gen3 Data Commons | file://../sheepdog | sheepdog | 0.1.36 | | file://../sower | sower | 0.1.39 | | file://../ssjdispatcher | ssjdispatcher | 0.1.38 | -| file://../wts | wts | 0.1.34 | +| file://../wts | wts | 0.1.35 | | https://charts.bitnami.com/bitnami | postgresql | 11.9.13 | | https://helm.elastic.co | elasticsearch | 7.10.2 | diff --git a/helm/wts/Chart.yaml b/helm/wts/Chart.yaml index 78ac74393..0582e70ce 100644 --- a/helm/wts/Chart.yaml +++ b/helm/wts/Chart.yaml @@ -15,7 +15,7 @@ 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.34 +version: 0.1.35 # 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 diff --git a/helm/wts/README.md b/helm/wts/README.md index f9fd8e17f..4fc1895d9 100644 --- a/helm/wts/README.md +++ b/helm/wts/README.md @@ -1,6 +1,6 @@ # wts -![Version: 0.1.34](https://img.shields.io/badge/Version-0.1.34-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square) +![Version: 0.1.35](https://img.shields.io/badge/Version-0.1.35-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square) A Helm chart for gen3 workspace token service @@ -111,4 +111,5 @@ A Helm chart for gen3 workspace token service | serviceAccount.annotations | map | `{}` | Annotations to add to the service account. | | serviceAccount.create | bool | `true` | Specifies whether a service account should be created. | | serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template | +| service_images_for_jobs.fence | string | `"master"` | | | tolerations | list | `[]` | Tolerations for the pods | diff --git a/helm/wts/templates/wts-oidc.yaml b/helm/wts/templates/wts-oidc.yaml index c9b1aeeb9..b17900dd5 100644 --- a/helm/wts/templates/wts-oidc.yaml +++ b/helm/wts/templates/wts-oidc.yaml @@ -29,7 +29,7 @@ spec: containers: - name: fence-client # TODO: Make this configurable - image: "quay.io/cdis/fence:master" + image: "quay.io/cdis/fence:{{ .Values.service_images_for_jobs.fence }}" imagePullPolicy: {{ .Values.image.pullPolicy }} # TODO: ADD RESOURCES # resources: diff --git a/helm/wts/values.yaml b/helm/wts/values.yaml index c151480be..39182b1c1 100644 --- a/helm/wts/values.yaml +++ b/helm/wts/values.yaml @@ -161,6 +161,9 @@ oidc_client_id: oidc_client_secret: # -- (bool) Whether to enable OIDC job. You can disable after inital run to ensure oidc clients are created. oidc_job_enabled: true +# Values for the service images being used in wts jobs +service_images_for_jobs: + fence: "master" # -- (map) Service account to use or create. serviceAccount: