Skip to content
This repository was archived by the owner on Aug 12, 2025. It is now read-only.

Commit 1ca98a2

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #207 from cpanato/capi-311
🏃 update capi to use release v0.3.11
2 parents 6111559 + d05fd70 commit 1ca98a2

File tree

5 files changed

+29
-23
lines changed

5 files changed

+29
-23
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ require (
1414
k8s.io/client-go v0.17.12
1515
k8s.io/klog v1.0.0
1616
k8s.io/utils v0.0.0-20201015054608-420da100c033
17-
sigs.k8s.io/cluster-api v0.3.10
17+
sigs.k8s.io/cluster-api v0.3.11
1818
sigs.k8s.io/controller-runtime v0.5.11
1919
)

‎go.sum

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9/go.mod h1:+tQajlR
5454
github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI=
5555
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
5656
github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
57-
github.com/coredns/corefile-migration v1.0.10 h1:7HI4r5S5Fne749a+JDxUZppqBpYoZK8Q53ZVK9cn3aM=
58-
github.com/coredns/corefile-migration v1.0.10/go.mod h1:RMy/mXdeDlYwzt0vdMEJvT2hGJ2I86/eO0UdXmH9XNI=
57+
github.com/coredns/corefile-migration v1.0.11 h1:ptBYGW2ADXIB7ZEBPrhhTvNwJLQfxE3Q9IUMBhJCEeI=
58+
github.com/coredns/corefile-migration v1.0.11/go.mod h1:RMy/mXdeDlYwzt0vdMEJvT2hGJ2I86/eO0UdXmH9XNI=
5959
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
6060
github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
6161
github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
@@ -673,6 +673,7 @@ k8s.io/client-go v0.17.12/go.mod h1:nhYL46gOnUPsKHbS9Kacc863ZFnebFdiHha2ncb7LIg=
673673
k8s.io/cluster-bootstrap v0.17.9 h1:IH/MwGor5/7bwHClz0PO/8pKq+SU1eSB1rs645pGu8Y=
674674
k8s.io/cluster-bootstrap v0.17.9/go.mod h1:Q6nXn/sqVfMvT1VIJVPxFboYAoqH06PCjZnaYzbpZC0=
675675
k8s.io/code-generator v0.17.9/go.mod h1:iiHz51+oTx+Z9D0vB3CH3O4HDDPWrvZyUgUYaIE9h9M=
676+
k8s.io/component-base v0.17.9 h1:1CmgQ367Eo6UWkfO1sl7Z99KJpbwkrs9aMY5LZTQR9s=
676677
k8s.io/component-base v0.17.9/go.mod h1:Wg22ePDK0mfTa+bEFgZHGwr0h40lXnYy6D7D+f7itFk=
677678
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
678679
k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
@@ -696,8 +697,8 @@ modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
696697
modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
697698
modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
698699
modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
699-
sigs.k8s.io/cluster-api v0.3.10 h1:iUbnDdFQjp406hclEV1/rRMO7/NpyJ7IxozAaAA9Zns=
700-
sigs.k8s.io/cluster-api v0.3.10/go.mod h1:XBBDBiaczcyNlH4D7FNjSKc5bBofYRppfg0ZgaP2x1U=
700+
sigs.k8s.io/cluster-api v0.3.11 h1:sBXyOCDFAUMlfAL1Z/ttJolfUMsrIjWpyjKFUkADer4=
701+
sigs.k8s.io/cluster-api v0.3.11/go.mod h1:bKh9AXgYRu5d3483NpEVlcVJujDN+rBqMXpG5o69Xss=
701702
sigs.k8s.io/controller-runtime v0.5.11 h1:U/FjGJ61aR2T2mCrdlBCxEcWgLEwLmK6YZKf0NC0a24=
702703
sigs.k8s.io/controller-runtime v0.5.11/go.mod h1:OTqxLuz7gVcrq+BHGUgedRu6b2VIKCEc7Pu4Jbwui0A=
703704
sigs.k8s.io/kind v0.7.1-0.20200303021537-981bd80d3802 h1:L6/8hETA7jvdx3xBcbDifrIN2xaYHE7tA58n+Kdp2Zw=

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ providers:
1313
- name: cluster-api
1414
type: CoreProvider
1515
versions:
16-
- name: v0.3.10
17-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.10/core-components.yaml"
16+
- name: v0.3.11
17+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.11/core-components.yaml"
1818
type: "url"
1919
replacements:
2020
- old: "imagePullPolicy: Always"
@@ -25,8 +25,8 @@ providers:
2525
- name: kubeadm
2626
type: BootstrapProvider
2727
versions:
28-
- name: v0.3.10
29-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.10/bootstrap-components.yaml"
28+
- name: v0.3.11
29+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.11/bootstrap-components.yaml"
3030
type: "url"
3131
replacements:
3232
- old: "imagePullPolicy: Always"
@@ -37,8 +37,8 @@ providers:
3737
- name: kubeadm
3838
type: ControlPlaneProvider
3939
versions:
40-
- name: v0.3.10
41-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.10/control-plane-components.yaml"
40+
- name: v0.3.11
41+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.11/control-plane-components.yaml"
4242
type: "url"
4343
replacements:
4444
- old: "imagePullPolicy: Always"

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ providers:
1313
- name: cluster-api
1414
type: CoreProvider
1515
versions:
16-
- name: v0.3.10
17-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.10/core-components.yaml"
16+
- name: v0.3.11
17+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.11/core-components.yaml"
1818
type: "url"
1919
replacements:
2020
- old: "imagePullPolicy: Always"
@@ -25,8 +25,8 @@ providers:
2525
- name: kubeadm
2626
type: BootstrapProvider
2727
versions:
28-
- name: v0.3.10
29-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.10/bootstrap-components.yaml"
28+
- name: v0.3.11
29+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.11/bootstrap-components.yaml"
3030
type: "url"
3131
replacements:
3232
- old: "imagePullPolicy: Always"
@@ -37,8 +37,8 @@ providers:
3737
- name: kubeadm
3838
type: ControlPlaneProvider
3939
versions:
40-
- name: v0.3.10
41-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.10/control-plane-components.yaml"
40+
- name: v0.3.11
41+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.11/control-plane-components.yaml"
4242
type: "url"
4343
replacements:
4444
- old: "imagePullPolicy: Always"

