Skip to content

Commit ab5efb3

Browse files
k8s-infra-cherrypick-robotcpanato
k8s-infra-cherrypick-robot
and
cpanato
authored
[release-1.1] Update capi 115 and capdo images (#363)
* update capi to 1.1.5 Signed-off-by: cpanato <ctadeu@gmail.com> * update capdo images to use 1.22.11 and 1.23.8 Signed-off-by: cpanato <ctadeu@gmail.com> Co-authored-by: cpanato <ctadeu@gmail.com>
1 parent dedf6e1 commit ab5efb3

File tree

6 files changed

+39
-38
lines changed

6 files changed

+39
-38
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST)
431431
./hack/install-cert-manager.sh
432432

433433
# Deploy CAPI
434-
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.4/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -
434+
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.5/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -
435435

436436
# Deploy CAPDO
437437
kind load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=capdo

‎Tiltfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ settings = {
1616
"deploy_cert_manager": True,
1717
"preload_images_for_kind": True,
1818
"kind_cluster_name": "capdo",
19-
"capi_version": "v1.1.4",
19+
"capi_version": "v1.1.5",
2020
"cert_manager_version": "v1.1.0",
2121
"kubernetes_version": "v1.22.3",
2222
}

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ require (
1616
k8s.io/client-go v0.23.6
1717
k8s.io/klog/v2 v2.60.1
1818
k8s.io/utils v0.0.0-20211208161948-7d6a63dca704
19-
sigs.k8s.io/cluster-api v1.1.4
20-
sigs.k8s.io/cluster-api/test v1.1.4
19+
sigs.k8s.io/cluster-api v1.1.5
20+
sigs.k8s.io/cluster-api/test v1.1.5
2121
sigs.k8s.io/controller-runtime v0.11.2
2222
)
2323

