Merge pull request #888 from micw523/update-nginx

Deprecate extensions/v1beta1 deployment

Author: k8s-ci-robot

examples/create_deployment.py

@@ -27,8 +27,8 @@ def main():
 
     with open(path.join(path.dirname(__file__), "nginx-deployment.yaml")) as f:
         dep = yaml.safe_load(f)
-        k8s_beta = client.ExtensionsV1beta1Api()
-        resp = k8s_beta.create_namespaced_deployment(
+        k8s_apps_v1 = client.AppsV1Api()
+        resp = k8s_apps_v1.create_namespaced_deployment(
             body=dep, namespace="default")
         print("Deployment created. status='%s'" % str(resp.status))
 

examples/create_deployment_from_yaml.py

@@ -24,7 +24,7 @@ def main():
     config.load_kube_config()
     k8s_client = client.ApiClient()
     utils.create_from_yaml(k8s_client, "nginx-deployment.yaml")
-    k8s_api = client.ExtensionsV1beta1Api(k8s_client)
+    k8s_api = client.AppsV1Api(k8s_client)
     deps = k8s_api.read_namespaced_deployment("nginx-deployment", "default")
     print("Deployment {0} created".format(deps.metadata.name))
 

examples/deployment_examples.py

@@ -25,19 +25,19 @@ def create_deployment_object():
     # Configureate Pod template container
     container = client.V1Container(
         name="nginx",
-        image="nginx:1.7.9",
+        image="nginx:1.15.4",
         ports=[client.V1ContainerPort(container_port=80)])
     # Create and configurate a spec section
     template = client.V1PodTemplateSpec(
         metadata=client.V1ObjectMeta(labels={"app": "nginx"}),
         spec=client.V1PodSpec(containers=[container]))
     # Create the specification of deployment
-    spec = client.ExtensionsV1beta1DeploymentSpec(
+    spec = client.AppsV1beta1DeploymentSpec(
         replicas=3,
         template=template)
     # Instantiate the deployment object
-    deployment = client.ExtensionsV1beta1Deployment(
-        api_version="extensions/v1beta1",
+    deployment = client.AppsV1beta1Deployment(
+        api_version="apps/v1beta1",
         kind="Deployment",
         metadata=client.V1ObjectMeta(name=DEPLOYMENT_NAME),
         spec=spec)
@@ -55,7 +55,7 @@ def create_deployment(api_instance, deployment):
 
 def update_deployment(api_instance, deployment):
     # Update container image
-    deployment.spec.template.spec.containers[0].image = "nginx:1.9.1"
+    deployment.spec.template.spec.containers[0].image = "nginx:1.16.0"
     # Update the deployment
     api_response = api_instance.patch_namespaced_deployment(
         name=DEPLOYMENT_NAME,
@@ -80,16 +80,16 @@ def main():
     # utility. If no argument provided, the config will be loaded from
     # default location.
     config.load_kube_config()
-    extensions_v1beta1 = client.ExtensionsV1beta1Api()
+    apps_v1beta1 = client.AppsV1beta1Api()
     # Create a deployment object with client-python API. The deployment we
     # created is same as the `nginx-deployment.yaml` in the /examples folder.
     deployment = create_deployment_object()
 
-    create_deployment(extensions_v1beta1, deployment)
+    create_deployment(apps_v1beta1, deployment)
 
-    update_deployment(extensions_v1beta1, deployment)
+    update_deployment(apps_v1beta1, deployment)
 
-    delete_deployment(extensions_v1beta1)
+    delete_deployment(apps_v1beta1)
 
 
 if __name__ == '__main__':

examples/nginx-deployment.yaml

@@ -1,17 +1,21 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nginx-deployment
+  labels:
+    app: nginx
 spec:
   replicas: 3
+  selector:
+    matchLabels:
+      app: nginx
   template:
     metadata:
       labels:
         app: nginx
     spec:
       containers:
       - name: nginx
-        image: nginx:1.7.9
+        image: nginx:1.15.4
         ports:
         - containerPort: 80
-

examples/notebooks/create_deployment.ipynb

@@ -47,7 +47,7 @@
    "outputs": [],
    "source": [
     "config.load_kube_config()\n",
-    "extension = client.ExtensionsV1beta1Api()"
+    "apps_api = client.AppsV1beta1Api()"
    ]
   },
   {
@@ -70,7 +70,7 @@
    },
    "outputs": [],
    "source": [
-    "deployment = client.ExtensionsV1beta1Deployment()"
+    "deployment = client.AppsV1beta1Deployment()"
    ]
   },
   {
@@ -93,7 +93,7 @@
    },
    "outputs": [],
    "source": [
-    "deployment.api_version = \"extensions/v1beta1\"\n",
+    "deployment.api_version = \"apps/v1beta1\"\n",
     "deployment.kind = \"Deployment\"\n",
     "deployment.metadata = client.V1ObjectMeta(name=\"nginx-deployment\")"
    ]
@@ -118,7 +118,7 @@
    },
    "outputs": [],
    "source": [
-    "spec = client.ExtensionsV1beta1DeploymentSpec()\n",
+    "spec = client.AppsV1beta1DeploymentSpec()\n",
     "spec.replicas = 3"
    ]
   },
