Skip to content

Commit 3f6f129

Browse files
committed
fix: AWS CCM manifest
Update helm chart and regen enabling hostNetwork. Signed-off-by: Andrey Smirnov <[email protected]>
1 parent 380973a commit 3f6f129

File tree

2 files changed

+22
-9
lines changed

2 files changed

+22
-9
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ TAG ?= $(shell git describe --tag --always --dirty)
33
TF_PROJECTS := $(shell find examples/terraform/ -name '.terraform' -prune -o -name 'main.tf' -exec dirname {} \;)
44

55
# renovate: datasource=helm depName=aws-cloud-controller-manager
6-
AWS_CCM_HELM_CHART_VERSION ?= 0.0.8
6+
AWS_CCM_HELM_CHART_VERSION ?= 0.0.9
77
# renovate: datasource=github-releases depName=kubernetes/cloud-provider-aws
8-
AWS_CCM_VERSION ?= v1.32.1
8+
AWS_CCM_VERSION ?= v1.33.0
99

1010
.PHONY: fmt
1111
fmt:
@@ -28,4 +28,4 @@ check-dirty: fmt generate ## Verifies that source tree is not dirty
2828
aws-ccm:
2929
helm repo add aws-cloud-controller-manager https://kubernetes.github.io/cloud-provider-aws
3030
helm repo update
31-
helm template --version $(AWS_CCM_HELM_CHART_VERSION) aws-cloud-controller-manager aws-cloud-controller-manager/aws-cloud-controller-manager --set args="{--v=2,--cloud-provider=aws,--configure-cloud-routes=false}" --set image.tag=$(AWS_CCM_VERSION) > examples/terraform/aws/manifests/ccm.yaml
31+
helm template --version $(AWS_CCM_HELM_CHART_VERSION) aws-cloud-controller-manager aws-cloud-controller-manager/aws-cloud-controller-manager --set args="{--v=2,--cloud-provider=aws,--configure-cloud-routes=false}" --set image.tag=$(AWS_CCM_VERSION) --set hostNetworking=true > examples/terraform/aws/manifests/ccm.yaml

examples/terraform/aws/manifests/ccm.yaml

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ metadata:
66
name: cloud-controller-manager
77
namespace: kube-system
88
labels:
9-
helm.sh/chart: "aws-cloud-controller-manager-0.0.8"
9+
helm.sh/chart: "aws-cloud-controller-manager-0.0.9"
1010
---
1111
# Source: aws-cloud-controller-manager/templates/clusterrole.yaml
1212
apiVersion: rbac.authorization.k8s.io/v1
1313
kind: ClusterRole
1414
metadata:
1515
name: system:cloud-controller-manager
1616
labels:
17-
helm.sh/chart: "aws-cloud-controller-manager-0.0.8"
17+
helm.sh/chart: "aws-cloud-controller-manager-0.0.9"
1818
rules:
1919
- apiGroups:
2020
- ""
@@ -95,14 +95,26 @@ rules:
9595
- serviceaccounts/token
9696
verbs:
9797
- create
98+
- apiGroups:
99+
- authentication.k8s.io
100+
resources:
101+
- tokenreviews
102+
verbs:
103+
- create
104+
- apiGroups:
105+
- authorization.k8s.io
106+
resources:
107+
- subjectaccessreviews
108+
verbs:
109+
- create
98110
---
99111
# Source: aws-cloud-controller-manager/templates/cluserrolebinding.yaml
100112
apiVersion: rbac.authorization.k8s.io/v1
101113
kind: ClusterRoleBinding
102114
metadata:
103115
name: system:cloud-controller-manager
104116
labels:
105-
helm.sh/chart: "aws-cloud-controller-manager-0.0.8"
117+
helm.sh/chart: "aws-cloud-controller-manager-0.0.9"
106118
roleRef:
107119
kind: ClusterRole
108120
name: system:cloud-controller-manager
@@ -120,7 +132,7 @@ metadata:
120132
name: cloud-controller-manager:apiserver-authentication-reader
121133
namespace: kube-system
122134
labels:
123-
helm.sh/chart: "aws-cloud-controller-manager-0.0.8"
135+
helm.sh/chart: "aws-cloud-controller-manager-0.0.9"
124136
roleRef:
125137
apiGroup: rbac.authorization.k8s.io
126138
kind: Role
@@ -138,7 +150,7 @@ metadata:
138150
name: aws-cloud-controller-manager
139151
labels:
140152
k8s-app: aws-cloud-controller-manager
141-
helm.sh/chart: "aws-cloud-controller-manager-0.0.8"
153+
helm.sh/chart: "aws-cloud-controller-manager-0.0.9"
142154
namespace: kube-system
143155
spec:
144156
selector:
@@ -165,11 +177,12 @@ spec:
165177
dnsPolicy: Default
166178
priorityClassName: system-node-critical
167179
serviceAccountName: cloud-controller-manager
180+
hostNetwork: true
168181
securityContext:
169182
{}
170183
containers:
171184
- name: aws-cloud-controller-manager
172-
image: "registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.1"
185+
image: "registry.k8s.io/provider-aws/cloud-controller-manager:v1.33.0"
173186
args:
174187
- --v=2
175188
- --cloud-provider=aws

0 commit comments

Comments
 (0)