From d1105e2a9683bfa21a0106ad6e40c80b7336195e Mon Sep 17 00:00:00 2001 From: Eric Stroczynski Date: Fri, 15 Jan 2021 16:08:15 -0800 Subject: [PATCH 1/2] *: upgrade kube-rbac-proxy to v0.8.0 --- .../book/src/component-config-tutorial/testdata/project/PROJECT | 2 +- .../project/config/default/manager_auth_proxy_patch.yaml | 2 +- .../project/config/default/manager_auth_proxy_patch.yaml | 2 +- .../project/config/default/manager_auth_proxy_patch.yaml | 2 +- .../templates/config/kdefault/manager_auth_proxy_patch.go | 2 +- test/e2e/v3/plugin_cluster_test.go | 2 +- test_e2e.sh | 2 -- test_e2e_local.sh | 2 -- .../config/default/manager_auth_proxy_patch.yaml | 2 +- .../config/default/manager_auth_proxy_patch.yaml | 2 +- .../config/default/manager_auth_proxy_patch.yaml | 2 +- .../project-v3/config/default/manager_auth_proxy_patch.yaml | 2 +- 12 files changed, 10 insertions(+), 14 deletions(-) diff --git a/docs/book/src/component-config-tutorial/testdata/project/PROJECT b/docs/book/src/component-config-tutorial/testdata/project/PROJECT index 162122564fe..bcf8439f704 100644 --- a/docs/book/src/component-config-tutorial/testdata/project/PROJECT +++ b/docs/book/src/component-config-tutorial/testdata/project/PROJECT @@ -1,6 +1,6 @@ componentConfig: true domain: tutorial.kubebuilder.io -layout: go.kubebuilder.io/v3-alpha +layout: go.kubebuilder.io/v3 multigroup: true projectName: project repo: tutorial.kubebuilder.io/project diff --git a/docs/book/src/component-config-tutorial/testdata/project/config/default/manager_auth_proxy_patch.yaml b/docs/book/src/component-config-tutorial/testdata/project/config/default/manager_auth_proxy_patch.yaml index 37c578ab7ae..cf923e8c88a 100644 --- a/docs/book/src/component-config-tutorial/testdata/project/config/default/manager_auth_proxy_patch.yaml +++ b/docs/book/src/component-config-tutorial/testdata/project/config/default/manager_auth_proxy_patch.yaml @@ -10,7 +10,7 @@ spec: spec: containers: - name: kube-rbac-proxy - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0 + image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0 args: - "--secure-listen-address=0.0.0.0:8443" - "--upstream=http://127.0.0.1:8080/" diff --git a/docs/book/src/cronjob-tutorial/testdata/project/config/default/manager_auth_proxy_patch.yaml b/docs/book/src/cronjob-tutorial/testdata/project/config/default/manager_auth_proxy_patch.yaml index 49b1f1ab36e..a224be19ea1 100644 --- a/docs/book/src/cronjob-tutorial/testdata/project/config/default/manager_auth_proxy_patch.yaml +++ b/docs/book/src/cronjob-tutorial/testdata/project/config/default/manager_auth_proxy_patch.yaml @@ -10,7 +10,7 @@ spec: spec: containers: - name: kube-rbac-proxy - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0 + image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0 args: - "--secure-listen-address=0.0.0.0:8443" - "--upstream=http://127.0.0.1:8080/" diff --git a/docs/book/src/multiversion-tutorial/testdata/project/config/default/manager_auth_proxy_patch.yaml b/docs/book/src/multiversion-tutorial/testdata/project/config/default/manager_auth_proxy_patch.yaml index 49b1f1ab36e..a224be19ea1 100644 --- a/docs/book/src/multiversion-tutorial/testdata/project/config/default/manager_auth_proxy_patch.yaml +++ b/docs/book/src/multiversion-tutorial/testdata/project/config/default/manager_auth_proxy_patch.yaml @@ -10,7 +10,7 @@ spec: spec: containers: - name: kube-rbac-proxy - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0 + image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0 args: - "--secure-listen-address=0.0.0.0:8443" - "--upstream=http://127.0.0.1:8080/" diff --git a/pkg/plugins/golang/v3/scaffolds/internal/templates/config/kdefault/manager_auth_proxy_patch.go b/pkg/plugins/golang/v3/scaffolds/internal/templates/config/kdefault/manager_auth_proxy_patch.go index 8f4f21a60ee..8c16598b8af 100644 --- a/pkg/plugins/golang/v3/scaffolds/internal/templates/config/kdefault/manager_auth_proxy_patch.go +++ b/pkg/plugins/golang/v3/scaffolds/internal/templates/config/kdefault/manager_auth_proxy_patch.go @@ -55,7 +55,7 @@ spec: spec: containers: - name: kube-rbac-proxy - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0 + image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0 args: - "--secure-listen-address=0.0.0.0:8443" - "--upstream=http://127.0.0.1:8080/" diff --git a/test/e2e/v3/plugin_cluster_test.go b/test/e2e/v3/plugin_cluster_test.go index e2e039086ed..dff4feed0fd 100644 --- a/test/e2e/v3/plugin_cluster_test.go +++ b/test/e2e/v3/plugin_cluster_test.go @@ -74,7 +74,7 @@ var _ = Describe("kubebuilder", func() { }) }) - Context("plugin go.kubebuilder.io/v3-alpha", func() { + Context("plugin go.kubebuilder.io/v3", func() { // Use cert-manager with v1 CRs. BeforeEach(func() { By("installing the cert-manager bundle") diff --git a/test_e2e.sh b/test_e2e.sh index 85fd5a41dda..51993c1037a 100755 --- a/test_e2e.sh +++ b/test_e2e.sh @@ -29,8 +29,6 @@ build_kb setup_envs source "$(pwd)/scripts/setup.sh" ${KIND_K8S_VERSION} -docker pull gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0 -kind load docker-image gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0 # remove running containers on exit function cleanup() { diff --git a/test_e2e_local.sh b/test_e2e_local.sh index fed4925218a..90527a2ebf7 100755 --- a/test_e2e_local.sh +++ b/test_e2e_local.sh @@ -32,8 +32,6 @@ setup_envs export KIND_CLUSTER=local-kubebuilder-e2e if ! kind get clusters | grep -q $KIND_CLUSTER ; then source "$(pwd)/scripts/setup.sh" ${KIND_K8S_VERSION} $KIND_CLUSTER - docker pull gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0 - kind load --name $KIND_CLUSTER docker-image gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0 fi kind export kubeconfig --kubeconfig $tmp_root/kubeconfig --name $KIND_CLUSTER diff --git a/testdata/project-v3-addon/config/default/manager_auth_proxy_patch.yaml b/testdata/project-v3-addon/config/default/manager_auth_proxy_patch.yaml index 49b1f1ab36e..a224be19ea1 100644 --- a/testdata/project-v3-addon/config/default/manager_auth_proxy_patch.yaml +++ b/testdata/project-v3-addon/config/default/manager_auth_proxy_patch.yaml @@ -10,7 +10,7 @@ spec: spec: containers: - name: kube-rbac-proxy - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0 + image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0 args: - "--secure-listen-address=0.0.0.0:8443" - "--upstream=http://127.0.0.1:8080/" diff --git a/testdata/project-v3-config/config/default/manager_auth_proxy_patch.yaml b/testdata/project-v3-config/config/default/manager_auth_proxy_patch.yaml index 37c578ab7ae..cf923e8c88a 100644 --- a/testdata/project-v3-config/config/default/manager_auth_proxy_patch.yaml +++ b/testdata/project-v3-config/config/default/manager_auth_proxy_patch.yaml @@ -10,7 +10,7 @@ spec: spec: containers: - name: kube-rbac-proxy - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0 + image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0 args: - "--secure-listen-address=0.0.0.0:8443" - "--upstream=http://127.0.0.1:8080/" diff --git a/testdata/project-v3-multigroup/config/default/manager_auth_proxy_patch.yaml b/testdata/project-v3-multigroup/config/default/manager_auth_proxy_patch.yaml index 49b1f1ab36e..a224be19ea1 100644 --- a/testdata/project-v3-multigroup/config/default/manager_auth_proxy_patch.yaml +++ b/testdata/project-v3-multigroup/config/default/manager_auth_proxy_patch.yaml @@ -10,7 +10,7 @@ spec: spec: containers: - name: kube-rbac-proxy - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0 + image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0 args: - "--secure-listen-address=0.0.0.0:8443" - "--upstream=http://127.0.0.1:8080/" diff --git a/testdata/project-v3/config/default/manager_auth_proxy_patch.yaml b/testdata/project-v3/config/default/manager_auth_proxy_patch.yaml index 49b1f1ab36e..a224be19ea1 100644 --- a/testdata/project-v3/config/default/manager_auth_proxy_patch.yaml +++ b/testdata/project-v3/config/default/manager_auth_proxy_patch.yaml @@ -10,7 +10,7 @@ spec: spec: containers: - name: kube-rbac-proxy - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0 + image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0 args: - "--secure-listen-address=0.0.0.0:8443" - "--upstream=http://127.0.0.1:8080/" From 8d108aa84fb126e0e347a1e3b8078cd084b71c38 Mon Sep 17 00:00:00 2001 From: Eric Stroczynski Date: Tue, 19 Jan 2021 16:35:12 -0800 Subject: [PATCH 2/2] test commit Signed-off-by: Eric Stroczynski --- test/e2e/v3/plugin_cluster_test.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/e2e/v3/plugin_cluster_test.go b/test/e2e/v3/plugin_cluster_test.go index dff4feed0fd..07cd3980dc2 100644 --- a/test/e2e/v3/plugin_cluster_test.go +++ b/test/e2e/v3/plugin_cluster_test.go @@ -155,6 +155,11 @@ func Run(kbc *utils.TestContext) { } return nil } + defer func() { + out, err := kbc.Kubectl.CommandInNamespace("describe", "all") + ExpectWithOffset(1, err).NotTo(HaveOccurred()) + fmt.Fprintln(GinkgoWriter, out) + }() EventuallyWithOffset(1, verifyControllerUp, time.Minute, time.Second).Should(Succeed()) By("granting permissions to access the metrics")