@@ -207,7 +207,7 @@
    },
    "outputs": [],
    "source": [
-    "extension.create_namespaced_deployment(namespace=\"default\", body=deployment)"
+    "apps_api.create_namespaced_deployment(namespace=\"default\", body=deployment)"
    ]
   },
   {
@@ -253,7 +253,7 @@
    },
    "outputs": [],
    "source": [
-    "extension.replace_namespaced_deployment(name=\"nginx-deployment\", namespace=\"default\", body=deployment)"
+    "apps_api.replace_namespaced_deployment(name=\"nginx-deployment\", namespace=\"default\", body=deployment)"
    ]
   },
   {
@@ -277,10 +277,10 @@
    },
    "outputs": [],
    "source": [
-    "rollback = client.ExtensionsV1beta1DeploymentRollback()\n",
-    "rollback.api_version = \"extensions/v1beta1\"\n",
+    "rollback = client.AppsV1beta1DeploymentRollback()\n",
+    "rollback.api_version = \"apps/v1beta1\"\n",
     "rollback.kind = \"DeploymentRollback\"\n",
-    "rollback.rollback_to = client.ExtensionsV1beta1RollbackConfig()\n",
+    "rollback.rollback_to = client.AppsV1beta1RollbackConfig()\n",
     "rollback.rollback_to.revision = 0\n",
     "rollback.name = \"nginx-deployment\""
    ]

examples/notebooks/intro_notebook.ipynb

@@ -89,9 +89,9 @@
    },
    "outputs": [],
    "source": [
-    "api_instance = client.ExtensionsV1beta1Api()\n",
-    "dep = client.ExtensionsV1beta1Deployment()\n",
-    "spec = client.ExtensionsV1beta1DeploymentSpec()"
+    "api_instance = client.AppsV1beta1Api()\n",
+    "dep = client.AppsV1beta1Deployment()\n",
+    "spec = client.AppsV1beta1DeploymentSpec()"
    ]
   },
   {

kubernetes/e2e_test/test_utils.py

@@ -76,21 +76,6 @@ def test_create_apps_deployment_from_yaml_obj(self):
             name="nginx-app-3", namespace="default",
             body={})
 
-    def test_create_extensions_deployment_from_yaml(self):
-        """
-        Should be able to create an extensions/v1beta1 deployment.
-        """
-        k8s_client = client.api_client.ApiClient(configuration=self.config)
-        utils.create_from_yaml(
-            k8s_client, self.path_prefix + "extensions-deployment.yaml")
-        ext_api = client.ExtensionsV1beta1Api(k8s_client)
-        dep = ext_api.read_namespaced_deployment(name="nginx-deployment",
-                                                 namespace="default")
-        self.assertIsNotNone(dep)
-        ext_api.delete_namespaced_deployment(
-            name="nginx-deployment", namespace="default",
-            body={})
-
     def test_create_pod_from_yaml(self):
         """
         Should be able to create a pod.
@@ -172,7 +157,7 @@ def test_create_deployment_non_default_namespace_from_yaml(self):
         utils.create_from_yaml(
             k8s_client, self.path_prefix + "dep-deployment.yaml")
         core_api = client.CoreV1Api(k8s_client)
-        ext_api = client.ExtensionsV1beta1Api(k8s_client)
+        ext_api = client.AppsV1Api(k8s_client)
         nmsp = core_api.read_namespace(name="dep")
         self.assertIsNotNone(nmsp)
         dep = ext_api.read_namespaced_deployment(name="nginx-deployment",
@@ -224,7 +209,7 @@ def test_create_general_list_from_yaml(self):
         utils.create_from_yaml(
             k8s_client, self.path_prefix + "list.yaml")
         core_api = client.CoreV1Api(k8s_client)
-        ext_api = client.ExtensionsV1beta1Api(k8s_client)
+        ext_api = client.AppsV1Api(k8s_client)
         svc = core_api.read_namespaced_service(name="list-service-test",
                                                namespace="default")
         self.assertIsNotNone(svc)
@@ -355,7 +340,7 @@ def test_create_from_multi_resource_yaml_with_conflict(self):
 
     def test_create_from_multi_resource_yaml_with_multi_conflicts(self):
         """
