Skip to content

Commit

Permalink
Upgrade CAPV image to 1.29.0 (#5891)
Browse files Browse the repository at this point in the history
* Update CAPV image to ubuntu22.04-1.29.
* Remove kube-vip from the cluster YAML to simplify Cluster API maintenance.
* Disable VM TX offloading to enhance the compatibility of the data path in CI infrastructure.

Signed-off-by: Shuyang Xin <gavinx@vmware.com>
  • Loading branch information
XinShuYang authored Apr 19, 2024
1 parent 0d80fb5 commit 2dc0201
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 50 deletions.
54 changes: 6 additions & 48 deletions ci/cluster-api/vsphere/templates/cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,54 +66,6 @@ metadata:
namespace: CLUSTERNAMESPACE
spec:
kubeadmConfigSpec:
files:
- content: |
apiVersion: v1
kind: Pod
metadata:
creationTimestamp: null
name: kube-vip
namespace: kube-system
spec:
containers:
- args:
- start
env:
- name: vip_arp
value: "true"
- name: vip_leaderelection
value: "true"
- name: vip_address
value: CONTROLVIP
- name: vip_interface
value: eth0
- name: vip_leaseduration
value: "15"
- name: vip_renewdeadline
value: "10"
- name: vip_retryperiod
value: "2"
image: ghcr.io/kube-vip/kube-vip:v0.3.5
imagePullPolicy: IfNotPresent
name: kube-vip
resources: {}
securityContext:
capabilities:
add:
- NET_ADMIN
- SYS_TIME
volumeMounts:
- mountPath: /etc/kubernetes/admin.conf
name: kubeconfig
hostNetwork: true
volumes:
- hostPath:
path: /etc/kubernetes/admin.conf
type: FileOrCreate
name: kubeconfig
status: {}
owner: root:root
path: /etc/kubernetes/manifests/kube-vip.yaml
initConfiguration:
nodeRegistration:
criSocket: /var/run/containerd/containerd.sock
Expand All @@ -128,7 +80,10 @@ spec:
- echo "127.0.0.1 localhost" >>/etc/hosts
- echo "127.0.0.1 {{ ds.meta_data.hostname }}" >>/etc/hosts
- echo "{{ ds.meta_data.hostname }}" >/etc/hostname
- ip addr add CONTROLVIP/32 dev eth0
- ip link set eth0 mtu 1442
- ethtool -K eth0 tx-udp_tnl-segmentation off tx-udp_tnl-csum-segmentation off
# Work around tunnel checksum offloading issue in some problematic underlying network environments.
useExperimentalRetryJoin: true
users:
- name: capv
Expand All @@ -140,6 +95,7 @@ spec:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: VSphereMachineTemplate
name: CLUSTERNAME
# The replicas of the control plane must be set to 1 because kube-vip has been removed.
replicas: 1
version: K8SVERSION
---
Expand All @@ -162,6 +118,8 @@ spec:
- echo "127.0.0.1 {{ ds.meta_data.hostname }}" >>/etc/hosts
- echo "{{ ds.meta_data.hostname }}" >/etc/hostname
- ip link set eth0 mtu 1442
- ethtool -K eth0 tx-udp_tnl-segmentation off tx-udp_tnl-csum-segmentation off
# Work around tunnel checksum offloading issue in some problematic underlying network environments.
users:
- name: capv
sshAuthorizedKeys:
Expand Down
4 changes: 2 additions & 2 deletions ci/jenkins/test-vmc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,10 @@ function release_static_ip() {
function setup_cluster() {
export KUBECONFIG=$KUBECONFIG_PATH
if [ -z $K8S_VERSION ]; then
export K8S_VERSION=v1.28.0
export K8S_VERSION=v1.29.0
fi
if [ -z $TEST_OS ]; then
export TEST_OS=ubuntu-2004
export TEST_OS=ubuntu-2204
fi
export OVA_TEMPLATE_NAME=${TEST_OS}-kube-${K8S_VERSION}
rm -rf ${GIT_CHECKOUT_DIR}/jenkins || true
Expand Down

0 comments on commit 2dc0201

Please sign in to comment.