From 57d0765824b05b85b8a8f0550037bdc882d3ed0c Mon Sep 17 00:00:00 2001 From: Alan Walsh Date: Tue, 21 May 2024 17:08:49 -0400 Subject: [PATCH 1/5] Fix secret typos There are three small typos in the secrets template that impact the portal config during deployment. --- helm/portal/templates/secret.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/helm/portal/templates/secret.yaml b/helm/portal/templates/secret.yaml index 16a7c037..40f960d0 100644 --- a/helm/portal/templates/secret.yaml +++ b/helm/portal/templates/secret.yaml @@ -4,7 +4,7 @@ metadata: name: portal-config data: {{- if .Values.gitops.createdby }} - gitops-createdby: | + gitops-createdby.png: | {{- .Values.gitops.createdby | nindent 4 }} {{- else }} gitops-createdby: | @@ -19,10 +19,10 @@ data: {{- end }} {{- if .Values.gitops.favicon }} gitops-favicon.ico: | - {{- .Values.gitops.favicon | b64enc | nindent 4 }} + {{- .Values.gitops.favicon | nindent 4 }} {{- else }} gitops-favicon.ico: | - {{- (.Files.Get "defaults/gitops-favicon.ico" ) | nindent 4 }} + {{- (.Files.Get "defaults/gitops-favicon.ico" ) | b64enc) | nindent 4 }} {{- end }} {{- if .Values.gitops.json }} gitops.json: | From a3ca826842ca74d990fb6712e7f76b6427a5d696 Mon Sep 17 00:00:00 2001 From: Alan Walsh Date: Tue, 21 May 2024 17:13:08 -0400 Subject: [PATCH 2/5] Bump chart versions Bump chart versions for portal and Gen3 umbrella. --- helm/gen3/Chart.yaml | 4 ++-- helm/portal/Chart.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/helm/gen3/Chart.yaml b/helm/gen3/Chart.yaml index e8dd4e97..786efe60 100644 --- a/helm/gen3/Chart.yaml +++ b/helm/gen3/Chart.yaml @@ -68,7 +68,7 @@ dependencies: repository: "file://../pidgin" condition: pidgin.enabled - name: portal - version: 0.1.12 + version: 0.1.13 repository: "file://../portal" condition: portal.enabled - name: requestor @@ -119,7 +119,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.32 +version: 0.1.33 # 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/portal/Chart.yaml b/helm/portal/Chart.yaml index 52eed637..df75a44e 100644 --- a/helm/portal/Chart.yaml +++ b/helm/portal/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 From d8106cedb0e090d0306c62909f72463348a6980e Mon Sep 17 00:00:00 2001 From: Alan Walsh Date: Wed, 22 May 2024 10:08:02 -0400 Subject: [PATCH 3/5] Bump chart version(s) --- helm/gen3/Chart.yaml | 4 ++-- helm/portal/Chart.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/helm/gen3/Chart.yaml b/helm/gen3/Chart.yaml index 786efe60..cfed82f7 100644 --- a/helm/gen3/Chart.yaml +++ b/helm/gen3/Chart.yaml @@ -68,7 +68,7 @@ dependencies: repository: "file://../pidgin" condition: pidgin.enabled - name: portal - version: 0.1.13 + version: 0.1.14 repository: "file://../portal" condition: portal.enabled - name: requestor @@ -119,7 +119,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.33 +version: 0.1.34 # 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/portal/Chart.yaml b/helm/portal/Chart.yaml index df75a44e..012e78cf 100644 --- a/helm/portal/Chart.yaml +++ b/helm/portal/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.13 +version: 0.1.14 # 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 From 3155db4b804e9d3da2cfde75af79725b5099e08e Mon Sep 17 00:00:00 2001 From: Alan Walsh Date: Wed, 29 May 2024 14:32:50 -0400 Subject: [PATCH 4/5] Remove parens --- helm/portal/templates/secret.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/portal/templates/secret.yaml b/helm/portal/templates/secret.yaml index 40f960d0..f8bf3a7d 100644 --- a/helm/portal/templates/secret.yaml +++ b/helm/portal/templates/secret.yaml @@ -22,7 +22,7 @@ data: {{- .Values.gitops.favicon | nindent 4 }} {{- else }} gitops-favicon.ico: | - {{- (.Files.Get "defaults/gitops-favicon.ico" ) | b64enc) | nindent 4 }} + {{- (.Files.Get "defaults/gitops-favicon.ico" | b64enc) | nindent 4 }} {{- end }} {{- if .Values.gitops.json }} gitops.json: | From 6190d6db620f281f01e9ba0f5f4cf9846a49043b Mon Sep 17 00:00:00 2001 From: Alan Walsh Date: Wed, 29 May 2024 14:44:16 -0400 Subject: [PATCH 5/5] Suffix for second createdby --- helm/portal/templates/secret.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/portal/templates/secret.yaml b/helm/portal/templates/secret.yaml index f8bf3a7d..2a669ee4 100644 --- a/helm/portal/templates/secret.yaml +++ b/helm/portal/templates/secret.yaml @@ -7,7 +7,7 @@ data: gitops-createdby.png: | {{- .Values.gitops.createdby | nindent 4 }} {{- else }} - gitops-createdby: | + gitops-createdby.png: | {{- (.Files.Get "defaults/gitops-createdby.png" | b64enc) | nindent 4 }} {{- end }} {{- if .Values.gitops.css }}