Skip to content

Commit e800880

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #909 from cpanato/update-capi-137
Update CAPI to release v1.3.7
2 parents ab80998 + 5c40956 commit e800880

File tree

6 files changed

+62
-62
lines changed

6 files changed

+62
-62
lines changed

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# Build the manager binary
16-
FROM golang:1.19.7@sha256:5ba5ed13de753eb50daef1a750f78a1ec6ebd9fbb58b5a7a608efd5df7429c57 as builder
16+
FROM golang:1.19.8@sha256:9f2dd04486e84eec72d945b077d568976981d9afed8b4e2aeb08f7ab739292b3 as builder
1717
WORKDIR /workspace
1818

1919
# Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy

‎Makefile

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

475475
# Deploy CAPI
476-
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -
476+
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.7/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -
477477

478478
# Deploy CAPG
479479
$(KIND) load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=clusterapi

‎Tiltfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ settings = {
1818
"deploy_cert_manager": True,
1919
"preload_images_for_kind": True,
2020
"kind_cluster_name": "capg",
21-
"capi_version": "v1.3.5",
21+
"capi_version": "v1.3.7",
2222
"cert_manager_version": "v1.11.0",
2323
"kubernetes_version": "v1.25.5",
2424
}

‎go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ require (
2727
k8s.io/component-base v0.25.5
2828
k8s.io/klog/v2 v2.80.1
2929
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73
30-
sigs.k8s.io/cluster-api v1.3.5
31-
sigs.k8s.io/cluster-api/test v1.3.5
30+
sigs.k8s.io/cluster-api v1.3.7
31+
sigs.k8s.io/cluster-api/test v1.3.7
3232
sigs.k8s.io/controller-runtime v0.13.1
3333
)
3434

