Skip to content

Commit 8f3b9ef

Browse files
authored
Merge pull request #40 from projectsyn/update-images
Update vcluster images
2 parents b56cac6 + 1d597ca commit 8f3b9ef

File tree

5 files changed

+52
-11
lines changed

5 files changed

+52
-11
lines changed

class/defaults.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ parameters:
1010
k3s:
1111
registry: docker.io
1212
image: rancher/k3s
13-
tag: v1.24.3-k3s1
13+
tag: v1.25.2-k3s1
1414
syncer:
1515
registry: docker.io
1616
image: loftsh/vcluster
17-
tag: "0.11.0"
17+
tag: "0.12.2"
1818
kubectl:
1919
registry: docker.io
2020
image: bitnami/kubectl
21-
tag: "1.24.4"
21+
tag: "1.25.3"
2222

2323
storage:
2424
persistence: true

component/cluster.libsonnet

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,19 @@ local cluster = function(name, options)
7676
'watch',
7777
],
7878
},
79+
{
80+
apiGroups: [
81+
'networking.k8s.io',
82+
],
83+
resources: [
84+
'ingressclasses',
85+
],
86+
verbs: [
87+
'get',
88+
'list',
89+
'watch',
90+
],
91+
},
7992
{
8093
apiGroups: [
8194
'apps',
@@ -299,6 +312,7 @@ local cluster = function(name, options)
299312
args: [
300313
'--name=' + name,
301314
'--out-kube-config-secret=vc-%s-kubeconfig' % name,
315+
'--sync=ingresses',
302316
] + tlsSANs + options.syncer.additional_args,
303317
livenessProbe: {
304318
httpGet: {

tests/golden/defaults/defaults/defaults/10_cluster.yaml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,14 @@ rules:
5757
- get
5858
- list
5959
- watch
60+
- apiGroups:
61+
- networking.k8s.io
62+
resources:
63+
- ingressclasses
64+
verbs:
65+
- get
66+
- list
67+
- watch
6068
- apiGroups:
6169
- apps
6270
resources:
@@ -165,7 +173,7 @@ spec:
165173
command:
166174
- /bin/k3s
167175
env: []
168-
image: docker.io/rancher/k3s:v1.24.3-k3s1
176+
image: docker.io/rancher/k3s:v1.25.2-k3s1
169177
name: vcluster
170178
resources:
171179
limits:
@@ -183,12 +191,13 @@ spec:
183191
- args:
184192
- --name=defaults
185193
- --out-kube-config-secret=vc-defaults-kubeconfig
194+
- --sync=ingresses
186195
- --tls-san=defaults.syn-defaults.svc.cluster.local
187196
- --tls-san=defaults.syn-defaults.svc
188197
- --tls-san=defaults.syn-defaults
189198
- --tls-san=defaults
190199
env: []
191-
image: docker.io/loftsh/vcluster:0.11.0
200+
image: docker.io/loftsh/vcluster:0.12.2
192201
livenessProbe:
193202
failureThreshold: 10
194203
httpGet:

tests/golden/oidc/oidc/oidc/10_cluster.yaml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,14 @@ rules:
5757
- get
5858
- list
5959
- watch
60+
- apiGroups:
61+
- networking.k8s.io
62+
resources:
63+
- ingressclasses
64+
verbs:
65+
- get
66+
- list
67+
- watch
6068
- apiGroups:
6169
- apps
6270
resources:
@@ -169,7 +177,7 @@ spec:
169177
command:
170178
- /bin/k3s
171179
env: []
172-
image: docker.io/rancher/k3s:v1.24.3-k3s1
180+
image: docker.io/rancher/k3s:v1.25.2-k3s1
173181
name: vcluster
174182
resources:
175183
limits:
@@ -187,12 +195,13 @@ spec:
187195
- args:
188196
- --name=oidc
189197
- --out-kube-config-secret=vc-oidc-kubeconfig
198+
- --sync=ingresses
190199
- --tls-san=oidc.testns.svc.cluster.local
191200
- --tls-san=oidc.testns.svc
192201
- --tls-san=oidc.testns
193202
- --tls-san=oidc
194203
env: []
195-
image: docker.io/loftsh/vcluster:0.11.0
204+
image: docker.io/loftsh/vcluster:0.12.2
196205
livenessProbe:
197206
failureThreshold: 10
198207
httpGet:
@@ -393,7 +402,7 @@ spec:
393402
value: /export
394403
- name: VCLUSTER_SERVER_URL
395404
value: https://oidc:443
396-
image: docker.io/bitnami/kubectl:1.24.4
405+
image: docker.io/bitnami/kubectl:1.25.3
397406
imagePullPolicy: IfNotPresent
398407
name: oidc-synthesize
399408
ports: []

tests/golden/openshift/openshift/openshift/10_cluster.yaml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,14 @@ rules:
5757
- get
5858
- list
5959
- watch
60+
- apiGroups:
61+
- networking.k8s.io
62+
resources:
63+
- ingressclasses
64+
verbs:
65+
- get
66+
- list
67+
- watch
6068
- apiGroups:
6169
- apps
6270
resources:
@@ -171,7 +179,7 @@ spec:
171179
command:
172180
- /bin/k3s
173181
env: []
174-
image: docker.io/rancher/k3s:v1.24.3-k3s1
182+
image: docker.io/rancher/k3s:v1.25.2-k3s1
175183
name: vcluster
176184
resources:
177185
limits:
@@ -189,12 +197,13 @@ spec:
189197
- args:
190198
- --name=openshift
191199
- --out-kube-config-secret=vc-openshift-kubeconfig
200+
- --sync=ingresses
192201
- --tls-san=openshift.syn-openshift.svc.cluster.local
193202
- --tls-san=openshift.syn-openshift.svc
194203
- --tls-san=openshift.syn-openshift
195204
- --tls-san=openshift
196205
env: []
197-
image: docker.io/loftsh/vcluster:0.11.0
206+
image: docker.io/loftsh/vcluster:0.12.2
198207
livenessProbe:
199208
failureThreshold: 10
200209
httpGet:
@@ -491,7 +500,7 @@ spec:
491500
value: syn-openshift
492501
- name: VCLUSTER_STS_NAME
493502
value: openshift
494-
image: docker.io/bitnami/kubectl:1.24.4
503+
image: docker.io/bitnami/kubectl:1.25.3
495504
imagePullPolicy: IfNotPresent
496505
name: openshift
497506
ports: []

0 commit comments

Comments
 (0)