Skip to content

Commit 55be603

Browse files
committed
TEST: Fix failing e2e tests with kubernetes < v1.23
Without using the right version of kubeadm.k8s.io, the ClusterConfiguration patch for SSL does not get applied.
1 parent 3dbd1eb commit 55be603

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

.gitlab-ci.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ unit-tests:
9393
- wget -nv -O /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/${KUBECTL}/bin/linux/amd64/kubectl
9494
- chmod +x /usr/local/bin/kubectl
9595
- sed -i "s/K8S_VERSION/$K8S_VERSION/g" ".gitlab/kind-config.yaml"
96+
- sed -i "s/KUBEADM_VER/$KUBEADM_VER/g" ".gitlab/kind-config.yaml"
9697
- sed -i "s~CI_REGISTRY_GO~$CI_REGISTRY_GO~g" ".gitlab/kind-config.yaml"
9798
- sed -i "s~FROM golang~FROM $CI_REGISTRY_GO/golang~g" "build/Dockerfile"
9899
- sed -i "s~FROM haproxytech/haproxy-alpine~FROM $CI_REGISTRY_GO/haproxy-alpine~g" "build/Dockerfile"
@@ -119,24 +120,30 @@ unit-tests:
119120
k8s_19:
120121
variables:
121122
K8S_VERSION: v1.19.16
123+
KUBEADM_VER: v1beta2
122124
extends: .kind_deployment_schedules
123125
k8s_20:
124126
variables:
125127
K8S_VERSION: v1.20.15
128+
KUBEADM_VER: v1beta2
126129
extends: .kind_deployment_schedules
127130
k8s_21:
128131
variables:
129132
K8S_VERSION: v1.21.12
133+
KUBEADM_VER: v1beta2
130134
extends: .kind_deployment_schedules
131135
k8s_22:
132136
variables:
133137
K8S_VERSION: v1.22.9
138+
KUBEADM_VER: v1beta2
134139
extends: .kind_deployment_schedules
135140
k8s_23:
136141
variables:
137142
K8S_VERSION: v1.23.6
143+
KUBEADM_VER: v1beta3
138144
extends: .kind_deployment_schedules
139145
k8s_24:
140146
variables:
141147
K8S_VERSION: v1.24.3
148+
KUBEADM_VER: v1beta3
142149
extends: .kind_deployment

.gitlab/kind-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ networking:
55
# add to the apiServer certSANs the name of the docker (dind) service in order to be able to reach the cluster through it
66
kubeadmConfigPatchesJSON6902:
77
- group: kubeadm.k8s.io
8-
version: v1beta3
8+
version: KUBEADM_VER
99
kind: ClusterConfiguration
1010
patch: |
1111
- op: add

0 commit comments

Comments
 (0)