@@ -51,7 +51,7 @@ require (
5151
github.com/coredns/corefile-migration v1.0.20 // indirect
5252
github.com/davecgh/go-spew v1.1.1 // indirect
5353
github.com/docker/distribution v2.8.1+incompatible // indirect
54-
github.com/docker/docker v20.10.21+incompatible // indirect
54+
github.com/docker/docker v20.10.24+incompatible // indirect
5555
github.com/docker/go-connections v0.4.0 // indirect
5656
github.com/docker/go-units v0.4.0 // indirect
5757
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
@@ -138,9 +138,9 @@ require (
138138
k8s.io/cluster-bootstrap v0.25.0 // indirect
139139
k8s.io/kube-openapi v0.0.0-20220803164354-a70c9af30aea // indirect
140140
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
141-
sigs.k8s.io/kind v0.17.0 // indirect
141+
sigs.k8s.io/kind v0.18.0 // indirect
142142
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
143143
sigs.k8s.io/yaml v1.3.0 // indirect
144144
)
145145

146-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.3.5
146+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.3.7

‎go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm
130130
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
131131
github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
132132
github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
133-
github.com/docker/docker v20.10.21+incompatible h1:UTLdBmHk3bEY+w8qeO5KttOhy6OmXWsl/FEet9Uswog=
134-
github.com/docker/docker v20.10.21+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
133+
github.com/docker/docker v20.10.24+incompatible h1:Ugvxm7a8+Gz6vqQYQQ2W7GYq5EUPaAiuPgIfVyI3dYE=
134+
github.com/docker/docker v20.10.24+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
135135
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
136136
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
137137
github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
@@ -1009,16 +1009,16 @@ k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
10091009
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
10101010
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
10111011
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
1012-
sigs.k8s.io/cluster-api v1.3.5 h1:Chg56Piv5ip0AFRN83H1I8uIn6qsdk+mr9hdq5Cxkf0=
1013-
sigs.k8s.io/cluster-api v1.3.5/go.mod h1:9FNHNItE5c+klfDLNG3+ApSTX0H4yGAumdbFJMnk6Vc=
1014-
sigs.k8s.io/cluster-api/test v1.3.5 h1:+uY+oMwIK5NOH1S/VPCl5gl9TuUBRRdr/qiji4r1B7I=
1015-
sigs.k8s.io/cluster-api/test v1.3.5/go.mod h1:oRc0fAaj3ZPMuV0GTRQbseZ6IrNyDUB8ReKil5lkAtw=
1012+
sigs.k8s.io/cluster-api v1.3.7 h1:SqVOfGtwmSH2ryuhxruWD6r31PN5UDYBcnAbQCHrC9c=
1013+
sigs.k8s.io/cluster-api v1.3.7/go.mod h1:9FNHNItE5c+klfDLNG3+ApSTX0H4yGAumdbFJMnk6Vc=
1014+
sigs.k8s.io/cluster-api/test v1.3.7 h1:RI9m/qNvILItKTQSWaFL6TPcZcg3Wbu+Iuz3m5JCshU=
1015+
sigs.k8s.io/cluster-api/test v1.3.7/go.mod h1:RwkAw4bkNW0s+AhRokbgEPWGbdN5VxdmOsLNQeuZCoU=
10161016
sigs.k8s.io/controller-runtime v0.13.1 h1:tUsRCSJVM1QQOOeViGeX3GMT3dQF1eePPw6sEE3xSlg=
10171017
sigs.k8s.io/controller-runtime v0.13.1/go.mod h1:Zbz+el8Yg31jubvAEyglRZGdLAjplZl+PgtYNI6WNTI=
10181018
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
10191019
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
1020-
sigs.k8s.io/kind v0.17.0 h1:CScmGz/wX66puA06Gj8OZb76Wmk7JIjgWf5JDvY7msM=
1021-
sigs.k8s.io/kind v0.17.0/go.mod h1:Qqp8AiwOlMZmJWs37Hgs31xcbiYXjtXlRBSftcnZXQk=
1020+
sigs.k8s.io/kind v0.18.0 h1:ahgZdVV1pdhXlYe1f+ztISakT23KdrBl/NFY9JMygzs=
1021+
sigs.k8s.io/kind v0.18.0/go.mod h1:Qqp8AiwOlMZmJWs37Hgs31xcbiYXjtXlRBSftcnZXQk=
10221022
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
10231023
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
10241024
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=

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

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -15,62 +15,62 @@ providers:
1515
- name: cluster-api
1616
type: CoreProvider
1717
versions:
18-
- name: v1.3.5
19-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/core-components.yaml
20-
type: url
21-
files:
22-
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
23-
replacements:
24-
- old: "imagePullPolicy: Always"
25-
new: "imagePullPolicy: IfNotPresent"
26-
- old: "--leader-elect"
27-
new: "--leader-elect=false"
18+
- name: v1.3.7
19+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.7/core-components.yaml
20+
type: url
21+
files:
22+
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
23+
replacements:
24+
- old: "imagePullPolicy: Always"
25+
new: "imagePullPolicy: IfNotPresent"
26+
- old: "--leader-elect"
27+
new: "--leader-elect=false"
2828
- name: kubeadm
2929
type: BootstrapProvider
3030
versions:
31-
- name: v1.3.5
32-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/bootstrap-components.yaml
33-
type: url
34-
files:
35-
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
36-
replacements:
37-
- old: "imagePullPolicy: Always"
38-
new: "imagePullPolicy: IfNotPresent"
39-
- old: "--leader-elect"
40-
new: "--leader-elect=false"
31+
- name: v1.3.7
32+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.7/bootstrap-components.yaml
33+
type: url
34+
files:
35+
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
36+
replacements:
37+
- old: "imagePullPolicy: Always"
38+
new: "imagePullPolicy: IfNotPresent"
39+
- old: "--leader-elect"
40+
new: "--leader-elect=false"
4141
- name: kubeadm
4242
type: ControlPlaneProvider
4343
versions:
44-
- name: v1.3.5
45-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/control-plane-components.yaml
46-
type: url
47-
files:
48-
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
49-
replacements:
50-
- old: "imagePullPolicy: Always"
51-
new: "imagePullPolicy: IfNotPresent"
52-
- old: "--leader-elect"
53-
new: "--leader-elect=false"
44+
- name: v1.3.7
45+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.7/control-plane-components.yaml
46+
type: url
47+
files:
48+
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
49+
replacements:
50+
- old: "imagePullPolicy: Always"
51+
new: "imagePullPolicy: IfNotPresent"
52+
- old: "--leader-elect"
53+
new: "--leader-elect=false"
5454
- name: gcp
5555
type: InfrastructureProvider
5656
versions:
57-
- name: v1.3.99 # next; use manifest from source files
58-
value: "${PWD}/config/default"
57+
- name: v1.3.99 # next; use manifest from source files
58+
value: "${PWD}/config/default"
5959
files:
60-
- sourcePath: "${PWD}/metadata.yaml"
61-
targetName: "metadata.yaml"
62-
- sourcePath: "${PWD}/test/e2e/data/infrastructure-gcp/cluster-template-ci.yaml"
63-
targetName: "cluster-template.yaml"
64-
- sourcePath: "${PWD}/test/e2e/data/infrastructure-gcp/cluster-template-prow-ci-version.yaml"
65-
targetName: "cluster-template-conformance-ci-artifacts.yaml"
66-
- sourcePath: "${PWD}/test/e2e/data/infrastructure-gcp/cluster-template-upgrades.yaml"
67-
- sourcePath: "${PWD}/test/e2e/data/infrastructure-gcp/cluster-template-md-remediation.yaml"
68-
- sourcePath: "${PWD}/test/e2e/data/infrastructure-gcp/cluster-template-kcp-remediation.yaml"
69-
- sourcePath: "${PWD}/test/e2e/data/infrastructure-gcp/cluster-template-topology.yaml"
70-
- sourcePath: "${PWD}/test/e2e/data/infrastructure-gcp/clusterclass-quick-start.yaml"
71-
- sourcePath: "${PWD}/test/e2e/data/infrastructure-gcp/cluster-template-ci-with-creds.yaml"
72-
- sourcePath: "${PWD}/test/e2e/data/infrastructure-gcp/cluster-template-ci-gke.yaml"
73-
- sourcePath: "${PWD}/test/e2e/data/infrastructure-gcp/cluster-template-ci-gke-autopilot.yaml"
60+
- sourcePath: "${PWD}/metadata.yaml"
61+
targetName: "metadata.yaml"
62+
- sourcePath: "${PWD}/test/e2e/data/infrastructure-gcp/cluster-template-ci.yaml"
63+
targetName: "cluster-template.yaml"
64+
- sourcePath: "${PWD}/test/e2e/data/infrastructure-gcp/cluster-template-prow-ci-version.yaml"
65+
targetName: "cluster-template-conformance-ci-artifacts.yaml"
66+
- sourcePath: "${PWD}/test/e2e/data/infrastructure-gcp/cluster-template-upgrades.yaml"
67+
- sourcePath: "${PWD}/test/e2e/data/infrastructure-gcp/cluster-template-md-remediation.yaml"
68+
- sourcePath: "${PWD}/test/e2e/data/infrastructure-gcp/cluster-template-kcp-remediation.yaml"
69+
- sourcePath: "${PWD}/test/e2e/data/infrastructure-gcp/cluster-template-topology.yaml"
70+
- sourcePath: "${PWD}/test/e2e/data/infrastructure-gcp/clusterclass-quick-start.yaml"
71+
- sourcePath: "${PWD}/test/e2e/data/infrastructure-gcp/cluster-template-ci-with-creds.yaml"
72+
- sourcePath: "${PWD}/test/e2e/data/infrastructure-gcp/cluster-template-ci-gke.yaml"
73+
- sourcePath: "${PWD}/test/e2e/data/infrastructure-gcp/cluster-template-ci-gke-autopilot.yaml"
7474

7575
variables:
7676
KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.25.5}"

0 commit comments

Comments
 (0)