Merge pull request #47 from fortify/fix#15

SAST: Correct fortifyLicense secret reference
fortify · Dec 19, 2023 · c6a236c · c6a236c
2 parents 1bb2245 + 7a8fd01
commit c6a236c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/charts/scancentral-sast/Chart.yaml b/charts/scancentral-sast/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: scancentral-sast
 description: A Helm chart for Fortify ScanCentral SAST
 type: application
-version: 23.1.1
+version: 23.1.2
 appVersion: 23.1.0
diff --git a/charts/scancentral-sast/templates/secret.yaml b/charts/scancentral-sast/templates/secret.yaml
@@ -8,7 +8,7 @@ metadata:
     {{- include "scancentral-sast.labels" $ | nindent 4 }}
 type: Opaque
 data:
-  fortify.license: {{ required "fortifyLicense value is required. (Tip) Use \"helm install/upgrade\" argument --set-file=fortifyLicense=<FORTIFY_LICENSE_PATH> ." .Values.fortifyLicense | b64enc | quote }}
+  fortify.license: {{ required "secrets.fortifyLicense value is required. (Tip) Use \"helm install/upgrade\" argument --set-file=secrets.fortifyLicense=<FORTIFY_LICENSE_PATH> ." .Values.secrets.fortifyLicense | b64enc | quote }}
   {{- if .Values.controller.enabled }}
   scancentral-worker-auth-token: {{ include "secrets.passwords.manage" (dict "secret" (include "scancentral-sast-secret.fullname" $) "key" "scancentral-worker-auth-token" "providedPassword" .Values.secrets.workerAuthToken "length" 48 "context" $ ) }}
   scancentral-client-auth-token: {{ include "secrets.passwords.manage" (dict "secret" (include "scancentral-sast-secret.fullname" $) "key" "scancentral-client-auth-token" "providedPassword" .Values.secrets.clientAuthToken "length" 48 "context" $ ) }}

diff --git a/charts/scancentral-sast/values.yaml b/charts/scancentral-sast/values.yaml
@@ -7,7 +7,7 @@ secrets:
   # in this section will be ignored
   secretName: ""
 
-  # (Required if secrets.secretName is blank) fortify.license file contents. (Tip) Use "--set-file=fortifyLicense=<FORTIFY_LICENSE_PATH>" argument
+  # (Required if secrets.secretName is blank) fortify.license file contents. (Tip) Use "--set-file=secrets.fortifyLicense=<FORTIFY_LICENSE_PATH>" argument
   # when running helm install or upgrade.
   fortifyLicense: ""
 

diff --git a/docs/minikube-deployment/README.md b/docs/minikube-deployment/README.md
@@ -235,7 +235,7 @@ The ingress annotation: `nginx.ingress.kubernetes.io/backend-protocol=HTTPS` ind
 ```commandline
 helm install scancentral-sast fortify/scancentral-sast  \
   --set imagePullSecrets[0].name=fortifydocker \
-  --set-file fortifyLicense=fortify.license \
+  --set-file secrets.fortifyLicense=fortify.license \
   --set-file trustedCertificates[0]=certificates/certificate.pem \
   --set controller.thisUrl='https://scsast.192-168-49-2.nip.io/scancentral-ctrl' \
   --set controller.sscUrl='https://ssc.192-168-49-2.nip.io' \