Skip to content

Update Service Image for Gen3 Jobs #480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
krishnaa05 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update Service Image for Gen3 Jobs #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion helm/cedar/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions helm/cedar/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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 |
Expand Down Expand Up @@ -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 |
2 changes: 1 addition & 1 deletion helm/cedar/templates/cedar-client-create-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions helm/cedar/templates/cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions helm/cedar/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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"
6 changes: 3 additions & 3 deletions helm/gen3/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions helm/gen3/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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 |
Expand Down Expand Up @@ -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 |

Expand Down
2 changes: 1 addition & 1 deletion helm/wts/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion helm/wts/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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 |
2 changes: 1 addition & 1 deletion helm/wts/templates/wts-oidc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions helm/wts/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading