From 83ab43b0bf59b12b5f3e4485ca696da2aa77c14d Mon Sep 17 00:00:00 2001 From: EliseCastle23 <109446148+EliseCastle23@users.noreply.github.com> Date: Mon, 9 Sep 2024 14:23:52 -0600 Subject: [PATCH] removing extraLabels from the overall deployment --- .secrets.baseline | 4 ++-- helm/gen3/Chart.yaml | 4 ++-- helm/gen3/README.md | 4 ++-- helm/sower/Chart.yaml | 2 +- helm/sower/README.md | 2 +- helm/sower/templates/deployment.yaml | 1 - helm/ssjdispatcher/Chart.yaml | 2 +- helm/ssjdispatcher/README.md | 2 +- helm/ssjdispatcher/templates/deployment.yaml | 1 - 9 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.secrets.baseline b/.secrets.baseline index 9ded372f..221322d3 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,7 @@ "files": "^.secrets.baseline$", "lines": null }, - "generated_at": "2024-09-06T15:19:06Z", + "generated_at": "2024-09-09T20:23:45Z", "plugins_used": [ { "name": "AWSKeyDetector" @@ -686,7 +686,7 @@ "hashed_secret": "d84ce25b0f9bc2cc263006ae39453efb22cc2900", "is_secret": false, "is_verified": false, - "line_number": 55, + "line_number": 54, "type": "Secret Keyword" }, { diff --git a/helm/gen3/Chart.yaml b/helm/gen3/Chart.yaml index 2171b621..a5b103f4 100644 --- a/helm/gen3/Chart.yaml +++ b/helm/gen3/Chart.yaml @@ -84,11 +84,11 @@ dependencies: repository: "file://../sheepdog" condition: sheepdog.enabled - name: ssjdispatcher - version: 0.1.10 + version: 0.1.11 repository: "file://../ssjdispatcher" condition: ssjdispatcher.enabled - name: sower - version: 0.1.12 + version: 0.1.13 condition: sower.enabled repository: "file://../sower" - name: wts diff --git a/helm/gen3/README.md b/helm/gen3/README.md index 125bd1ca..99d28c0f 100644 --- a/helm/gen3/README.md +++ b/helm/gen3/README.md @@ -39,8 +39,8 @@ Helm chart to deploy Gen3 Data Commons | file://../requestor | requestor | 0.1.12 | | file://../revproxy | revproxy | 0.1.17 | | file://../sheepdog | sheepdog | 0.1.15 | -| file://../sower | sower | 0.1.12 | -| file://../ssjdispatcher | ssjdispatcher | 0.1.10 | +| file://../sower | sower | 0.1.13 | +| file://../ssjdispatcher | ssjdispatcher | 0.1.11 | | file://../wts | wts | 0.1.14 | | https://charts.bitnami.com/bitnami | postgresql | 11.9.13 | | https://helm.elastic.co | elasticsearch | 7.10.2 | diff --git a/helm/sower/Chart.yaml b/helm/sower/Chart.yaml index a428ef00..5e6090aa 100644 --- a/helm/sower/Chart.yaml +++ b/helm/sower/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.12 +version: 0.1.13 # 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/sower/README.md b/helm/sower/README.md index ce3cb4ac..ff634448 100644 --- a/helm/sower/README.md +++ b/helm/sower/README.md @@ -1,6 +1,6 @@ # sower -![Version: 0.1.12](https://img.shields.io/badge/Version-0.1.12-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.13](https://img.shields.io/badge/Version-0.1.13-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 sower diff --git a/helm/sower/templates/deployment.yaml b/helm/sower/templates/deployment.yaml index 504bec5e..e051994d 100644 --- a/helm/sower/templates/deployment.yaml +++ b/helm/sower/templates/deployment.yaml @@ -10,7 +10,6 @@ spec: selector: matchLabels: {{- include "sower.selectorLabels" . | nindent 8 }} - {{- include "common.extraLabels" . | nindent 8 }} revisionHistoryLimit: 2 strategy: {{- toYaml .Values.strategy | nindent 8 }} diff --git a/helm/ssjdispatcher/Chart.yaml b/helm/ssjdispatcher/Chart.yaml index 2a0aa0b5..2e96e49d 100644 --- a/helm/ssjdispatcher/Chart.yaml +++ b/helm/ssjdispatcher/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.10 +version: 0.1.11 # 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/ssjdispatcher/README.md b/helm/ssjdispatcher/README.md index 1b15dcf0..2e476daf 100644 --- a/helm/ssjdispatcher/README.md +++ b/helm/ssjdispatcher/README.md @@ -1,6 +1,6 @@ # ssjdispatcher -![Version: 0.1.10](https://img.shields.io/badge/Version-0.1.10-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.11](https://img.shields.io/badge/Version-0.1.11-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 ssjdispatcher diff --git a/helm/ssjdispatcher/templates/deployment.yaml b/helm/ssjdispatcher/templates/deployment.yaml index 8c6ab9cb..f54e3029 100644 --- a/helm/ssjdispatcher/templates/deployment.yaml +++ b/helm/ssjdispatcher/templates/deployment.yaml @@ -8,7 +8,6 @@ spec: selector: matchLabels: {{- include "ssjdispatcher.selectorLabels" . | nindent 8 }} - {{- include "common.extraLabels" . | nindent 8 }} revisionHistoryLimit: 2 strategy: {{- toYaml .Values.strategy | nindent 8 }}