Skip to content

Commit 0d268a4

Browse files
committed
Merge branch 'main' into kubernetes-1.34
2 parents f273448 + 03fc035 commit 0d268a4

7 files changed

Lines changed: 245 additions & 10 deletions

File tree

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,10 @@ check-helm-docs:
163163
./hack/verify-helm-docs
164164

165165
helm-manifest:
166-
@helm template test ./deploy/k8s-osc-ccm/ --set image.tag=v1.31.0 > deploy/osc-ccm-manifest-v1.31.yml
167-
@helm template test ./deploy/k8s-osc-ccm/ --set image.tag=v1.32.0 > deploy/osc-ccm-manifest-v1.32.yml
168-
@helm template test ./deploy/k8s-osc-ccm/ --set image.tag=v1.33.0 > deploy/osc-ccm-manifest-v1.33.yml
166+
@helm template test ./deploy/k8s-osc-ccm/ --set image.tag=v1.31.1 > deploy/osc-ccm-manifest-v1.31.yml
167+
@helm template test ./deploy/k8s-osc-ccm/ --set image.tag=v1.32.1 > deploy/osc-ccm-manifest-v1.32.yml
168+
@helm template test ./deploy/k8s-osc-ccm/ --set image.tag=v1.33.1 > deploy/osc-ccm-manifest-v1.33.yml
169+
@helm template test ./deploy/k8s-osc-ccm/ --set image.tag=v1.34.1 > deploy/osc-ccm-manifest-v1.34.yml
169170

170171
check-helm-manifest:
171172
./hack/verify-helm-manifest.sh

deploy/osc-ccm-manifest-v1.31.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ spec:
146146
serviceAccountName: cloud-controller-manager
147147
containers:
148148
- name: osc-cloud-controller-manager
149-
image: outscale/cloud-provider-osc:v1.31.0
149+
image: outscale/cloud-provider-osc:v1.31.1
150150
imagePullPolicy: IfNotPresent
151151
command:
152152
- /bin/osc-cloud-controller-manager

deploy/osc-ccm-manifest-v1.32.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ spec:
146146
serviceAccountName: cloud-controller-manager
147147
containers:
148148
- name: osc-cloud-controller-manager
149-
image: outscale/cloud-provider-osc:v1.32.0
149+
image: outscale/cloud-provider-osc:v1.32.1
150150
imagePullPolicy: IfNotPresent
151151
command:
152152
- /bin/osc-cloud-controller-manager

deploy/osc-ccm-manifest-v1.33.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ spec:
146146
serviceAccountName: cloud-controller-manager
147147
containers:
148148
- name: osc-cloud-controller-manager
149-
image: outscale/cloud-provider-osc:v1.33.0
149+
image: outscale/cloud-provider-osc:v1.33.1
150150
imagePullPolicy: IfNotPresent
151151
command:
152152
- /bin/osc-cloud-controller-manager

deploy/osc-ccm-manifest-v1.34.yml