@@ -37,9 +37,9 @@ require (
3737
github.com/blang/semver v3.5.1+incompatible // indirect
3838
github.com/cespare/xxhash/v2 v2.1.1 // indirect
3939
github.com/coredns/caddy v1.1.0 // indirect
40-
github.com/coredns/corefile-migration v1.0.14 // indirect
40+
github.com/coredns/corefile-migration v1.0.17 // indirect
4141
github.com/davecgh/go-spew v1.1.1 // indirect
42-
github.com/docker/distribution v2.7.1+incompatible // indirect
42+
github.com/docker/distribution v2.8.1+incompatible // indirect
4343
github.com/docker/docker v20.10.16+incompatible // indirect
4444
github.com/docker/go-connections v0.4.0 // indirect
4545
github.com/docker/go-units v0.4.0 // indirect
@@ -123,4 +123,4 @@ require (
123123
sigs.k8s.io/yaml v1.3.0 // indirect
124124
)
125125

126-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.1.4
126+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.1.5

‎go.sum‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoC
135135
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
136136
github.com/coredns/caddy v1.1.0 h1:ezvsPrT/tA/7pYDBZxu0cT0VmWk75AfIaf6GSYCNMf0=
137137
github.com/coredns/caddy v1.1.0/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
138-
github.com/coredns/corefile-migration v1.0.14 h1:Tz3WZhoj2NdP8drrQH86NgnCng+VrPjNeg2Oe1ALKag=
139-
github.com/coredns/corefile-migration v1.0.14/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE=
138+
github.com/coredns/corefile-migration v1.0.17 h1:tNwh8+4WOANV6NjSljwgW7qViJfhvPUt1kosj4rR8yg=
139+
github.com/coredns/corefile-migration v1.0.17/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE=
140140
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
141141
github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
142142
github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
@@ -161,8 +161,9 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm
161161
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
162162
github.com/digitalocean/godo v1.81.0 h1:sjb3fOfPfSlUQUK22E87BcI8Zx2qtnF7VUCCO4UK3C8=
163163
github.com/digitalocean/godo v1.81.0/go.mod h1:BPCqvwbjbGqxuUnIKB4EvS/AX7IDnNmt5fwvIkWo+ew=
164-
github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=
165164
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
165+
github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
166+
github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
166167
github.com/docker/docker v20.10.16+incompatible h1:2Db6ZR/+FUR3hqPMwnogOPHFn405crbpxvWzKovETOQ=
167168
github.com/docker/docker v20.10.16+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
168169
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
@@ -1246,10 +1247,10 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8
12461247
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
12471248
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
12481249
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw=
1249-
sigs.k8s.io/cluster-api v1.1.4 h1:mD44GELeiMfQKxyBmsxdYn/FmNAIkFWr2auM++qxx1A=
1250-
sigs.k8s.io/cluster-api v1.1.4/go.mod h1:luiK6hLylbm4Kc7dkRw6KPAvNum9sAqpz5DfkdCaSW8=
1251-
sigs.k8s.io/cluster-api/test v1.1.4 h1:QJSVvAeGtBSf4ImRiyPe1cTZJAGC7QGHZckEfCjLGco=
1252-
sigs.k8s.io/cluster-api/test v1.1.4/go.mod h1:10gpXFNXUuYHoFfmGR98KfsJHuTQIWjRkiU8ggmXbrc=
1250+
sigs.k8s.io/cluster-api v1.1.5 h1:4gV3mg1mlwrm3bFWeXADfL9ILRyufjR47KpwBL3PT6Y=
1251+
sigs.k8s.io/cluster-api v1.1.5/go.mod h1:WBPgw1yJdvybx/U3Ib49T9Q4JurairgnA/s0afxuE/w=
1252+
sigs.k8s.io/cluster-api/test v1.1.5 h1:jukMEA50R3V6G7VcJMR7dMZJPd3Tuf0Orc/6CKuS9Ek=
1253+
sigs.k8s.io/cluster-api/test v1.1.5/go.mod h1:NXFioUFKruk/PgpUt4QrprV9bN1rVUcm7OWao9dfesg=
12531254
sigs.k8s.io/controller-runtime v0.11.2 h1:H5GTxQl0Mc9UjRJhORusqfJCIjBO8UtUxGggCwL1rLA=
12541255
sigs.k8s.io/controller-runtime v0.11.2/go.mod h1:P6QCzrEjLaZGqHsfd+os7JQ+WFZhvB8MRFsn4dWF7O4=
12551256
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 h1:fD1pz4yfdADVNfFmcP2aBEtudwUQ1AlLnRBALr33v3s=

‎test/e2e/config/digitalocean-ci.yaml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ providers:
77
- name: cluster-api
88
type: CoreProvider
99
versions:
10-
- name: v1.1.4
11-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.4/core-components.yaml
10+
- name: v1.1.5
11+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.5/core-components.yaml
1212
type: "url"
1313
files:
1414
- sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"
@@ -20,8 +20,8 @@ providers:
2020
- name: kubeadm
2121
type: BootstrapProvider
2222
versions:
23-
- name: v1.1.4
24-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.4/bootstrap-components.yaml
23+
- name: v1.1.5
24+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.5/bootstrap-components.yaml
2525
type: "url"
2626
files:
2727
- sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"
@@ -33,8 +33,8 @@ providers:
3333
- name: kubeadm
3434
type: ControlPlaneProvider
3535
versions:
36-
- name: v1.1.4
37-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.4/control-plane-components.yaml
36+
- name: v1.1.5
37+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.5/control-plane-components.yaml
3838
type: "url"
3939
files:
4040
- sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"
@@ -67,32 +67,32 @@ providers:
6767

6868
variables:
6969
REDACT_LOG_SCRIPT: "${PWD}/hack/log/redact.sh"
70-
KUBERNETES_VERSION: "v1.22.6"
70+
KUBERNETES_VERSION: "v1.22.11"
7171
EXP_CLUSTER_RESOURCE_SET: "true"
7272
# Cluster Addons
7373
CNI: "${PWD}/test/e2e/data/cni/calico/calico.yaml"
7474
CCM: "${PWD}/test/e2e/data/ccm/digitalocean-cloud-controller-manager.yaml"
7575
# Following CAPDO variables should be set before testing
7676
DO_REGION: "nyc1"
7777
DO_CONTROL_PLANE_MACHINE_TYPE: "s-2vcpu-2gb"
78-
# Cluster API Kubernetes v1.22.6 on Ubuntu 20.04
79-
DO_CONTROL_PLANE_MACHINE_IMAGE: "101591787"
78+
# Cluster API Kubernetes v1.22.11 on Ubuntu 20.04
79+
DO_CONTROL_PLANE_MACHINE_IMAGE: "110971350"
8080
DO_NODE_MACHINE_TYPE: "s-2vcpu-2gb"
81-
# Cluster API Kubernetes v1.22.6 on Ubuntu 20.04
82-
DO_NODE_MACHINE_IMAGE: "101591787"
81+
# Cluster API Kubernetes v1.22.11 on Ubuntu 20.04
82+
DO_NODE_MACHINE_IMAGE: "110971350"
8383
CONFORMANCE_WORKER_MACHINE_COUNT: "2"
8484
CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "1"
8585
KUBETEST_CONFIGURATION: "${PWD}/test/e2e/data/kubetest/conformance.yaml"
8686
ETCD_VERSION_UPGRADE_TO: "3.5.1-0"
8787
COREDNS_VERSION_UPGRADE_TO: "v1.8.6"
88-
# Cluster API Kubernetes v1.22.6 on Ubuntu 20.04
89-
KUBERNETES_IMAGE_UPGRADE_FROM: "101591787"
90-
# Cluster API Kubernetes v1.23.3 on Ubuntu 20.04
91-
KUBERNETES_IMAGE_UPGRADE_TO: "101593074"
88+
# Cluster API Kubernetes v1.22.11 on Ubuntu 20.04
89+
KUBERNETES_IMAGE_UPGRADE_FROM: "110971350"
90+
# Cluster API Kubernetes v1.23.8 on Ubuntu 20.04
91+
KUBERNETES_IMAGE_UPGRADE_TO: "110971520"
9292
CONTROL_PLANE_MACHINE_TEMPLATE_UPGRADE_TO: "cp-k8s-upgrade-and-conformance"
9393
WORKERS_MACHINE_TEMPLATE_UPGRADE_TO: "worker-k8s-upgrade-and-conformance"
94-
KUBERNETES_VERSION_UPGRADE_TO: "${KUBERNETES_VERSION_UPGRADE_TO:-v1.23.3}"
95-
KUBERNETES_VERSION_UPGRADE_FROM: "${KUBERNETES_VERSION_UPGRADE_FROM:-v1.22.6}"
94+
KUBERNETES_VERSION_UPGRADE_TO: "${KUBERNETES_VERSION_UPGRADE_TO:-v1.23.8}"
95+
KUBERNETES_VERSION_UPGRADE_FROM: "${KUBERNETES_VERSION_UPGRADE_FROM:-v1.22.11}"
9696
IP_FAMILY: "IPv4"
9797

9898
intervals:

‎test/e2e/config/digitalocean-dev.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ providers:
77
- name: cluster-api
88
type: CoreProvider
99
versions:
10-
- name: v1.1.4
11-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.4/core-components.yaml
10+
- name: v1.1.5
11+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.5/core-components.yaml
1212
type: "url"
1313
files:
1414
- sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"
@@ -20,8 +20,8 @@ providers:
2020
- name: kubeadm
2121
type: BootstrapProvider
2222
versions:
23-
- name: v1.1.4
24-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.4/bootstrap-components.yaml
23+
- name: v1.1.5
24+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.5/bootstrap-components.yaml
2525
type: "url"
2626
files:
2727
- sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"
@@ -33,8 +33,8 @@ providers:
3333
- name: kubeadm
3434
type: ControlPlaneProvider
3535
versions:
36-
- name: v1.1.4
37-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.4/control-plane-components.yaml
36+
- name: v1.1.5
37+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.5/control-plane-components.yaml
3838
type: "url"
3939
files:
4040
- sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"
@@ -61,7 +61,7 @@ providers:
6161

6262
variables:
6363
REDACT_LOG_SCRIPT: "${PWD}/hack/log/redact.sh"
64-
KUBERNETES_VERSION: "v1.22.4"
64+
KUBERNETES_VERSION: "v1.22.11"
6565
EXP_CLUSTER_RESOURCE_SET: "true"
6666
# Cluster Addons
6767
CNI: "${PWD}/test/e2e/data/cni/calico/calico.yaml"

0 commit comments

Comments
 (0)