-
Notifications
You must be signed in to change notification settings - Fork 296
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Prepare main branch for v1.12 development
Signed-off-by: Stefan Büringer [email protected]
- Loading branch information
1 parent
bfbf8a4
commit 624a9fc
Showing
39 changed files
with
4,162 additions
and
62 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -42,3 +42,6 @@ releaseSeries: | |
- major: 1 | ||
minor: 11 | ||
contract: v1beta1 | ||
- major: 1 | ||
minor: 12 | ||
contract: v1beta1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -53,15 +53,6 @@ providers: | |
replacements: | ||
- old: "imagePullPolicy: Always" | ||
new: "imagePullPolicy: IfNotPresent" | ||
- name: "{go://sigs.k8s.io/[email protected]}" # supported release in the v1beta1 series | ||
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/core-components.yaml" | ||
type: "url" | ||
contract: v1beta1 | ||
files: | ||
- sourcePath: "../data/shared/capi/v1.5/metadata.yaml" | ||
replacements: | ||
- old: "imagePullPolicy: Always" | ||
new: "imagePullPolicy: IfNotPresent" | ||
|
||
- name: kubeadm | ||
type: BootstrapProvider | ||
|
@@ -93,15 +84,6 @@ providers: | |
replacements: | ||
- old: "imagePullPolicy: Always" | ||
new: "imagePullPolicy: IfNotPresent" | ||
- name: "{go://sigs.k8s.io/[email protected]}" # supported release in the v1beta1 series | ||
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/bootstrap-components.yaml" | ||
type: "url" | ||
contract: v1beta1 | ||
files: | ||
- sourcePath: "../data/shared/capi/v1.5/metadata.yaml" | ||
replacements: | ||
- old: "imagePullPolicy: Always" | ||
new: "imagePullPolicy: IfNotPresent" | ||
|
||
- name: kubeadm | ||
type: ControlPlaneProvider | ||
|
@@ -133,15 +115,6 @@ providers: | |
replacements: | ||
- old: "imagePullPolicy: Always" | ||
new: "imagePullPolicy: IfNotPresent" | ||
- name: "{go://sigs.k8s.io/[email protected]}" # supported release in the v1beta1 series | ||
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/control-plane-components.yaml" | ||
type: "url" | ||
contract: v1beta1 | ||
files: | ||
- sourcePath: "../data/shared/capi/v1.5/metadata.yaml" | ||
replacements: | ||
- old: "imagePullPolicy: Always" | ||
new: "imagePullPolicy: IfNotPresent" | ||
|
||
- name: in-cluster | ||
type: IPAMProvider | ||
|
@@ -159,7 +132,7 @@ providers: | |
- name: vsphere | ||
type: InfrastructureProvider | ||
versions: | ||
- name: v1.11.99 # next release | ||
- name: v1.12.99 # next release | ||
# Use manifest from source files | ||
value: ../../../../cluster-api-provider-vsphere/config/default | ||
contract: v1beta1 | ||
|
@@ -191,6 +164,17 @@ providers: | |
- sourcePath: "../../../test/e2e/data/infrastructure-vsphere-supervisor/main/cluster-template-conformance-supervisor.yaml" | ||
- sourcePath: "../../../test/e2e/data/infrastructure-vsphere-supervisor/main/cluster-template-ownerrefs-finalizers-supervisor.yaml" | ||
- sourcePath: "../data/shared/capv/main/metadata.yaml" | ||
- name: "{go://sigs.k8s.io/[email protected]}" # supported release in the v1beta1 series | ||
value: "https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/releases/download/{go://sigs.k8s.io/[email protected]}/infrastructure-components.yaml" | ||
type: "url" | ||
contract: v1beta1 | ||
files: | ||
# Add a cluster template | ||
- sourcePath: "../../../test/e2e/data/infrastructure-vsphere-govmomi/v1.11/cluster-template-workload.yaml" | ||
- sourcePath: "../../../test/e2e/data/infrastructure-vsphere-govmomi/v1.11/clusterclass-quick-start.yaml" | ||
- sourcePath: "../../../test/e2e/data/infrastructure-vsphere-supervisor/v1.11/cluster-template-workload-supervisor.yaml" | ||
- sourcePath: "../../../test/e2e/data/infrastructure-vsphere-supervisor/v1.11/clusterclass-quick-start-supervisor.yaml" | ||
- sourcePath: "../data/shared/capv/v1.11/metadata.yaml" | ||
- name: "{go://sigs.k8s.io/[email protected]}" # supported release in the v1beta1 series | ||
value: "https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/releases/download/{go://sigs.k8s.io/[email protected]}/infrastructure-components.yaml" | ||
type: "url" | ||
|
@@ -217,7 +201,7 @@ providers: | |
- name: vcsim | ||
type: RuntimeExtensionProvider # vcsim isn't a provider, but we fake it is so it can be handled by the clusterctl machinery. | ||
versions: | ||
- name: v1.11.99 | ||
- name: v1.12.99 | ||
# Use manifest from source files | ||
value: ../../../../cluster-api-provider-vsphere/test/infrastructure/vcsim/config/default | ||
contract: v1beta1 | ||
|
@@ -242,7 +226,7 @@ providers: | |
- name: net-operator | ||
type: RuntimeExtensionProvider # net-operator isn't a provider, but we fake it is so it can be handled by the clusterctl machinery. | ||
versions: | ||
- name: v1.11.99 | ||
- name: v1.12.99 | ||
# Use manifest from source files | ||
value: ../../../../cluster-api-provider-vsphere/test/infrastructure/net-operator/config/default | ||
contract: v1beta1 | ||
|
@@ -255,7 +239,7 @@ providers: | |
- name: capv-test-extension | ||
type: RuntimeExtensionProvider | ||
versions: | ||
- name: v1.11.99 | ||
- name: v1.12.99 | ||
# Use manifest from source files | ||
value: ../../../../cluster-api-provider-vsphere/test/extension/config/default | ||
contract: v1beta1 | ||
|
Oops, something went wrong.