Skip to content

Commit

Permalink
🌱 upgrade kube-rbac-proxy to v0.8.0
Browse files Browse the repository at this point in the history
This PR will update kube-rbac-proxy for the release-0.3 branch. This
helps ensure that the CAPI v0.3.x series can be deployed multi-arch. It is a
straight backport from the commit mentioned below with the exception of
fixing merge conflicts around docs.

(cherry picked from commit aa51850)
Signed-off-by: Spencer Smith <[email protected]>
  • Loading branch information
shysank authored and rsmitty committed May 19, 2021
1 parent a9da301 commit 5348554
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
spec:
containers:
- name: kube-rbac-proxy
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1
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/"
Expand Down
4 changes: 2 additions & 2 deletions cmd/clusterctl/client/init_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func Test_clusterctlClient_InitImages(t *testing.T) {
kubeconfigContext: "mgmt-context",
},
expectedImages: []string{
"gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1",
"gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0",
"us.gcr.io/k8s-artifacts-prod/cluster-api-aws/cluster-api-aws-controller:v0.5.3",
},
wantErr: false,
Expand Down Expand Up @@ -894,7 +894,7 @@ spec:
template:
spec:
containers:
- image: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1
- image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
name: kube-rbac-proxy
- image: us.gcr.io/k8s-artifacts-prod/cluster-api-aws/cluster-api-aws-controller:v0.5.3
name: manager
Expand Down
4 changes: 2 additions & 2 deletions cmd/clusterctl/internal/util/objs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func Test_inspectImages(t *testing.T) {
},
{
"name": "kube-rbac-proxy",
"image": "gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1",
"image": "gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0",
},
},
},
Expand All @@ -90,7 +90,7 @@ func Test_inspectImages(t *testing.T) {
},
},
},
want: []string{"gcr.io/k8s-staging-cluster-api/cluster-api-controller:master", "gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1"},
want: []string{"gcr.io/k8s-staging-cluster-api/cluster-api-controller:master", "gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0"},
wantErr: false,
},
{
Expand Down
2 changes: 1 addition & 1 deletion config/ci/manager/manager_auth_proxy_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
spec:
containers:
- name: kube-rbac-proxy
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1
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/"
Expand Down
2 changes: 1 addition & 1 deletion config/manager/manager_auth_proxy_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
spec:
containers:
- name: kube-rbac-proxy
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1
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/"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
spec:
containers:
- name: kube-rbac-proxy
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1
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/"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
spec:
containers:
- name: kube-rbac-proxy
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.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/"
Expand Down

0 comments on commit 5348554

Please sign in to comment.