Lines changed: 186 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
1+
---
2+
# Source: osc-cloud-controller-manager/templates/serviceaccount.yaml
3+
# ServiceAccount Def
4+
apiVersion: v1
5+
kind: ServiceAccount
6+
metadata:
7+
name: cloud-controller-manager
8+
namespace: kube-system
9+
---
10+
# Source: osc-cloud-controller-manager/templates/osc-ccm.yaml
11+
apiVersion: rbac.authorization.k8s.io/v1
12+
kind: ClusterRole
13+
metadata:
14+
name: system:cloud-controller-manager
15+
rules:
16+
- apiGroups:
17+
- ""
18+
resources:
19+
- events
20+
verbs:
21+
- create
22+
- patch
23+
- update
24+
- apiGroups:
25+
- ""
26+
resources:
27+
- serviceaccounts
28+
verbs:
29+
- create
30+
- apiGroups:
31+
- coordination.k8s.io
32+
resources:
33+
- leases
34+
verbs:
35+
- create
36+
- get
37+
- list
38+
- update
39+
- watch
40+
- apiGroups:
41+
- ""
42+
resourceNames:
43+
- node-controller
44+
- service-controller
45+
- route-controller
46+
resources:
47+
- serviceaccounts/token
48+
verbs:
49+
- create
50+
- apiGroups:
51+
- ""
52+
resources:
53+
- nodes
54+
verbs:
55+
- get
56+
- list
57+
- patch
58+
- update
59+
- watch
60+
- apiGroups:
61+
- ""
62+
resources:
63+
- nodes/status
64+
verbs:
65+
- patch
66+
- apiGroups:
67+
- ""
68+
resources:
69+
- services
70+
verbs:
71+
- list
72+
- patch
73+
- update
74+
- watch
75+
- apiGroups:
76+
- ""
77+
resources:
78+
- services/status
79+
verbs:
80+
- patch
81+
- update
82+
- list
83+
- watch
84+
- apiGroups:
85+
- ""
86+
resources:
87+
- endpoints
88+
verbs:
89+
- create
90+
- get
91+
- list
92+
- update
93+
- watch
94+
---
95+
# Source: osc-cloud-controller-manager/templates/osc-ccm.yaml
96+
# CCM Service
97+
apiVersion: rbac.authorization.k8s.io/v1
98+
kind: ClusterRoleBinding
99+
metadata:
100+
name: system:cloud-controller-manager
101+
roleRef:
102+
apiGroup: rbac.authorization.k8s.io
103+
kind: ClusterRole
104+
name: cluster-admin
105+
subjects:
106+
- apiGroup: ""
107+
kind: ServiceAccount
108+
name: cloud-controller-manager
109+
namespace: kube-system
110+
---
111+
# Source: osc-cloud-controller-manager/templates/osc-ccm.yaml
112+
apiVersion: rbac.authorization.k8s.io/v1
113+
kind: RoleBinding
114+
metadata:
115+
name: cloud-controller-manager:apiserver-authentication-reader
116+
namespace: kube-system
117+
roleRef:
118+
apiGroup: rbac.authorization.k8s.io
119+
kind: Role
120+
name: extension-apiserver-authentication-reader
121+
subjects:
122+
- apiGroup: ""
123+
kind: ServiceAccount
124+
name: cloud-controller-manager
125+
namespace: kube-system
126+
---
127+
# Source: osc-cloud-controller-manager/templates/osc-ccm.yaml
128+
apiVersion: apps/v1
129+
kind: DaemonSet
130+
metadata:
131+
labels:
132+
app: osc-cloud-controller-manager
133+
name: osc-cloud-controller-manager
134+
namespace: kube-system
135+
spec:
136+
selector:
137+
matchLabels:
138+
app: osc-cloud-controller-manager
139+
updateStrategy:
140+
type: RollingUpdate
141+
template:
142+
metadata:
143+
labels:
144+
app: osc-cloud-controller-manager
145+
spec:
146+
serviceAccountName: cloud-controller-manager
147+
containers:
148+
- name: osc-cloud-controller-manager
149+
image: outscale/cloud-provider-osc:v1.34.1
150+
imagePullPolicy: IfNotPresent
151+
command:
152+
- /bin/osc-cloud-controller-manager
153+
- --configure-cloud-routes=false
154+
- --cloud-provider=osc
155+
- -v=5
156+
resources:
157+
{}
158+
env:
159+
- name: OSC_ACCESS_KEY
160+
valueFrom:
161+
secretKeyRef:
162+
name: osc-secret
163+
key: access_key
164+
optional: true
165+
- name: OSC_SECRET_KEY
166+
valueFrom:
167+
secretKeyRef:
168+
name: osc-secret
169+
key: secret_key
170+
optional: true
171+
hostNetwork: true
172+
affinity:
173+
nodeAffinity:
174+
requiredDuringSchedulingIgnoredDuringExecution:
175+
nodeSelectorTerms:
176+
- matchExpressions:
177+
- key: node-role.kubernetes.io/control-plane
178+
operator: Exists
179+
nodeSelector:
180+
{}
181+
tolerations:
182+
- effect: NoSchedule
183+
key: node.cloudprovider.kubernetes.io/uninitialized
184+
value: "true"
185+
- effect: NoSchedule
186+
key: node-role.kubernetes.io/control-plane

docs/CHANGELOG.md

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,69 @@
11
# Changelog
22

3+
## [v1.34.1] - 2025-11-26
4+
5+
New release for Kubernetes 1.34.
6+
7+
### ✨ Added
8+
* ✨ feat: check credentials at boot by @jfbus in https://github.com/outscale/cloud-provider-osc/pull/547
9+
### 🐛 Fixed
10+
* 🐛 fix: nodes should be removed when terminated by @jfbus in https://github.com/outscale/cloud-provider-osc/pull/546
11+
### 📦 Dependency updates
12+
* ⬆️ deps: Bump github.com/outscale/osc-sdk-go/v2 from 2.29.0 to 2.31.0 by @dependabot[bot] in https://github.com/outscale/cloud-provider-osc/pull/524
13+
* ⬆️ build(deps): bump golang.org/x/crypto from 0.41.0 to 0.45.0 by @dependabot[bot] in https://github.com/outscale/cloud-provider-osc/pull/542
14+
15+
## [v1.33.1] - 2025-11-26
16+
17+
### ✨ Added
18+
* ✨ feat: check credentials at boot by @jfbus in https://github.com/outscale/cloud-provider-osc/pull/547
19+
### 🐛 Fixed
20+
* 🐛 fix: nodes should be removed when terminated by @jfbus in https://github.com/outscale/cloud-provider-osc/pull/546
21+
### 📦 Dependency updates
22+
* ⬆️ deps: Bump github.com/outscale/osc-sdk-go/v2 from 2.29.0 to 2.31.0 by @dependabot[bot] in https://github.com/outscale/cloud-provider-osc/pull/524
23+
* ⬆️ build(deps): bump golang.org/x/crypto from 0.41.0 to 0.45.0 by @dependabot[bot] in https://github.com/outscale/cloud-provider-osc/pull/542
24+
25+
## [v1.32.1] - 2025-11-26
26+
27+
### ✨ Added
28+
* ✨ feat: check credentials at boot by @jfbus in https://github.com/outscale/cloud-provider-osc/pull/547
29+
### 🐛 Fixed
30+
* 🐛 fix: nodes should be removed when terminated by @jfbus in https://github.com/outscale/cloud-provider-osc/pull/546
31+
### 📦 Dependency updates
32+
* ⬆️ deps: Bump github.com/outscale/osc-sdk-go/v2 from 2.29.0 to 2.31.0 by @dependabot[bot] in https://github.com/outscale/cloud-provider-osc/pull/524
33+
* ⬆️ build(deps): bump golang.org/x/crypto from 0.41.0 to 0.45.0 by @dependabot[bot] in https://github.com/outscale/cloud-provider-osc/pull/542
34+
35+
## [v1.31.1] - 2025-11-26
36+
37+
### ✨ Added
38+
* ✨ feat: check credentials at boot by @jfbus in https://github.com/outscale/cloud-provider-osc/pull/547
39+
### 🐛 Fixed
40+
* 🐛 fix: nodes should be removed when terminated by @jfbus in https://github.com/outscale/cloud-provider-osc/pull/546
41+
### 📦 Dependency updates
42+
* ⬆️ deps: Bump github.com/outscale/osc-sdk-go/v2 from 2.29.0 to 2.31.0 by @dependabot[bot] in https://github.com/outscale/cloud-provider-osc/pull/524
43+
* ⬆️ build(deps): bump golang.org/x/crypto from 0.41.0 to 0.45.0 by @dependabot[bot] in https://github.com/outscale/cloud-provider-osc/pull/542
44+
345
## [v1.33.0] - 2025-11-19
446

47+
New release for Kubernetes 1.33.
48+
549
### ✨ Added
650
* ✨feat(loadbalancer): implement ipmode by @moh2a in https://github.com/outscale/cloud-provider-osc/pull/518
751
### 🛠️ Changed / Refactoring
852
* 🔊 logs: fix LBU response logging / switch to Go 1.25 by @jfbus in https://github.com/outscale/cloud-provider-osc/pull/519
953

1054
## [v1.32.0] - 2025-11-19
1155

56+
New release for Kubernetes 1.32.
57+
1258
### ✨ Added
1359
* ✨feat(loadbalancer): implement ipmode by @moh2a in https://github.com/outscale/cloud-provider-osc/pull/518
1460
### 🛠️ Changed / Refactoring
1561
* 🔊 logs: fix LBU response logging / switch to Go 1.25 by @jfbus in https://github.com/outscale/cloud-provider-osc/pull/519
1662

1763
## [v1.31.0] - 2025-11-19
1864

65+
New release for Kubernetes 1.31.
66+
1967
### ✨ Added
2068
* ✨feat(loadbalancer): implement ipmode by @moh2a in https://github.com/outscale/cloud-provider-osc/pull/518
2169
### 🛠️ Changed / Refactoring

docs/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ CCM versions are available for Kubernetes 1.31, 1.32, and 1.33. As Kubernetes 1.
3030
| Kubernetes version | Recommended CCM version |
3131
|--------------------|-------------------------|
3232
| v1.30.x | v0.2.8 |
33-
| v1.31.x | v1.31.0 |
34-
| v1.32.x | v1.32.0 |
35-
| v1.33.x | v1.33.0 |
36-
| v1.34.x | to be released |
33+
| v1.31.x | v1.31.1 |
34+
| v1.32.x | v1.32.1 |
35+
| v1.33.x | v1.33.1 |
36+
| v1.34.x | v1.34.1 |
3737

3838
## Deployment on a new cluster
3939

0 commit comments

Comments
 (0)