add master-data pvc for etcd

openshift · Jul 9, 2018 · 1d66388 · 1d66388
1 parent 08a2441
commit 1d66388
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 9 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -99,12 +99,13 @@ type Config struct {
 	NodeBootstrapKubeconfig         *v1.Config
 
 	// misc control plane configurables
-	ServiceAccountKey *rsa.PrivateKey
-	SessionSecretAuth []byte
-	SessionSecretEnc  []byte
-	HtPasswd          []byte
-	ImageConfigFormat string
-	TunnelHostname    string
+	ServiceAccountKey       *rsa.PrivateKey
+	SessionSecretAuth       []byte
+	SessionSecretEnc        []byte
+	HtPasswd                []byte
+	ImageConfigFormat       string
+	TunnelHostname          string
+	EtcdPVCStorageClassName string
 
 	// misc node configurables
 	SSHKey *rsa.PrivateKey

diff --git a/pkg/config/generate.go b/pkg/config/generate.go
@@ -72,6 +72,7 @@ func Generate(m *api.Manifest, c *Config) (err error) {
 	c.Version = versionLatest
 	c.ImageConfigFormat = "openshift/origin-${component}:${version}"
 	c.TunnelHostname = strings.Replace(m.PublicHostname, "openshift", "openshift-tunnel", 1)
+	c.EtcdPVCStorageClassName = "managed-premium"
 
 	selectNodeImage(m, c)
 

diff --git a/pkg/helm/bindata.go b/pkg/helm/bindata.go
diff --git a/pkg/helm/chart/templates/Deployment.apps/master-etcd.yaml b/pkg/helm/chart/templates/Deployment.apps/master-etcd.yaml
@@ -54,4 +54,5 @@ spec:
         secret:
           secretName: etc-etcd
       - name: master-data
-        emptyDir: # TODO: BIG FAT WARNING, CHANGE THIS BEFORE PRODUCTION :)
+        persistentVolumeClaim:
+          claimName: master-data
diff --git a/pkg/helm/chart/templates/PersitantVolumeClaims/master-etcd.yaml b/pkg/helm/chart/templates/PersitantVolumeClaims/master-etcd.yaml
@@ -0,0 +1,13 @@
+apiVersion: "v1"
+kind: "PersistentVolumeClaim"
+metadata:
+  name: "master-data"
+spec:
+  accessModes:
+    - "ReadWriteOnce"
+  resources:
+    requests:
+      storage: "10Gi"
+  persistentVolumeReclaimPolicy: Recycle
+  storageClassName: {{ .Values.EtcdPVCStorageClassName | quote }}
+
diff --git a/pkg/helm/chart/templates/Secret/sync.yaml b/pkg/helm/chart/templates/Secret/sync.yaml
@@ -40,6 +40,7 @@ stringData:
     TunnelHostname: {{ .Values.TunnelHostname | quote }}
     TunnelImage: {{ .Values.TunnelImage | quote }}
     WebConsoleImage: {{ .Values.WebConsoleImage | quote }}
+    EtcdPVCStorageClassName: {{ .Value.EtcdPVCStorageClassName | quote }}
 
   manifest.yaml: |
     ClientID: {{ .Values.ClientID | quote }}

diff --git a/pkg/helm/data/values.yaml b/pkg/helm/data/values.yaml
@@ -60,7 +60,8 @@ ServiceAccountPrivateKey: {{ Base64Encode (PrivateKeyAsBytes .Config.ServiceAcco
 ServiceAccountPublicKey: {{ Base64Encode (PublicKeyAsBytes .Config.ServiceAccountKey.PublicKey) | quote }}
 SessionSecretAuth: {{ Base64Encode .Config.SessionSecretAuth | quote }}
 SessionSecretEnc: {{ Base64Encode .Config.SessionSecretEnc | quote }}
-HtPasswd: {{ Base64Encode .Config.HtPasswd | quote }}
+HtPasswd: {{ Base64Encode .Config.HtPasswd | quote }}            
+EtcdPVCStorageClassName: {{ .Config.EtcdPVCStorageClassName | quote }}      
 
 # kubeconfigs
 AdminKubeconfig: {{ Base64Encode (YamlMarshal .Config.AdminKubeconfig) | quote }}