From 78dd37efc2b662b923bba186e9ebf54964ff46cd Mon Sep 17 00:00:00 2001 From: Darla Ahlert Date: Thu, 1 Jun 2017 17:19:32 -0500 Subject: [PATCH] Update deployment for kubernetes 1.6 In Kubernetes 1.6, the deployment API version was changed from extensions/v1beta1 to apps/v1beta1 Change-Id: I14ee465de381d25866224b9eae3512f0b42588d3 --- barbican/templates/deployment-api.yaml | 2 +- ceph/templates/deployment-mds.yaml | 2 +- ceph/templates/deployment-moncheck.yaml | 2 +- ceph/templates/deployment-rgw.yaml | 2 +- cinder/templates/deployment-api.yaml | 2 +- cinder/templates/deployment-scheduler.yaml | 2 +- cinder/templates/deployment-volume.yaml | 2 +- etcd/templates/deployment.yaml | 2 +- glance/templates/deployment-api.yaml | 2 +- glance/templates/deployment-registry.yaml | 2 +- heat/templates/deployment-api.yaml | 2 +- heat/templates/deployment-cfn.yaml | 2 +- heat/templates/deployment-cloudwatch.yaml | 2 +- horizon/templates/deployment.yaml | 2 +- ingress/templates/error-deployment.yaml | 2 +- ingress/templates/ingress-deployment.yaml | 2 +- keystone/templates/deployment.yaml | 2 +- magnum/templates/deployment-api.yaml | 2 +- memcached/templates/deployment.yaml | 2 +- mistral/templates/deployment-api.yaml | 2 +- mistral/templates/deployment-executor.yaml | 2 +- neutron/templates/deployment-server.yaml | 2 +- nova/templates/deployment-api-metadata.yaml | 2 +- nova/templates/deployment-api-osapi.yaml | 2 +- nova/templates/deployment-conductor.yaml | 2 +- nova/templates/deployment-consoleauth.yaml | 2 +- nova/templates/deployment-scheduler.yaml | 2 +- rabbitmq/templates/deployment.yaml | 2 +- senlin/templates/deployment-api.yaml | 2 +- tools/kubeadm-aio/assets/opt/nfs-provisioner/deployment.yaml | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/barbican/templates/deployment-api.yaml b/barbican/templates/deployment-api.yaml index 9eea51c3e4..7ae6b77a97 100644 --- a/barbican/templates/deployment-api.yaml +++ b/barbican/templates/deployment-api.yaml @@ -14,7 +14,7 @@ {{- $dependencies := .Values.dependencies.api }} {{- $mounts_barbican_api := .Values.mounts.barbican_api.barbican_api }} {{- $mounts_barbican_api_init := .Values.mounts.barbican_api.init_container }} -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 kind: Deployment metadata: name: barbican-api diff --git a/ceph/templates/deployment-mds.yaml b/ceph/templates/deployment-mds.yaml index b45b4d7569..925f449dde 100644 --- a/ceph/templates/deployment-mds.yaml +++ b/ceph/templates/deployment-mds.yaml @@ -14,7 +14,7 @@ --- kind: Deployment -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 metadata: labels: app: ceph diff --git a/ceph/templates/deployment-moncheck.yaml b/ceph/templates/deployment-moncheck.yaml index e0fe838878..a62c039fdc 100644 --- a/ceph/templates/deployment-moncheck.yaml +++ b/ceph/templates/deployment-moncheck.yaml @@ -14,7 +14,7 @@ --- kind: Deployment -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 metadata: labels: app: ceph diff --git a/ceph/templates/deployment-rgw.yaml b/ceph/templates/deployment-rgw.yaml index 619858eeb7..6521046c85 100644 --- a/ceph/templates/deployment-rgw.yaml +++ b/ceph/templates/deployment-rgw.yaml @@ -15,7 +15,7 @@ {{- if .Values.rgw.enabled }} --- kind: Deployment -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 metadata: labels: app: ceph diff --git a/cinder/templates/deployment-api.yaml b/cinder/templates/deployment-api.yaml index a214c22cfb..00a9922e4d 100644 --- a/cinder/templates/deployment-api.yaml +++ b/cinder/templates/deployment-api.yaml @@ -14,7 +14,7 @@ {{- $envAll := . }} {{- $dependencies := .Values.dependencies.api }} -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 kind: Deployment metadata: name: cinder-api diff --git a/cinder/templates/deployment-scheduler.yaml b/cinder/templates/deployment-scheduler.yaml index f3ef49c41e..7b55c37f0d 100644 --- a/cinder/templates/deployment-scheduler.yaml +++ b/cinder/templates/deployment-scheduler.yaml @@ -14,7 +14,7 @@ {{- $envAll := . }} {{- $dependencies := .Values.dependencies.scheduler }} -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 kind: Deployment metadata: name: cinder-scheduler diff --git a/cinder/templates/deployment-volume.yaml b/cinder/templates/deployment-volume.yaml index 119c19640d..0ac7e107fb 100644 --- a/cinder/templates/deployment-volume.yaml +++ b/cinder/templates/deployment-volume.yaml @@ -14,7 +14,7 @@ {{- $envAll := . }} {{- $dependencies := .Values.dependencies.volume }} -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 kind: Deployment metadata: name: cinder-volume diff --git a/etcd/templates/deployment.yaml b/etcd/templates/deployment.yaml index f09ad89ce0..5898c6c487 100644 --- a/etcd/templates/deployment.yaml +++ b/etcd/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 kind: Deployment metadata: name: etcd diff --git a/glance/templates/deployment-api.yaml b/glance/templates/deployment-api.yaml index c0eeb77a56..d3220e9d3f 100644 --- a/glance/templates/deployment-api.yaml +++ b/glance/templates/deployment-api.yaml @@ -16,7 +16,7 @@ {{- $dependencies := .Values.dependencies.api }} {{- $mounts_glance_api := .Values.mounts.glance_api.glance_api }} {{- $mounts_glance_api_init := .Values.mounts.glance_api.init_container }} -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 kind: Deployment metadata: name: glance-api diff --git a/glance/templates/deployment-registry.yaml b/glance/templates/deployment-registry.yaml index 365b618e5f..56491a83b8 100644 --- a/glance/templates/deployment-registry.yaml +++ b/glance/templates/deployment-registry.yaml @@ -16,7 +16,7 @@ {{- $dependencies := .Values.dependencies.registry }} {{- $mounts_glance_registry := .Values.mounts.glance_registry.glance_registry }} {{- $mounts_glance_registry_init := .Values.mounts.glance_registry.init_container }} -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 kind: Deployment metadata: name: glance-registry diff --git a/heat/templates/deployment-api.yaml b/heat/templates/deployment-api.yaml index 5960d6bd41..e0bd6bafe7 100644 --- a/heat/templates/deployment-api.yaml +++ b/heat/templates/deployment-api.yaml @@ -16,7 +16,7 @@ {{- $dependencies := .Values.dependencies.api }} {{- $mounts_heat_api := .Values.mounts.heat_api.heat_api }} {{- $mounts_heat_api_init := .Values.mounts.heat_api.init_container }} -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 kind: Deployment metadata: name: heat-api diff --git a/heat/templates/deployment-cfn.yaml b/heat/templates/deployment-cfn.yaml index c904f2bacd..8db1f6c559 100644 --- a/heat/templates/deployment-cfn.yaml +++ b/heat/templates/deployment-cfn.yaml @@ -16,7 +16,7 @@ {{- $dependencies := .Values.dependencies.cfn }} {{- $mounts_heat_cfn := .Values.mounts.heat_cfn.heat_cfn }} {{- $mounts_heat_cfn_init := .Values.mounts.heat_cfn.init_container }} -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 kind: Deployment metadata: name: heat-cfn diff --git a/heat/templates/deployment-cloudwatch.yaml b/heat/templates/deployment-cloudwatch.yaml index ec9c3ebf2c..7f5ac4d67c 100644 --- a/heat/templates/deployment-cloudwatch.yaml +++ b/heat/templates/deployment-cloudwatch.yaml @@ -16,7 +16,7 @@ {{- $dependencies := .Values.dependencies.cloudwatch }} {{- $mounts_heat_cloudwatch := .Values.mounts.heat_cloudwatch.heat_cloudwatch }} {{- $mounts_heat_cloudwatch_init := .Values.mounts.heat_cloudwatch.init_container }} -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 kind: Deployment metadata: name: heat-cloudwatch diff --git a/horizon/templates/deployment.yaml b/horizon/templates/deployment.yaml index 26e501ab29..ffa3520c8a 100644 --- a/horizon/templates/deployment.yaml +++ b/horizon/templates/deployment.yaml @@ -16,7 +16,7 @@ {{- $dependencies := .Values.dependencies.dashboard }} {{- $mounts_horizon := .Values.mounts.horizon.horizon }} {{- $mounts_horizon_init := .Values.mounts.horizon.init_container }} -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 kind: Deployment metadata: name: horizon diff --git a/ingress/templates/error-deployment.yaml b/ingress/templates/error-deployment.yaml index 31e7a7f10c..ff0866cf41 100644 --- a/ingress/templates/error-deployment.yaml +++ b/ingress/templates/error-deployment.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 kind: Deployment metadata: name: ingress-error-pages diff --git a/ingress/templates/ingress-deployment.yaml b/ingress/templates/ingress-deployment.yaml index ef33adab0e..b14bff12a8 100644 --- a/ingress/templates/ingress-deployment.yaml +++ b/ingress/templates/ingress-deployment.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 kind: {{ .Values.deployment_type }} metadata: name: ingress-api diff --git a/keystone/templates/deployment.yaml b/keystone/templates/deployment.yaml index 8cbfd5b7a1..7c9fd6bab5 100644 --- a/keystone/templates/deployment.yaml +++ b/keystone/templates/deployment.yaml @@ -16,7 +16,7 @@ {{- $mounts_keystone_api := .Values.mounts.keystone_api.keystone_api }} {{- $mounts_keystone_api_init := .Values.mounts.keystone_api.init_container }} -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 kind: Deployment metadata: name: keystone-api diff --git a/magnum/templates/deployment-api.yaml b/magnum/templates/deployment-api.yaml index dd86002b39..86a3dda62c 100644 --- a/magnum/templates/deployment-api.yaml +++ b/magnum/templates/deployment-api.yaml @@ -16,7 +16,7 @@ {{- $dependencies := .Values.dependencies.api }} {{- $mounts_magnum_api := .Values.mounts.magnum_api.magnum_api }} {{- $mounts_magnum_api_init := .Values.mounts.magnum_api.init_container }} -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 kind: Deployment metadata: name: magnum-api diff --git a/memcached/templates/deployment.yaml b/memcached/templates/deployment.yaml index 80aab307a8..6204315ba4 100644 --- a/memcached/templates/deployment.yaml +++ b/memcached/templates/deployment.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 kind: Deployment metadata: name: memcached diff --git a/mistral/templates/deployment-api.yaml b/mistral/templates/deployment-api.yaml index ea6ef90930..b69859811c 100644 --- a/mistral/templates/deployment-api.yaml +++ b/mistral/templates/deployment-api.yaml @@ -16,7 +16,7 @@ {{- $mounts_mistral_api := .Values.mounts.mistral_api.mistral_api }} {{- $mounts_mistral_api_init := .Values.mounts.mistral_api.init_container }} -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 kind: Deployment metadata: name: mistral-api diff --git a/mistral/templates/deployment-executor.yaml b/mistral/templates/deployment-executor.yaml index af4fdae8e2..62b669a397 100644 --- a/mistral/templates/deployment-executor.yaml +++ b/mistral/templates/deployment-executor.yaml @@ -16,7 +16,7 @@ {{- $mounts_mistral_executor := .Values.mounts.mistral_executor.mistral_executor }} {{- $mounts_mistral_executor_init := .Values.mounts.mistral_executor.init_container }} -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 kind: Deployment metadata: name: mistral-executor diff --git a/neutron/templates/deployment-server.yaml b/neutron/templates/deployment-server.yaml index 9d0926bcd7..74893237a5 100644 --- a/neutron/templates/deployment-server.yaml +++ b/neutron/templates/deployment-server.yaml @@ -16,7 +16,7 @@ {{- $dependencies := .Values.dependencies.server }} {{- $mounts_neutron_server := .Values.mounts.neutron_server.neutron_server }} {{- $mounts_neutron_server_init := .Values.mounts.neutron_server.init_container }} -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 kind: Deployment metadata: name: neutron-server diff --git a/nova/templates/deployment-api-metadata.yaml b/nova/templates/deployment-api-metadata.yaml index 49e00eee5e..e1833d853f 100644 --- a/nova/templates/deployment-api-metadata.yaml +++ b/nova/templates/deployment-api-metadata.yaml @@ -16,7 +16,7 @@ {{- $dependencies := .Values.dependencies.api }} {{- $mounts_nova_api_metadata := .Values.mounts.nova_api_metadata.nova_api_metadata }} {{- $mounts_nova_api_metadata_init := .Values.mounts.nova_api_metadata.init_container }} -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 kind: Deployment metadata: name: nova-api-metadata diff --git a/nova/templates/deployment-api-osapi.yaml b/nova/templates/deployment-api-osapi.yaml index 7d393ada3b..18850a6f91 100644 --- a/nova/templates/deployment-api-osapi.yaml +++ b/nova/templates/deployment-api-osapi.yaml @@ -16,7 +16,7 @@ {{- $dependencies := .Values.dependencies.api }} {{- $mounts_nova_api_osapi := .Values.mounts.nova_api_osapi.nova_api_osapi }} {{- $mounts_nova_api_osapi_init := .Values.mounts.nova_api_osapi.init_container }} -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 kind: Deployment metadata: name: nova-api-osapi diff --git a/nova/templates/deployment-conductor.yaml b/nova/templates/deployment-conductor.yaml index 691137f11b..29c2a85a1a 100644 --- a/nova/templates/deployment-conductor.yaml +++ b/nova/templates/deployment-conductor.yaml @@ -16,7 +16,7 @@ {{- $dependencies := .Values.dependencies.conductor }} {{- $mounts_nova_conductor := .Values.mounts.nova_conductor.nova_conductor }} {{- $mounts_nova_conductor_init := .Values.mounts.nova_conductor.init_container }} -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 kind: Deployment metadata: name: nova-conductor diff --git a/nova/templates/deployment-consoleauth.yaml b/nova/templates/deployment-consoleauth.yaml index 9842113373..e205dda3b0 100644 --- a/nova/templates/deployment-consoleauth.yaml +++ b/nova/templates/deployment-consoleauth.yaml @@ -17,7 +17,7 @@ {{- $mounts_nova_consoleauth := .Values.mounts.nova_consoleauth.nova_conductor }} {{- $mounts_nova_consoleauth_init := .Values.mounts.nova_consoleauth.init_container }} -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 kind: Deployment metadata: name: nova-consoleauth diff --git a/nova/templates/deployment-scheduler.yaml b/nova/templates/deployment-scheduler.yaml index 4fb66de6c3..dedca5e979 100644 --- a/nova/templates/deployment-scheduler.yaml +++ b/nova/templates/deployment-scheduler.yaml @@ -17,7 +17,7 @@ {{- $mounts_nova_scheduler := .Values.mounts.nova_scheduler.nova_conductor }} {{- $mounts_nova_scheduler_init := .Values.mounts.nova_scheduler.init_container }} -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 kind: Deployment metadata: name: nova-scheduler diff --git a/rabbitmq/templates/deployment.yaml b/rabbitmq/templates/deployment.yaml index 0f8dba6475..df7ca55938 100644 --- a/rabbitmq/templates/deployment.yaml +++ b/rabbitmq/templates/deployment.yaml @@ -15,7 +15,7 @@ {{- $envAll := . }} {{- $dependencies := .Values.dependencies }} kind: Deployment -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 metadata: name: rabbitmq spec: diff --git a/senlin/templates/deployment-api.yaml b/senlin/templates/deployment-api.yaml index 9dc83243b2..59d4094897 100644 --- a/senlin/templates/deployment-api.yaml +++ b/senlin/templates/deployment-api.yaml @@ -16,7 +16,7 @@ {{- $dependencies := .Values.dependencies.api }} {{- $mounts_senlin_api := .Values.mounts.senlin_api.senlin_api }} {{- $mounts_senlin_api_init := .Values.mounts.senlin_api.init_container }} -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 kind: Deployment metadata: name: senlin-api diff --git a/tools/kubeadm-aio/assets/opt/nfs-provisioner/deployment.yaml b/tools/kubeadm-aio/assets/opt/nfs-provisioner/deployment.yaml index 81d64cb8ab..73ec6ba16e 100644 --- a/tools/kubeadm-aio/assets/opt/nfs-provisioner/deployment.yaml +++ b/tools/kubeadm-aio/assets/opt/nfs-provisioner/deployment.yaml @@ -19,7 +19,7 @@ spec: app: nfs-provisioner --- kind: Deployment -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 metadata: name: nfs-provisioner spec: