Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🌱 Bump versions for v1.2 #5982

Merged
merged 2 commits into from
Feb 3, 2022
Merged

🌱 Bump versions for v1.2 #5982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4948b77
Add v1.2 to metadata
alexander-demicev Jan 25, 2022
4d7ec52
Bump CAPI version in different configs
alexander-demicev Feb 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cmd/clusterctl/hack/create-local-repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,24 +53,24 @@
providers = {
'cluster-api': {
'componentsFile': 'core-components.yaml',
'nextVersion': 'v1.1.99',
'nextVersion': 'v1.2.99',
'type': 'CoreProvider',
},
'bootstrap-kubeadm': {
'componentsFile': 'bootstrap-components.yaml',
'nextVersion': 'v1.1.99',
'nextVersion': 'v1.2.99',
'type': 'BootstrapProvider',
'configFolder': 'bootstrap/kubeadm/config/default',
},
'control-plane-kubeadm': {
'componentsFile': 'control-plane-components.yaml',
'nextVersion': 'v1.1.99',
'nextVersion': 'v1.2.99',
'type': 'ControlPlaneProvider',
'configFolder': 'controlplane/kubeadm/config/default',
},
'infrastructure-docker': {
'componentsFile': 'infrastructure-components.yaml',
'nextVersion': 'v1.1.99',
'nextVersion': 'v1.2.99',
'type': 'InfrastructureProvider',
'configFolder': 'test/infrastructure/docker/config/default',
},
Expand Down
2 changes: 1 addition & 1 deletion hack/tools/tilt-prepare/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ func getProviderObj(prefix string, objs []unstructured.Unstructured) (*unstructu
},
ProviderName: providerName,
Type: providerType,
Version: "v1.1.99",
Version: "v1.2.99",
}

providerObj := &unstructured.Unstructured{}
Expand Down
3 changes: 3 additions & 0 deletions metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
kind: Metadata
releaseSeries:
- major: 1
minor: 2
contract: v1beta1
Comment on lines +9 to +11
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sbueringer do we need to have the same change in test/e2e/data/shared/v1beta1/metadata.yaml too?

Copy link
Member

@sbueringer sbueringer Jan 25, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes.

We need a few more changes in test data, but I think some of them would be better done after the v1.1 release.

But I think it's a good idea to keep the metadata.yaml in sync in this PR (and we can do & merge that now).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've just updated metadata in e2e, can you take a look?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks perfect!

Copy link
Member

@sbueringer sbueringer Jan 25, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have to correct myself. Looking at CI it seems like our tests are now trying to use a v1.2 version which doesn't exist (in the docker.yaml and on GitHub).

I think we can either:

  • only adjust the top-level metadata.yaml in this PR
  • adjust both metadata.yamls and the docker.yaml in the same PR. For the docker.yaml we would ~ adjust the providers array like this:
    • switch v1.1.99 to a released version of CAPI
    • add v1.2.99

I think option 2. makes the most sense after the v1.1.0 release. I think we're not in a rush so maybe we should just do it all in one PR (we can prepare that now) and then /hold until next week. This could also include changes like updating the version in create-local-repository.py and tilt-prepare/main.go.

Another advantage is that we would group the changes a bit more, so it's easier to refer to for the next release.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, looks like CI won't be happy until 1.1 is released. Let's hold the PR until next week.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 make a bulk of all the changes above

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll open an issue hopeful until EOW which captures/summarizes what we want to do. @alexander-demichev I'll mention you on it.

- major: 1
minor: 1
contract: v1beta1
Expand Down
24 changes: 12 additions & 12 deletions test/e2e/config/docker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,16 @@ providers:
new: --metrics-addr=:8080
files:
- sourcePath: "../data/shared/v1alpha4/metadata.yaml"
- name: v1.0.1 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.0.1/core-components.yaml"
- name: v1.1.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.0/core-components.yaml"
type: "url"
contract: v1beta1
replacements:
- old: --metrics-addr=127.0.0.1:8080
new: --metrics-addr=:8080
files:
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
- name: v1.1.99 # next; use manifest from source files
- name: v1.2.99 # next; use manifest from source files
value: ../../../config/default
replacements:
- old: --metrics-bind-addr=localhost:8080
Expand Down Expand Up @@ -85,16 +85,16 @@ providers:
new: --metrics-addr=:8080
files:
- sourcePath: "../data/shared/v1alpha4/metadata.yaml"
- name: v1.0.1 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.0.1/bootstrap-components.yaml"
- name: v1.1.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.0/bootstrap-components.yaml"
type: "url"
contract: v1beta1
replacements:
- old: --metrics-addr=127.0.0.1:8080
new: --metrics-addr=:8080
files:
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
- name: v1.1.99 # next; use manifest from source files
- name: v1.2.99 # next; use manifest from source files
value: ../../../bootstrap/kubeadm/config/default
replacements:
- old: --metrics-bind-addr=localhost:8080
Expand Down Expand Up @@ -123,16 +123,16 @@ providers:
new: --metrics-addr=:8080
files:
- sourcePath: "../data/shared/v1alpha4/metadata.yaml"
- name: v1.0.1 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.0.1/control-plane-components.yaml"
- name: v1.1.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.0/control-plane-components.yaml"
type: "url"
contract: v1beta1
replacements:
- old: --metrics-addr=127.0.0.1:8080
new: --metrics-addr=:8080
files:
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
- name: v1.1.99 # next; use manifest from source files
- name: v1.2.99 # next; use manifest from source files
value: ../../../controlplane/kubeadm/config/default
replacements:
- old: --metrics-bind-addr=localhost:8080
Expand Down Expand Up @@ -163,8 +163,8 @@ providers:
files:
- sourcePath: "../data/shared/v1alpha4/metadata.yaml"
- sourcePath: "../data/infrastructure-docker/v1alpha4/cluster-template.yaml"
- name: v1.0.1 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.0.1/infrastructure-components-development.yaml"
- name: v1.1.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.0/infrastructure-components-development.yaml"
type: "url"
contract: v1beta1
replacements:
Expand All @@ -173,7 +173,7 @@ providers:
files:
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
- sourcePath: "../data/infrastructure-docker/v1beta1/cluster-template.yaml"
- name: v1.1.99 # next; use manifest from source files
- name: v1.2.99 # next; use manifest from source files
value: ../../../test/infrastructure/docker/config/default
replacements:
- old: --metrics-bind-addr=localhost:8080
Expand Down
3 changes: 3 additions & 0 deletions test/e2e/data/shared/v1beta1/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
kind: Metadata
releaseSeries:
- major: 1
minor: 2
contract: v1beta1
- major: 1
minor: 1
contract: v1beta1
Expand Down