Merge pull request #1385 from SUSE/remove-shared-mode

Helm Chart: Remove `shared` mode
cloudfoundry · Nov 22, 2017 · a7996e3 · a7996e3
2 parents bceaeb9 + 2ecc237
commit a7996e3
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 233 deletions.
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
@@ -32,7 +32,6 @@ spec:
         - containerPort: 443
           name: https
           protocol: TCP
-     {{- if .Values.noShared }}
       - image: {{.Values.dockerRegistry}}/{{.Values.dockerOrg}}/{{.Values.images.postflight}}:{{.Values.consoleVersion}}
         name: "postflight"
         env:
@@ -83,7 +82,6 @@ spec:
             name: "{{ .Release.Name }}-upgrade-volume"
           - mountPath: /etc/secrets/
             name: "{{ .Release.Name }}-secret"
-     {{- end }}
       - image: {{.Values.dockerRegistry}}/{{.Values.dockerOrg}}/{{.Values.images.proxy}}:{{.Values.consoleVersion}}
         name: proxy
         env:
@@ -123,7 +121,6 @@ spec:
           value: "{{ .Release.Name }}-encryption-key-volume"
         - name: ENCRYPTION_KEY_FILENAME
           value: key
-        {{- if .Values.noShared }}
         {{- if .Values.consoleCert }}
         - name: CONSOLE_CERT
           value: | 
@@ -133,16 +130,13 @@ spec:
         - name: CONSOLE_CERT_KEY
           value: |
 {{ .Values.consoleCertKey | indent 12 }}
-        {{- end }}
         {{- end }}
         - name: CONSOLE_PROXY_CERT_PATH
           value: "/{{ .Release.Name }}-encryption-key-volume/console.crt" 
         - name: CONSOLE_PROXY_CERT_KEY_PATH
           value: "/{{ .Release.Name }}-encryption-key-volume/console.key" 
         - name: NO_SHARED_MODE
-        {{- if .Values.noShared }}
           value: "true"
-        {{- end }}
         - name: HTTP_PROXY
         {{- if .Values.httpProxy }}
           value: {{.Values.httpProxy}}

diff --git a/deploy/kubernetes/console/templates/post-delete.yaml b/deploy/kubernetes/console/templates/post-delete.yaml
diff --git a/deploy/kubernetes/console/templates/post-install.yaml b/deploy/kubernetes/console/templates/post-install.yaml
diff --git a/deploy/kubernetes/console/templates/pre-install.yaml b/deploy/kubernetes/console/templates/pre-install.yaml
@@ -13,17 +13,9 @@ metadata:
   {{- else }}
     volume.alpha.kubernetes.io/storage-class: default
   {{- end }}
-  {{- if not .Values.noShared }}
-    "helm.sh/hook": pre-install
-    "helm.sh/hook-weight": "-1"
-  {{- end }}
 spec:
   accessModes:
-{{- if .Values.noShared }}
     - ReadWriteOnce
-{{- else }}
-    - ReadWriteMany
-{{- end }}
   resources:
     requests:
       storage: 1Mi
@@ -67,112 +59,9 @@ metadata:
   {{- else }}
     volume.alpha.kubernetes.io/storage-class: default
   {{- end }}
-  {{- if not .Values.noShared }}
-    "helm.sh/hook": pre-install
-    "helm.sh/hook-weight": "-1"
-  {{- end }}
 spec:
   accessModes:
-{{- if .Values.noShared }}
     - ReadWriteOnce
-{{- else }}
-    - ReadWriteMany
-{{- end }}
   resources:
     requests:
-      storage: 1Mi
-
-{{- if  not .Values.noShared }}
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  labels:
-    app:  "{{ .Release.Name }}"
-  name: "{{ .Release.Name }}-preflight-job"
-  annotations:
-    "helm.sh/hook": pre-install, pre-upgrade
-    "helm.sh/hook-weight": "0"
-spec:
- template:
-     metadata:
-       labels:
-         app:  "{{ .Release.Name }}"
-         component: preflight
-     spec:
-       containers:
-         - env:
-           - name: UPGRADE_VOLUME
-             value: "{{ .Release.Name }}-upgrade-volume"
-           - name: UPGRADE_LOCK_FILENAME
-             value: upgrade.lock
-           - name: ENCRYPTION_KEY_VOLUME
-             value: "{{ .Release.Name }}-encryption-key-volume"
-           - name: CERTS_PATH
-             value: "{{ .Release.Name }}-encryption-key-volume"
-           - name: ENCRYPTION_KEY_FILENAME
-             value: key
-           {{- if .Values.consoleCert }}
-           - name: CONSOLE_CERT
-             value: | 
-{{ .Values.consoleCert | indent 12 }}
-           {{- end }}
-           {{- if .Values.consoleCertKey }}
-           - name: CONSOLE_CERT_KEY
-             value: |
-{{ .Values.consoleCertKey | indent 12 }}
-           {{- end }}
-           image: {{.Values.dockerRegistry}}/{{.Values.dockerOrg}}/{{.Values.images.preflight}}:{{.Values.consoleVersion}}
-           name: "{{ .Release.Name }}-preflight-job"
-           volumeMounts:
-           - mountPath: "/{{ .Release.Name }}-upgrade-volume"
-             name: "{{ .Release.Name }}-upgrade-volume"
-           - mountPath: "/{{ .Release.Name }}-encryption-key-volume"
-             name: "{{ .Release.Name }}-encryption-key-volume"
-       restartPolicy: Never
-       {{- if .Values.dockerRegistrySecret }}
-       imagePullSecrets:
-       - nane:  {{.Values.dockerRegistrySecret}}
-       {{- end }}
-       volumes:
-       - name: "{{ .Release.Name }}-upgrade-volume"
-         persistentVolumeClaim:
-           claimName: "{{ .Release.Name }}-upgrade-volume"
-       - name: "{{ .Release.Name }}-encryption-key-volume"
-         persistentVolumeClaim:
-           claimName: "{{ .Release.Name }}-encryption-key-volume"
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: "{{ .Release.Name }}-upgrade-job"
-  labels:
-    app: "{{ .Release.Name }}"
-  annotations:
-    "helm.sh/hook": pre-upgrade
-    "helm.sh/hook-weight": "-5"
-spec:
-  template:
-    metadata:
-      name: "{{ .Release.Name }}-upgrade-job"
-      labels:
-        app: "{{ .Release.Name }}"
-        component: upgrade-job
-    spec:
-      restartPolicy: OnFailure
-      volumes:
-      - name: kubectl
-        hostPath:
-          path: /usr/bin/kubectl
-
-      containers:
-      - name: post-install-job
-        image: "lachlanevenson/k8s-kubectl:v1.6.0"
-        volumeMounts:
-        - name: kubectl
-          mountPath: /kubectl
-        command:
-        - sh
-        - -c
-        - "kubectl delete job --namespace {{ .Release.Namespace }} -l app={{ .Release.Name }}"
-{{- end }}
+      storage: 1Mi
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
@@ -17,7 +17,6 @@ useLb: false
 console:
   port: 443
 # externalIP: 127.0.0.1
-noShared: true
 images:
   console: stratos-console
   proxy: stratos-proxy