Merge branch 'main' into dev-msr-thr

SoftwareAG · Jun 25, 2024 · f3ef485 · f3ef485
2 parents 8219d49 + 9c47387
commit f3ef485
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 16 deletions.
diff --git a/.github/workflows/dry-run-test.yml b/.github/workflows/dry-run-test.yml
@@ -20,14 +20,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Generate Helm README Documentation with jnorwood
-        run: |
-          sudo docker run --rm --volume "$(pwd):/helm-docs" -u $(id -u) jnorwood/helm-docs:latest
-
-      - name: Remove README.md template files
-        run: |
-          find . -name "README.md.gotmpl" | xargs rm
-
       - name: Install Helm
         run: |
           curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
@@ -36,24 +28,30 @@ jobs:
 
       - name: Dry-run of apigateway
         run: |
-          helm template apigw apigateway/helm
+          helm dependencies update apigateway/helm
+          helm template apigw      apigateway/helm
 
       - name: Dry-run of developerportal
         run: |
-          helm template devportal developerportal/helm
+          helm dependencies update developerportal/helm
+          helm template devportal  developerportal/helm
 
       - name: Dry-run of microservicesruntime
         run: |
-          helm template msr microservicesruntime/helm
+          helm dependencies update microservicesruntime/helm
+          helm template msr        microservicesruntime/helm
 
       - name: Dry-run of mywebmethodsserver
         run: |
-          helm template mws mywebmethodsserver/helm
+          helm dependencies update mywebmethodsserver/helm
+          helm template mws        mywebmethodsserver/helm
 
       - name: Dry-run of universalmessaging
         run: |
-          helm template um universalmessaging/helm
+          helm dependencies update universalmessaging/helm
+          helm template um         universalmessaging/helm
 
       - name: Dry-run of terracottabigmemorymax
         run: |
-          helm template um terracottabigmemorymax/helm
+          helm dependencies update terracottabigmemorymax/helm
+          helm template tc         terracottabigmemorymax/helm
diff --git a/.github/workflows/gen-readme-values.yml b/.github/workflows/gen-readme-values.yml
@@ -36,9 +36,11 @@ jobs:
           sudo docker run --rm --volume "$(pwd):/helm-docs" -u $(id -u) jnorwood/helm-docs:latest
 
       - name: Push new generated README  
+        env:
+          CMT_MSG: ${{ github.event.head_commit.message }}
         run: |
           cd webmethods-helm-charts/
           git add .
-          git commit -am "${{ github.event.head_commit.message }} and updating helm/README.me from values.yaml"
+          git commit -am "$CMT_MSG and updating helm/README.me from values.yaml"
           git branch -M      ${{ github.ref_name }}
           git push -f origin ${{ github.ref_name }}
diff --git a/common/helm/Chart.yaml b/common/helm/Chart.yaml
@@ -38,4 +38,4 @@ name: common
 sources:
   - https://github.com/softwareag/webmethods-helm-charts
 type: library
-version: 1.0.2
+version: 1.0.3
diff --git a/common/helm/templates/_names.tpl b/common/helm/templates/_names.tpl
@@ -84,4 +84,15 @@ Create the name of the role to use
 {{- else }}
 {{- default "default" .Values.serviceAccount.roleName }}
 {{- end }}
+{{- end }}
+
+{{/*
+Create the name of the rolebinding to use
+*/}}
+{{- define "common.names.roleBindingName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "common.names.fullname" .) .Values.serviceAccount.roleBindingName }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.roleBindingName }}
+{{- end }}
 {{- end }}