Merge changes from feature/sslcheckskip

cetic · Oct 20, 2021 · d205a59 · d205a59
1 parent 37e4b83
commit d205a59
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ The following items can be set via `--set` flag during installation or configure
 
 ### Install the chart
 
-Install the swagger-ui helm chart with a release name (`my-release`):
+Install the swagger-ui helm chart with a release name `my-release`:
 
 ```bash
 helm install --name my-release cetic/swaggerui
@@ -67,6 +67,7 @@ The following table lists the configurable parameters of the swagger-ui chart an
 | **Deployment**                                                              |
 | `deployment.replicas`                                                       | Number of replicas                                                                                                 | `1`                             |
 | `deployment.extraEnv`                                                       | Additional environment variable                                                                                    | ``                              |
+| `deployment.jsonNoCheckCertificate`                                         | Enable/Disable certificate check                                                                                   | `false`                         |
 | **Service**                                                                 |
 | `service.type`                                                              | Type of service for swagger-ui frontend                                                                            | `NodePort`                      |
 | `service.port`                                                              | Port to expose service                                                                                             | `8080`                          |
@@ -100,4 +101,4 @@ Please read the official [Contribution Guide](https://github.com/helm/charts/blo
 
 ## License
 
-[Apache License 2.0](/LICENSE.md)
+[Apache License 2.0](/LICENSE.md)
diff --git a/templates/deployment.yaml b/templates/deployment.yaml
@@ -34,7 +34,12 @@ spec:
             name: swagger-config
           {{ else }}
           command: ["/bin/sh","-c"]
-          args : {{ (printf "[\"mkdir /api-doc && wget --no-check-certificate %s -O /api-doc/openapi.json && apk update && apk add jq && jq '.servers += [{\\\"url\\\":\\\"%s\\\",\\\"description\\\":\\\"%s\\\"}]' /api-doc/openapi.json > json.tmp && mv json.tmp /api-doc/openapi.json && /usr/share/nginx/run.sh\"]" .Values.swaggerui.jsonUrl .Values.swaggerui.server.url .Values.swaggerui.server.description ) }} {{ end }}
+          {{- if .Values.deployment.jsonNoCheckCertificate }}
+          args : {{ (printf "[\"mkdir /api-doc && wget --no-check-certificate %s -O /api-doc/openapi.json && apk update && apk add jq && jq '.servers += [{\\\"url\\\":\\\"%s\\\",\\\"description\\\":\\\"%s\\\"}]' /api-doc/openapi.json > json.tmp && mv json.tmp /api-doc/openapi.json && /usr/share/nginx/run.sh\"]" .Values.swaggerui.jsonUrl .Values.swaggerui.server.url .Values.swaggerui.server.description ) }} 
+          {{- else }}
+          args : {{ (printf "[\"mkdir /api-doc && wget %s -O /api-doc/openapi.json && apk update && apk add jq && jq '.servers += [{\\\"url\\\":\\\"%s\\\",\\\"description\\\":\\\"%s\\\"}]' /api-doc/openapi.json > json.tmp && mv json.tmp /api-doc/openapi.json && /usr/share/nginx/run.sh\"]" .Values.swaggerui.jsonUrl .Values.swaggerui.server.url .Values.swaggerui.server.description ) }}
+          {{- end }}
+          {{- end }}
           env:
           {{- with .Values.deployment.extraEnv }}
           {{- toYaml . | nindent 10 }}
@@ -58,4 +63,4 @@ spec:
             items:
             - key: conf.json
               path: openapi.json
-      {{ end }}
+      {{ end }}
diff --git a/values.yaml b/values.yaml
@@ -22,6 +22,7 @@ swaggerui :
 ##
 deployment:
   replicas: 1
+  jsonNoCheckCertificate: false
   extraEnv:
   # - name: BASE_URL
   #   value: /swagger