moving metadata to spec.template, improving PVC name

arun-gupta · arun-gupta · commit 3a5c9b167f53 · 2015-11-22T01:06:25.000-08:00
diff --git a/attendees/kubernetes/couchbase-pvc.yaml b/attendees/kubernetes/couchbase-pvc.yaml
@@ -1,10 +1,10 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: myclaim-1
+  name: pvc001
 spec:
   accessModes:
     - ReadWriteMany
   resources:
     requests:
-      storage: 1Gi
+      storage: 1Gi
diff --git a/attendees/kubernetes/couchbase-rc.yaml b/attendees/kubernetes/couchbase-rc.yaml
@@ -8,15 +8,15 @@ metadata:
 spec:
   replicas: 1
   template:
+    metadata:
+      name: couchbase-rc-pod
+      labels:
+        name: couchbase-rc-pod
+        context: docker-k8s-lab
     spec:
       containers:
       - name: couchbase-rc-pod
         image: couchbase/server
-        metadata:
-          name: couchbase-rc-pod
-          labels:
-            name: couchbase-rc-pod
-            context: docker-k8s-lab
         volumeMounts:
         - mountPath: "/opt/couchbase/var"
           name: mypd
@@ -29,4 +29,4 @@ spec:
       volumes:
       - name: mypd
         persistentVolumeClaim:
-          claimName: myclaim-1
+          claimName: pvc001
