Merge pull request #39577 from kargakis/fix-openshift-example

Automatic merge from submit-queue (batch tested with PRs 39684, 39577, 38989, 39534, 39702)

examples: fix OpenShift example

Fixes https://github.com/kubernetes/kubernetes/issues/39575

examples/examples_test.go

@@ -265,11 +265,11 @@ func TestExampleObjectSchemas(t *testing.T) {
 		},
 		"../examples/openshift-origin": {
 			"openshift-origin-namespace": &api.Namespace{},
-			"openshift-controller":       &api.ReplicationController{},
+			"openshift-controller":       &extensions.Deployment{},
 			"openshift-service":          &api.Service{},
-			"etcd-controller":            &api.ReplicationController{},
+			"etcd-controller":            &extensions.Deployment{},
 			"etcd-service":               &api.Service{},
-			"etcd-discovery-controller":  &api.ReplicationController{},
+			"etcd-discovery-controller":  &extensions.Deployment{},
 			"etcd-discovery-service":     &api.Service{},
 			"secret":                     nil,
 		},

examples/openshift-origin/etcd-controller.yaml

@@ -1,20 +1,16 @@
-kind: ReplicationController
-apiVersion: v1
+apiVersion: extensions/v1beta1
+kind: Deployment
 metadata:
   name: etcd
-  creationTimestamp: 
 spec:
   strategy:
     type: Recreate
-    resources: {}
-  triggers:
-  - type: ConfigChange
   replicas: 3
   selector:
+    matchLabels:
       name: etcd
   template:
     metadata:
-      creationTimestamp: 
       labels:
         name: etcd
     spec:
@@ -47,7 +43,6 @@ spec:
         resources: {}
         terminationMessagePath: "/dev/termination-log"
         imagePullPolicy: IfNotPresent
-        capabilities: {}
         securityContext:
           capabilities: {}
           privileged: false

examples/openshift-origin/etcd-discovery-controller.yaml

@@ -1,20 +1,16 @@
-kind: ReplicationController
-apiVersion: v1
+apiVersion: extensions/v1beta1
+kind: Deployment
 metadata:
   name: etcd-discovery
-  creationTimestamp: 
 spec:
   strategy:
     type: Recreate
-    resources: {}
-  triggers:
-  - type: ConfigChange
   replicas: 1
   selector:
+    matchLabels:
       name: etcd-discovery
   template:
     metadata:
-      creationTimestamp: 
       labels:
         name: etcd-discovery
     spec:
@@ -29,7 +25,6 @@ spec:
         resources: {}
         terminationMessagePath: "/dev/termination-log"
         imagePullPolicy: IfNotPresent
-        capabilities: {}
         securityContext:
           capabilities: {}
           privileged: false

examples/openshift-origin/etcd-discovery-service.yaml

@@ -2,7 +2,6 @@ kind: Service
 apiVersion: v1
 metadata:
   name: etcd-discovery
-  creationTimestamp: 
   labels:
     name: etcd-discovery
 spec:

examples/openshift-origin/etcd-service.yaml

@@ -2,7 +2,6 @@ kind: Service
 apiVersion: v1
 metadata:
   name: etcd
-  creationTimestamp: 
   labels:
     name: etcd
 spec:

examples/openshift-origin/openshift-controller.yaml

@@ -1,5 +1,5 @@
-apiVersion: v1
-kind: ReplicationController
+apiVersion: extensions/v1beta1
+kind: Deployment
 metadata: 
   labels: 
     name: openshift
@@ -7,6 +7,7 @@ metadata:
 spec: 
   replicas: 1
   selector:
+    matchLabels:
       name: openshift
   template: 
     metadata: 

hack/local-up-cluster.sh

@@ -624,10 +624,10 @@ function start_kubedns {
         
         # TODO update to dns role once we have one.
         ${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" create clusterrolebinding system:kube-dns --clusterrole=cluster-admin --serviceaccount=kube-system:default
-        # use kubectl to create kubedns rc and service
+        # use kubectl to create kubedns deployment and service
         ${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" --namespace=kube-system create -f kubedns-deployment.yaml
         ${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" --namespace=kube-system create -f kubedns-svc.yaml
-        echo "Kube-dns rc and service successfully deployed."
+        echo "Kube-dns deployment and service successfully deployed."
         rm  kubedns-deployment.yaml kubedns-svc.yaml
     fi
 }