‎test/e2e/suite_test.go

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,19 +160,24 @@ func loadE2EConfig(configPath string) *clusterctl.E2EConfig {
160160
config := clusterctl.LoadE2EConfig(context.TODO(), clusterctl.LoadE2EConfigInput{ConfigPath: configPath})
161161
Expect(config).ToNot(BeNil(), "Failed to load E2E config from %s", configPath)
162162

163-
// Read CNI file and set CNI_RESOURCES environmental variable
164-
Expect(config.Variables).To(HaveKey(capi_e2e.CNIPath), "Missing %s variable in the config", capi_e2e.CNIPath)
165-
clusterctl.SetCNIEnvVar(config.GetVariable(capi_e2e.CNIPath), capi_e2e.CNIResources)
166-
167163
return config
168164
}
169165

170166
func createClusterctlLocalRepository(config *clusterctl.E2EConfig, repositoryFolder string) string {
171-
clusterctlConfig := clusterctl.CreateRepository(context.TODO(), clusterctl.CreateRepositoryInput{
167+
createRepositoryInput := clusterctl.CreateRepositoryInput{
172168
E2EConfig: config,
173169
RepositoryFolder: repositoryFolder,
174-
})
170+
}
171+
172+
// Ensuring a CNI file is defined in the config and register a FileTransformation to inject the referenced file as in place of the CNI_RESOURCES envSubst variable.
173+
Expect(config.Variables).To(HaveKey(capi_e2e.CNIPath), "Missing %s variable in the config", capi_e2e.CNIPath)
174+
cniPath := config.GetVariable(capi_e2e.CNIPath)
175+
Expect(cniPath).To(BeAnExistingFile(), "The %s variable should resolve to an existing file", capi_e2e.CNIPath)
176+
createRepositoryInput.RegisterClusterResourceSetConfigMapTransformation(cniPath, capi_e2e.CNIResources)
177+
178+
clusterctlConfig := clusterctl.CreateRepository(context.TODO(), createRepositoryInput)
175179
Expect(clusterctlConfig).To(BeAnExistingFile(), "The clusterctl config file does not exists in the local repository %s", repositoryFolder)
180+
176181
return clusterctlConfig
177182
}
178183

0 commit comments

Comments
 (0)