From f18e27b115f61127bd4d6318017a0ab5992b4740 Mon Sep 17 00:00:00 2001 From: Tarun Pothulapati Date: Thu, 7 Nov 2019 04:36:09 +0530 Subject: [PATCH] use appsv1 api in identity (#3682) Signed-off-by: Tarun Pothulapati --- charts/linkerd2/templates/identity-rbac.yaml | 2 +- cli/cmd/testdata/install_config.golden | 2 +- cli/cmd/testdata/install_default.golden | 2 +- cli/cmd/testdata/install_ha_output.golden | 2 +- cli/cmd/testdata/install_ha_with_overrides_output.golden | 2 +- cli/cmd/testdata/install_helm_output.golden | 2 +- cli/cmd/testdata/install_helm_output_ha.golden | 2 +- cli/cmd/testdata/install_no_init_container.golden | 2 +- cli/cmd/testdata/install_output.golden | 2 +- cli/cmd/testdata/upgrade_default.golden | 2 +- cli/cmd/testdata/upgrade_external_issuer.golden | 2 +- cli/cmd/testdata/upgrade_ha.golden | 2 +- cli/cmd/testdata/upgrade_ha_config.golden | 2 +- controller/cmd/identity/main.go | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/charts/linkerd2/templates/identity-rbac.yaml b/charts/linkerd2/templates/identity-rbac.yaml index 41d10d3cf..69d071970 100644 --- a/charts/linkerd2/templates/identity-rbac.yaml +++ b/charts/linkerd2/templates/identity-rbac.yaml @@ -16,7 +16,7 @@ rules: - apiGroups: ["authentication.k8s.io"] resources: ["tokenreviews"] verbs: ["create"] -- apiGroups: ["extensions"] +- apiGroups: ["apps"] resources: ["deployments"] verbs: ["get"] - apiGroups: [""] diff --git a/cli/cmd/testdata/install_config.golden b/cli/cmd/testdata/install_config.golden index 3147bc3d4..d85019605 100644 --- a/cli/cmd/testdata/install_config.golden +++ b/cli/cmd/testdata/install_config.golden @@ -31,7 +31,7 @@ rules: - apiGroups: ["authentication.k8s.io"] resources: ["tokenreviews"] verbs: ["create"] -- apiGroups: ["extensions"] +- apiGroups: ["apps"] resources: ["deployments"] verbs: ["get"] - apiGroups: [""] diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden index fad20b474..2ca7752a8 100644 --- a/cli/cmd/testdata/install_default.golden +++ b/cli/cmd/testdata/install_default.golden @@ -31,7 +31,7 @@ rules: - apiGroups: ["authentication.k8s.io"] resources: ["tokenreviews"] verbs: ["create"] -- apiGroups: ["extensions"] +- apiGroups: ["apps"] resources: ["deployments"] verbs: ["get"] - apiGroups: [""] diff --git a/cli/cmd/testdata/install_ha_output.golden b/cli/cmd/testdata/install_ha_output.golden index 0d649d6e2..6b685bfd8 100644 --- a/cli/cmd/testdata/install_ha_output.golden +++ b/cli/cmd/testdata/install_ha_output.golden @@ -31,7 +31,7 @@ rules: - apiGroups: ["authentication.k8s.io"] resources: ["tokenreviews"] verbs: ["create"] -- apiGroups: ["extensions"] +- apiGroups: ["apps"] resources: ["deployments"] verbs: ["get"] - apiGroups: [""] diff --git a/cli/cmd/testdata/install_ha_with_overrides_output.golden b/cli/cmd/testdata/install_ha_with_overrides_output.golden index 1a9ebacf1..37623aa82 100644 --- a/cli/cmd/testdata/install_ha_with_overrides_output.golden +++ b/cli/cmd/testdata/install_ha_with_overrides_output.golden @@ -31,7 +31,7 @@ rules: - apiGroups: ["authentication.k8s.io"] resources: ["tokenreviews"] verbs: ["create"] -- apiGroups: ["extensions"] +- apiGroups: ["apps"] resources: ["deployments"] verbs: ["get"] - apiGroups: [""] diff --git a/cli/cmd/testdata/install_helm_output.golden b/cli/cmd/testdata/install_helm_output.golden index ccce35ddd..d04777527 100644 --- a/cli/cmd/testdata/install_helm_output.golden +++ b/cli/cmd/testdata/install_helm_output.golden @@ -32,7 +32,7 @@ rules: - apiGroups: ["authentication.k8s.io"] resources: ["tokenreviews"] verbs: ["create"] -- apiGroups: ["extensions"] +- apiGroups: ["apps"] resources: ["deployments"] verbs: ["get"] - apiGroups: [""] diff --git a/cli/cmd/testdata/install_helm_output_ha.golden b/cli/cmd/testdata/install_helm_output_ha.golden index c614bd643..d3f3c0272 100644 --- a/cli/cmd/testdata/install_helm_output_ha.golden +++ b/cli/cmd/testdata/install_helm_output_ha.golden @@ -32,7 +32,7 @@ rules: - apiGroups: ["authentication.k8s.io"] resources: ["tokenreviews"] verbs: ["create"] -- apiGroups: ["extensions"] +- apiGroups: ["apps"] resources: ["deployments"] verbs: ["get"] - apiGroups: [""] diff --git a/cli/cmd/testdata/install_no_init_container.golden b/cli/cmd/testdata/install_no_init_container.golden index bc7552a54..fdd4ff7ff 100644 --- a/cli/cmd/testdata/install_no_init_container.golden +++ b/cli/cmd/testdata/install_no_init_container.golden @@ -31,7 +31,7 @@ rules: - apiGroups: ["authentication.k8s.io"] resources: ["tokenreviews"] verbs: ["create"] -- apiGroups: ["extensions"] +- apiGroups: ["apps"] resources: ["deployments"] verbs: ["get"] - apiGroups: [""] diff --git a/cli/cmd/testdata/install_output.golden b/cli/cmd/testdata/install_output.golden index 2cbbf7c4f..c80b1a425 100644 --- a/cli/cmd/testdata/install_output.golden +++ b/cli/cmd/testdata/install_output.golden @@ -31,7 +31,7 @@ rules: - apiGroups: ["authentication.k8s.io"] resources: ["tokenreviews"] verbs: ["create"] -- apiGroups: ["extensions"] +- apiGroups: ["apps"] resources: ["deployments"] verbs: ["get"] - apiGroups: [""] diff --git a/cli/cmd/testdata/upgrade_default.golden b/cli/cmd/testdata/upgrade_default.golden index 502390ee9..be566c053 100644 --- a/cli/cmd/testdata/upgrade_default.golden +++ b/cli/cmd/testdata/upgrade_default.golden @@ -31,7 +31,7 @@ rules: - apiGroups: ["authentication.k8s.io"] resources: ["tokenreviews"] verbs: ["create"] -- apiGroups: ["extensions"] +- apiGroups: ["apps"] resources: ["deployments"] verbs: ["get"] - apiGroups: [""] diff --git a/cli/cmd/testdata/upgrade_external_issuer.golden b/cli/cmd/testdata/upgrade_external_issuer.golden index c216026d2..bbd6d6df8 100644 --- a/cli/cmd/testdata/upgrade_external_issuer.golden +++ b/cli/cmd/testdata/upgrade_external_issuer.golden @@ -31,7 +31,7 @@ rules: - apiGroups: ["authentication.k8s.io"] resources: ["tokenreviews"] verbs: ["create"] -- apiGroups: ["extensions"] +- apiGroups: ["apps"] resources: ["deployments"] verbs: ["get"] - apiGroups: [""] diff --git a/cli/cmd/testdata/upgrade_ha.golden b/cli/cmd/testdata/upgrade_ha.golden index 36797d2f8..bbe1faf5d 100644 --- a/cli/cmd/testdata/upgrade_ha.golden +++ b/cli/cmd/testdata/upgrade_ha.golden @@ -31,7 +31,7 @@ rules: - apiGroups: ["authentication.k8s.io"] resources: ["tokenreviews"] verbs: ["create"] -- apiGroups: ["extensions"] +- apiGroups: ["apps"] resources: ["deployments"] verbs: ["get"] - apiGroups: [""] diff --git a/cli/cmd/testdata/upgrade_ha_config.golden b/cli/cmd/testdata/upgrade_ha_config.golden index 4752aa6e9..ceaa9cd21 100644 --- a/cli/cmd/testdata/upgrade_ha_config.golden +++ b/cli/cmd/testdata/upgrade_ha_config.golden @@ -31,7 +31,7 @@ rules: - apiGroups: ["authentication.k8s.io"] resources: ["tokenreviews"] verbs: ["create"] -- apiGroups: ["extensions"] +- apiGroups: ["apps"] resources: ["deployments"] verbs: ["get"] - apiGroups: [""] diff --git a/controller/cmd/identity/main.go b/controller/cmd/identity/main.go index a5a7656c3..a36593e08 100644 --- a/controller/cmd/identity/main.go +++ b/controller/cmd/identity/main.go @@ -142,7 +142,7 @@ func Main(args []string) { Interface: k8sAPI.CoreV1().Events(controllerNS), }) recorder := eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: componentName}) - deployment, err := k8sAPI.ExtensionsV1beta1().Deployments(controllerNS).Get(componentName, v1machinary.GetOptions{}) + deployment, err := k8sAPI.AppsV1().Deployments(controllerNS).Get(componentName, v1machinary.GetOptions{}) if err != nil { log.Fatalf("Failed to construct k8s event recorder: %s", err)