updating otf-deployment process with more details

[it/otf.git] / smo-o1-vth / helm / o1-vth / templates / deployment.yaml

diff --git a/smo-o1-vth/helm/o1-vth/templates/deployment.yaml b/smo-o1-vth/helm/o1-vth/templates/deployment.yaml
index f78b5c8..10cf178 100644 (file)
--- a/smo-o1-vth/helm/o1-vth/templates/deployment.yaml
+++ b/smo-o1-vth/helm/o1-vth/templates/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1\r
+apiVersion: apps/v1\r
 kind: Deployment\r
 metadata:\r
   name: {{ .Values.appName}}\r
@@ -26,6 +26,10 @@ spec:
         app: {{ .Values.appName}}\r
         version: {{.Values.version}}\r
     spec:\r
+      {{ if .Values.pullSecret }}\r
+      imagePullSecrets:\r
+        - name: {{ .Values.pullSecret }}\r
+      {{ end }}\r
       serviceAccount: default\r
       volumes:\r
       - name: {{ .Values.appName}}-cert-volume\r
@@ -44,31 +48,31 @@ spec:
         ports:\r
         - name: http\r
           containerPort: 5000\r
-          nodePort: {{.Values.nodePort}}\r
+          # nodePort: {{.Values.nodePort}}\r
           protocol: TCP\r
         env:\r
         - name: NAMESPACE\r
-          value: {{.Values.namespace}}\r
+          value: {{ .Values.namespace}}\r
         - name: APP_NAME\r
           value: {{ .Values.appName}}\r
         - name: APP_VERSION\r
-          value: {{.Values.version}}\r
+          value: {{ .Values.version}}\r
         - name: HTTP\r
           value: {{ .Values.HTTP}}\r
         - name: HTTPS\r
           value: {{ .Values.HTTPS}}\r
         - name: BASE_URL\r
           value: {{ .Values.BASE_URL}}\r
-        - name: USER\r
-          valueFrom:\r
-            secretKeyRef:\r
-              name: {{ .Values.appName}}\r
-              key: username\r
-        - name: PW\r
-          valueFrom:\r
-            secretKeyRef:\r
-              name: {{ .Values.appName}}\r
-              key: password\r
+        # - name: USER\r
+        #   valueFrom:\r
+        #     secretKeyRef:\r
+        #       name: {{ .Values.appName}}\r
+        #       key: username\r
+        # - name: PW\r
+        #   valueFrom:\r
+        #     secretKeyRef:\r
+        #       name: {{ .Values.appName}}\r
+        #       key: password\r
         volumeMounts:\r
         - name: {{.Values.appName}}-cert-volume\r
           mountPath: /opt/cert\r