Skip to content

Commit

Permalink
Bump kube-rbac-proxy to v0.12.0 (#65)
Browse files Browse the repository at this point in the history
* bump kube-rbac-proxy to v0.12.0

* apply new defaults from kubebuilder 3.4.1
  • Loading branch information
petersutter authored May 18, 2022
1 parent 33dbc89 commit f7aec44
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
IMG ?= eu.gcr.io/gardener-project/gardener/terminal-controller-manager

# Kube RBAC Proxy image to use
IMG_RBAC_PROXY ?= quay.io/brancz/kube-rbac-proxy:v0.8.0
IMG_RBAC_PROXY ?= quay.io/brancz/kube-rbac-proxy:v0.12.0

REPO_ROOT := $(shell git rev-parse --show-toplevel)
VERSION := $(shell cat "$(REPO_ROOT)/VERSION")
Expand Down Expand Up @@ -113,15 +113,15 @@ uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified

.PHONY: deploy-rt
deploy-rt: apply-image kustomize ## Multi-cluster use case: Deploy controller in the configured Kubernetes cluster in ~/.kube/config
kustomize build config/overlay/multi-cluster/runtime | kubectl apply -f -
$(KUSTOMIZE) build config/overlay/multi-cluster/runtime | kubectl apply -f -

.PHONY: deploy-virtual
deploy-virtual: apply-image kustomize ## Multi-cluster use case: Deploy crd, admission configurations etc. in the configured Kubernetes cluster
kustomize build config/overlay/multi-cluster/virtual-garden | kubectl apply -f -
$(KUSTOMIZE) build config/overlay/multi-cluster/virtual-garden | kubectl apply -f -

.PHONY: deploy-singlecluster
deploy-singlecluster: apply-image ## Single-cluster use case: Deploy crd, admission configurations, controller etc. in the configured Kubernetes cluster
kustomize build config/overlay/single-cluster | kubectl apply -f -
$(KUSTOMIZE) build config/overlay/single-cluster | kubectl apply -f -

.PHONY: apply-image
apply-image: manifests kustomize ## Apply terminal controller and kube-rbac-proxy images according to the variables IMG and IMG_RBAC_PROXY
Expand Down
2 changes: 1 addition & 1 deletion config/default/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ patchesStrategicMerge:
images:
- name: quay.io/brancz/kube-rbac-proxy
newName: quay.io/brancz/kube-rbac-proxy
newTag: v0.8.0
newTag: v0.12.0
12 changes: 6 additions & 6 deletions config/default/manager_auth_proxy_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ spec:
spec:
containers:
- name: kube-rbac-proxy
image: quay.io/brancz/kube-rbac-proxy:v0.8.0
image: quay.io/brancz/kube-rbac-proxy:v0.12.0
args:
- "--secure-listen-address=0.0.0.0:8443"
- "--upstream=http://127.0.0.1:8080/"
- "--logtostderr=true"
- "--v=10"
- "--v=0"
ports:
- containerPort: 8443
protocol: TCP
Expand All @@ -28,11 +28,11 @@ spec:
allowPrivilegeEscalation: false
resources:
limits:
cpu: 100m
memory: 30Mi
cpu: 500m
memory: 128Mi
requests:
cpu: 100m
memory: 20Mi
cpu: 5m
memory: 64Mi
- name: manager
args:
- "--health-probe-bind-address=:8081"
Expand Down
1 change: 1 addition & 0 deletions config/rbac-rt/auth_proxy_service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ spec:
ports:
- name: https
port: 8443
protocol: TCP
targetPort: https
selector:
control-plane: controller-manager

0 comments on commit f7aec44

Please sign in to comment.