-        Should create an extensions/v1beta1 deployment
+        Should create an apps/v1 deployment
         and fail to create the same deployment twice.
         Should raise an exception that contains two error messages.
         """
@@ -365,14 +350,14 @@ def test_create_from_multi_resource_yaml_with_multi_conflicts(self):
                 k8s_client, self.path_prefix + "triple-nginx.yaml")
         exp_error = ('Error from server (Conflict): {"kind":"Status",'
                      '"apiVersion":"v1","metadata":{},"status":"Failure",'
-                     '"message":"deployments.extensions \\"triple-nginx\\" '
+                     '"message":"deployments.apps \\"triple-nginx\\" '
                      'already exists","reason":"AlreadyExists",'
-                     '"details":{"name":"triple-nginx","group":"extensions",'
+                     '"details":{"name":"triple-nginx","group":"apps",'
                      '"kind":"deployments"},"code":409}\n'
                      )
         exp_error += exp_error
         self.assertEqual(exp_error, str(cm.exception))
-        ext_api = client.ExtensionsV1beta1Api(k8s_client)
+        ext_api = client.AppsV1Api(k8s_client)
         dep = ext_api.read_namespaced_deployment(name="triple-nginx",
                                                  namespace="default")
         self.assertIsNotNone(dep)
@@ -386,7 +371,8 @@ def test_create_namespaces_apps_deployment_from_yaml(self):
         """
         k8s_client = client.api_client.ApiClient(configuration=self.config)
         utils.create_from_yaml(
-            k8s_client, self.path_prefix + "apps-deployment.yaml", namespace=self.test_namespace)
+            k8s_client, self.path_prefix + "apps-deployment.yaml",
+            namespace=self.test_namespace)
         app_api = client.AppsV1beta1Api(k8s_client)
         dep = app_api.read_namespaced_deployment(name="nginx-app",
                                                  namespace=self.test_namespace)
@@ -395,14 +381,15 @@ def test_create_namespaces_apps_deployment_from_yaml(self):
             name="nginx-app", namespace=self.test_namespace,
             body={})
 
-    def test_create_from_list_in_multi_resource_yaml(self):
+    def test_create_from_list_in_multi_resource_yaml_namespaced(self):
         """
         Should be able to create the items in the PodList and a deployment
-        specified in the multi-resource file
+        specified in the multi-resource file in a test namespace
         """
         k8s_client = client.api_client.ApiClient(configuration=self.config)
         utils.create_from_yaml(
-            k8s_client, self.path_prefix + "multi-resource-with-list.yaml", namespace=self.test_namespace)
+            k8s_client, self.path_prefix + "multi-resource-with-list.yaml",
+            namespace=self.test_namespace)
         core_api = client.CoreV1Api(k8s_client)
         app_api = client.AppsV1beta1Api(k8s_client)
         pod_0 = core_api.read_namespaced_pod(

kubernetes/e2e_test/test_yaml/dep-deployment.yaml

@@ -1,18 +1,20 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nginx-deployment
   namespace: dep
 spec:
   replicas: 3
+  selector:
+    matchLabels:
+      app: nginx
   template:
     metadata:
       labels:
         app: nginx
     spec:
       containers:
       - name: nginx
-        image: nginx:1.7.9
+        image: nginx:1.15.4
         ports:
         - containerPort: 80
-

kubernetes/e2e_test/test_yaml/extensions-deployment.yaml

@@ -11,19 +11,22 @@ items:
       port: 80
     selector:
       app: list-deployment-test
-- apiVersion: extensions/v1beta1
+- apiVersion: apps/v1
   kind: Deployment
   metadata:
     name: list-deployment-test
     labels:
       app: list-deployment-test
   spec:
     replicas: 1
+    selector:
+      matchLabels:
+        app: list-deployment-test
     template:
       metadata:
         labels:
           app: list-deployment-test
       spec:
         containers:
           - name: nginx
-            image: nginx
+            image: nginx:1.15.4