diff --git a/class/defaults.yml b/class/defaults.yml index acfbc60..2cb59a1 100644 --- a/class/defaults.yml +++ b/class/defaults.yml @@ -10,15 +10,15 @@ parameters: k3s: registry: docker.io image: rancher/k3s - tag: v1.24.3-k3s1 + tag: v1.25.2-k3s1 syncer: registry: docker.io image: loftsh/vcluster - tag: "0.11.0" + tag: "0.12.2" kubectl: registry: docker.io image: bitnami/kubectl - tag: "1.24.4" + tag: "1.25.3" storage: persistence: true diff --git a/component/cluster.libsonnet b/component/cluster.libsonnet index 13bd490..93368ab 100644 --- a/component/cluster.libsonnet +++ b/component/cluster.libsonnet @@ -76,6 +76,19 @@ local cluster = function(name, options) 'watch', ], }, + { + apiGroups: [ + 'networking.k8s.io', + ], + resources: [ + 'ingressclasses', + ], + verbs: [ + 'get', + 'list', + 'watch', + ], + }, { apiGroups: [ 'apps', @@ -299,6 +312,7 @@ local cluster = function(name, options) args: [ '--name=' + name, '--out-kube-config-secret=vc-%s-kubeconfig' % name, + '--sync=ingresses', ] + tlsSANs + options.syncer.additional_args, livenessProbe: { httpGet: { diff --git a/tests/golden/defaults/defaults/defaults/10_cluster.yaml b/tests/golden/defaults/defaults/defaults/10_cluster.yaml index 33937ff..da77eac 100644 --- a/tests/golden/defaults/defaults/defaults/10_cluster.yaml +++ b/tests/golden/defaults/defaults/defaults/10_cluster.yaml @@ -57,6 +57,14 @@ rules: - get - list - watch + - apiGroups: + - networking.k8s.io + resources: + - ingressclasses + verbs: + - get + - list + - watch - apiGroups: - apps resources: @@ -165,7 +173,7 @@ spec: command: - /bin/k3s env: [] - image: docker.io/rancher/k3s:v1.24.3-k3s1 + image: docker.io/rancher/k3s:v1.25.2-k3s1 name: vcluster resources: limits: @@ -183,12 +191,13 @@ spec: - args: - --name=defaults - --out-kube-config-secret=vc-defaults-kubeconfig + - --sync=ingresses - --tls-san=defaults.syn-defaults.svc.cluster.local - --tls-san=defaults.syn-defaults.svc - --tls-san=defaults.syn-defaults - --tls-san=defaults env: [] - image: docker.io/loftsh/vcluster:0.11.0 + image: docker.io/loftsh/vcluster:0.12.2 livenessProbe: failureThreshold: 10 httpGet: diff --git a/tests/golden/oidc/oidc/oidc/10_cluster.yaml b/tests/golden/oidc/oidc/oidc/10_cluster.yaml index 0ba5b69..b834346 100644 --- a/tests/golden/oidc/oidc/oidc/10_cluster.yaml +++ b/tests/golden/oidc/oidc/oidc/10_cluster.yaml @@ -57,6 +57,14 @@ rules: - get - list - watch + - apiGroups: + - networking.k8s.io + resources: + - ingressclasses + verbs: + - get + - list + - watch - apiGroups: - apps resources: @@ -169,7 +177,7 @@ spec: command: - /bin/k3s env: [] - image: docker.io/rancher/k3s:v1.24.3-k3s1 + image: docker.io/rancher/k3s:v1.25.2-k3s1 name: vcluster resources: limits: @@ -187,12 +195,13 @@ spec: - args: - --name=oidc - --out-kube-config-secret=vc-oidc-kubeconfig + - --sync=ingresses - --tls-san=oidc.testns.svc.cluster.local - --tls-san=oidc.testns.svc - --tls-san=oidc.testns - --tls-san=oidc env: [] - image: docker.io/loftsh/vcluster:0.11.0 + image: docker.io/loftsh/vcluster:0.12.2 livenessProbe: failureThreshold: 10 httpGet: @@ -393,7 +402,7 @@ spec: value: /export - name: VCLUSTER_SERVER_URL value: https://oidc:443 - image: docker.io/bitnami/kubectl:1.24.4 + image: docker.io/bitnami/kubectl:1.25.3 imagePullPolicy: IfNotPresent name: oidc-synthesize ports: [] diff --git a/tests/golden/openshift/openshift/openshift/10_cluster.yaml b/tests/golden/openshift/openshift/openshift/10_cluster.yaml index 34108a0..4c65e00 100644 --- a/tests/golden/openshift/openshift/openshift/10_cluster.yaml +++ b/tests/golden/openshift/openshift/openshift/10_cluster.yaml @@ -57,6 +57,14 @@ rules: - get - list - watch + - apiGroups: + - networking.k8s.io + resources: + - ingressclasses + verbs: + - get + - list + - watch - apiGroups: - apps resources: @@ -171,7 +179,7 @@ spec: command: - /bin/k3s env: [] - image: docker.io/rancher/k3s:v1.24.3-k3s1 + image: docker.io/rancher/k3s:v1.25.2-k3s1 name: vcluster resources: limits: @@ -189,12 +197,13 @@ spec: - args: - --name=openshift - --out-kube-config-secret=vc-openshift-kubeconfig + - --sync=ingresses - --tls-san=openshift.syn-openshift.svc.cluster.local - --tls-san=openshift.syn-openshift.svc - --tls-san=openshift.syn-openshift - --tls-san=openshift env: [] - image: docker.io/loftsh/vcluster:0.11.0 + image: docker.io/loftsh/vcluster:0.12.2 livenessProbe: failureThreshold: 10 httpGet: @@ -491,7 +500,7 @@ spec: value: syn-openshift - name: VCLUSTER_STS_NAME value: openshift - image: docker.io/bitnami/kubectl:1.24.4 + image: docker.io/bitnami/kubectl:1.25.3 imagePullPolicy: IfNotPresent name: openshift ports: []