From 3d487547f9f55623dc83291ab782cfab7b4f1fa9 Mon Sep 17 00:00:00 2001 From: dev-chulbuji Date: Wed, 22 May 2019 00:44:57 +0900 Subject: [PATCH 1/2] change deployment version Signed-off-by: dev-chulbuji --- cmd/helm/installer/install.go | 2 +- docs/examples/nginx/templates/deployment.yaml | 2 +- docs/install.md | 4 ++-- pkg/kube/client_test.go | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/helm/installer/install.go b/cmd/helm/installer/install.go index 5c3369c7d..42c7132db 100644 --- a/cmd/helm/installer/install.go +++ b/cmd/helm/installer/install.go @@ -125,7 +125,7 @@ func Deployment(opts *Options) (*v1beta1.Deployment, error) { } dep.TypeMeta = metav1.TypeMeta{ Kind: "Deployment", - APIVersion: "extensions/v1beta1", + APIVersion: "apps/v1", } return dep, nil } diff --git a/docs/examples/nginx/templates/deployment.yaml b/docs/examples/nginx/templates/deployment.yaml index 5bb30f9af..139d780cd 100644 --- a/docs/examples/nginx/templates/deployment.yaml +++ b/docs/examples/nginx/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: # This uses a "fullname" template (see _helpers) diff --git a/docs/install.md b/docs/install.md index d240e72cf..354b97690 100755 --- a/docs/install.md +++ b/docs/install.md @@ -280,7 +280,7 @@ helm init --override metadata.annotations."deployment\.kubernetes\.io/revision"= Output: ``` -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -337,7 +337,7 @@ The Tiller installation is skipped and the manifest is output to stdout in JSON format. ``` -"apiVersion": "extensions/v1beta1", +"apiVersion": "apps/v1", "kind": "Deployment", "metadata": { "creationTimestamp": null, diff --git a/pkg/kube/client_test.go b/pkg/kube/client_test.go index 810abdf17..4cac11f52 100644 --- a/pkg/kube/client_test.go +++ b/pkg/kube/client_test.go @@ -27,7 +27,7 @@ import ( "time" "k8s.io/api/core/v1" - apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiapps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -700,7 +700,7 @@ spec: tier: backend role: master --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: redis-master @@ -740,7 +740,7 @@ spec: tier: backend role: slave --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: redis-slave @@ -780,7 +780,7 @@ spec: app: guestbook tier: frontend --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: frontend From 3708fad5170670dfa650b13e5d10fc2521636661 Mon Sep 17 00:00:00 2001 From: dev-chulbuji Date: Wed, 22 May 2019 00:54:15 +0900 Subject: [PATCH 2/2] feat: change miss fixing Signed-off-by: dev-chulbuji --- pkg/kube/client_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/kube/client_test.go b/pkg/kube/client_test.go index 4cac11f52..561aa8acb 100644 --- a/pkg/kube/client_test.go +++ b/pkg/kube/client_test.go @@ -27,7 +27,7 @@ import ( "time" "k8s.io/api/core/v1" - apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiapps/v1" + apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema"