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

Jump to bottom

Move Values.nodePools to Values.global.nodePools #416

Merged
merged 5 commits into from
Nov 30, 2023
Merged

Move Values.nodePools to Values.global.nodePools #416

merged 5 commits into from
Nov 30, 2023

Conversation

nprokopic
Copy link
Contributor

@nprokopic nprokopic commented Nov 12, 2023 •
edited
Loading

Towards giantswarm/roadmap#2954

⚠️ This is a Helm values breaking change, so it will require adjusting Helm values for all cluster when doing the upgrade.

What this PR does / why we need it

We have ported all provider-independent Cluster API resources to cluster chart, which was phase 1 of restructuring of cluster- apps, see giantswarm/roadmap#2742 for more details. Now we want to use cluster chart in cluster-aws and remove all provider-independent Cluster API resources from cluster-aws.

In order to do so, first we have to refactor cluster-aws Helm values, so that cluster chart can read provider-independent values it needs. For that, we have to move current top-level properties to be under Values.global.

This pull request moves Values.nodePools to Values.global.nodePools.

Checklist

  • Update changelog in CHANGELOG.md.

Trigger e2e tests

/run cluster-test-suites

@nprokopic nprokopic requested a review from a team November 12, 2023 23:09
@nprokopic nprokopic requested a review from a team as a code owner November 12, 2023 23:09
@nprokopic nprokopic mentioned this pull request Nov 12, 2023
Closed
@tinkerers-ci

This comment has been minimized.

Sign in to view
AndiDog
AndiDog requested changes Nov 13, 2023
View reviewed changes
Copy link
Contributor

@AndiDog AndiDog left a comment

Choose a reason for hiding this comment

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

Please run make normalize-schema generate-values generate-docs validate-schema to update the documentation and values.

@nprokopic nprokopic mentioned this pull request Nov 14, 2023
Merged
1 task
AndiDog
AndiDog approved these changes Nov 15, 2023
View reviewed changes
Copy link
Contributor

@AndiDog AndiDog left a comment

Choose a reason for hiding this comment

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

Approving already since it's okay to add the doc changes later

@nprokopic nprokopic force-pushed the move-controlplane-to-global branch from 00bd2d6 to dd20974 Compare November 16, 2023 14:42
@nprokopic nprokopic force-pushed the move-nodepools-to-global branch from 897fd15 to 2b9adc3 Compare November 16, 2023 14:42
@nprokopic nprokopic force-pushed the move-controlplane-to-global branch from dd20974 to b4f987b Compare November 16, 2023 14:51
@nprokopic nprokopic force-pushed the move-nodepools-to-global branch from 2b9adc3 to 4c832cb Compare November 16, 2023 14:51
@github-actions GitHub Actions
Copy link
Contributor

(helm/cluster-aws/ci/test-wc-minimal-values.yaml) rendered manifest diff 
/metadata/labels/helm.sh/chart  (AWSCluster/org-giantswarm/test-wc-minimal)
  ± value change
    - cluster-aws-0.48.1
    + cluster-aws-0.47.0

/metadata/labels/app.kubernetes.io/version  (AWSCluster/org-giantswarm/test-wc-minimal)
  ± value change
    - 0.48.1
    + 0.47.0

/metadata/labels/helm.sh/chart  (AWSMachinePool/org-giantswarm/test-wc-minimal-def00)
  ± value change
    - cluster-aws-0.48.1
    + cluster-aws-0.47.0

/metadata/labels/app.kubernetes.io/version  (AWSMachinePool/org-giantswarm/test-wc-minimal-def00)
  ± value change
    - 0.48.1
    + 0.47.0

/metadata/labels/helm.sh/chart  (AWSMachineTemplate/org-giantswarm/test-wc-minimal-control-plane-779bfa58)
  ± value change
    - cluster-aws-0.48.1
    + cluster-aws-0.47.0

/metadata/labels/app.kubernetes.io/version  (AWSMachineTemplate/org-giantswarm/test-wc-minimal-control-plane-779bfa58)
  ± value change
    - 0.48.1
    + 0.47.0

/spec/template/metadata/labels/helm.sh/chart  (AWSMachineTemplate/org-giantswarm/test-wc-minimal-control-plane-779bfa58)
  ± value change
    - cluster-aws-0.48.1
    + cluster-aws-0.47.0

/metadata/labels/helm.sh/chart  (AWSMachineTemplate/org-giantswarm/test-wc-minimal-bastion-17f76896)
  ± value change
    - cluster-aws-0.48.1
    + cluster-aws-0.47.0

/metadata/labels/app.kubernetes.io/version  (AWSMachineTemplate/org-giantswarm/test-wc-minimal-bastion-17f76896)
  ± value change
    - 0.48.1
    + 0.47.0

/spec/template/metadata/labels/helm.sh/chart  (AWSMachineTemplate/org-giantswarm/test-wc-minimal-bastion-17f76896)
  ± value change
    - cluster-aws-0.48.1
    + cluster-aws-0.47.0

/metadata/labels/helm.sh/chart  (Cluster/org-giantswarm/test-wc-minimal)
  ± value change
    - cluster-aws-0.48.1
    + cluster-aws-0.47.0

/metadata/labels/app.kubernetes.io/version  (Cluster/org-giantswarm/test-wc-minimal)
  ± value change
    - 0.48.1
    + 0.47.0

/metadata/labels/helm.sh/chart  (HelmRelease/org-giantswarm/test-wc-minimal-aws-ebs-csi-driver)
  ± value change
    - cluster-aws-0.48.1
    + cluster-aws-0.47.0

/metadata/labels/helm.sh/chart  (HelmRelease/org-giantswarm/test-wc-minimal-cilium)
  ± value change
    - cluster-aws-0.48.1
    + cluster-aws-0.47.0

/spec/chart/spec/version  (HelmRelease/org-giantswarm/test-wc-minimal-cilium)
  ± value change
    - 0.17.0
    + 0.13.0

/metadata/labels/helm.sh/chart  (HelmRelease/org-giantswarm/test-wc-minimal-cloud-provider-aws)
  ± value change
    - cluster-aws-0.48.1
    + cluster-aws-0.47.0

/metadata/labels/helm.sh/chart  (HelmRelease/org-giantswarm/test-wc-minimal-coredns)
  ± value change
    - cluster-aws-0.48.1
    + cluster-aws-0.47.0

/metadata/labels/helm.sh/chart  (HelmRelease/org-giantswarm/test-wc-minimal-vertical-pod-autoscaler-crd)
  ± value change
    - cluster-aws-0.48.1
    + cluster-aws-0.47.0

/metadata/labels/helm.sh/chart  (HelmRepository/org-giantswarm/test-wc-minimal-default)
  ± value change
    - cluster-aws-0.48.1
    + cluster-aws-0.47.0

/metadata/labels/helm.sh/chart  (HelmRepository/org-giantswarm/test-wc-minimal-default-test)
  ± value change
    - cluster-aws-0.48.1
    + cluster-aws-0.47.0

/metadata/labels/helm.sh/chart  (KubeadmConfig/org-giantswarm/test-wc-minimal-def00)
  ± value change
    - cluster-aws-0.48.1
    + cluster-aws-0.47.0

/metadata/labels/app.kubernetes.io/version  (KubeadmConfig/org-giantswarm/test-wc-minimal-def00)
  ± value change
    - 0.48.1
    + 0.47.0

/metadata/labels/helm.sh/chart  (KubeadmConfigTemplate/org-giantswarm/test-wc-minimal-bastion-c7cb92f0)
  ± value change
    - cluster-aws-0.48.1
    + cluster-aws-0.47.0

/metadata/labels/helm.sh/chart  (KubeadmControlPlane/org-giantswarm/test-wc-minimal)
  ± value change
    - cluster-aws-0.48.1
    + cluster-aws-0.47.0

/metadata/labels/app.kubernetes.io/version  (KubeadmControlPlane/org-giantswarm/test-wc-minimal)
  ± value change
    - 0.48.1
    + 0.47.0

/spec/machineTemplate/metadata/labels/helm.sh/chart  (KubeadmControlPlane/org-giantswarm/test-wc-minimal)
  ± value change
    - cluster-aws-0.48.1
    + cluster-aws-0.47.0

/spec/machineTemplate/metadata/labels/app.kubernetes.io/version  (KubeadmControlPlane/org-giantswarm/test-wc-minimal)
  ± value change
    - 0.48.1
    + 0.47.0

/metadata/labels/helm.sh/chart  (MachineDeployment/org-giantswarm/test-wc-minimal-bastion)
  ± value change
    - cluster-aws-0.48.1
    + cluster-aws-0.47.0

/metadata/labels/app.kubernetes.io/version  (MachineDeployment/org-giantswarm/test-wc-minimal-bastion)
  ± value change
    - 0.48.1
    + 0.47.0

/spec/template/metadata/labels/helm.sh/chart  (MachineDeployment/org-giantswarm/test-wc-minimal-bastion)
  ± value change
    - cluster-aws-0.48.1
    + cluster-aws-0.47.0

/metadata/labels/helm.sh/chart  (MachineHealthCheck/org-giantswarm/test-wc-minimal-control-plane)
  ± value change
    - cluster-aws-0.48.1
    + cluster-aws-0.47.0

/metadata/labels/app.kubernetes.io/version  (MachineHealthCheck/org-giantswarm/test-wc-minimal-control-plane)
  ± value change
    - 0.48.1
    + 0.47.0

/metadata/labels/helm.sh/chart  (MachinePool/org-giantswarm/test-wc-minimal-def00)
  ± value change
    - cluster-aws-0.48.1
    + cluster-aws-0.47.0

/metadata/labels/app.kubernetes.io/version  (MachinePool/org-giantswarm/test-wc-minimal-def00)
  ± value change
    - 0.48.1
    + 0.47.0

/metadata/labels/helm.sh/chart  (ServiceAccount/org-giantswarm/test-wc-minimal-cleanup-helmreleases-hook)
  ± value change
    - cluster-aws-0.48.1
    + cluster-aws-0.47.0

/metadata/labels/helm.sh/chart  (Role/org-giantswarm/test-wc-minimal-cleanup-helmreleases-hook)
  ± value change
    - cluster-aws-0.48.1
    + cluster-aws-0.47.0

/metadata/labels/helm.sh/chart  (RoleBinding/org-giantswarm/test-wc-minimal-cleanup-helmreleases-hook)
  ± value change
    - cluster-aws-0.48.1
    + cluster-aws-0.47.0

/metadata/labels/helm.sh/chart  (Job/org-giantswarm/test-wc-minimal-cleanup-helmreleases-hook)
  ± value change
    - cluster-aws-0.48.1
    + cluster-aws-0.47.0

/spec/template/metadata/labels/helm.sh/chart  (Job/org-giantswarm/test-wc-minimal-cleanup-helmreleases-hook)
  ± value change
    - cluster-aws-0.48.1
    + cluster-aws-0.47.0

@nprokopic nprokopic force-pushed the move-controlplane-to-global branch from b4f987b to 0fb1681 Compare November 28, 2023 14:36
@nprokopic nprokopic force-pushed the move-nodepools-to-global branch from 4c832cb to e0ab346 Compare November 28, 2023 14:37
@nprokopic nprokopic force-pushed the move-controlplane-to-global branch from 0fb1681 to 83d7577 Compare November 28, 2023 14:48
@nprokopic nprokopic force-pushed the move-nodepools-to-global branch from e0ab346 to 8fda797 Compare November 28, 2023 14:49
@nprokopic nprokopic force-pushed the move-controlplane-to-global branch from 83d7577 to b740497 Compare November 29, 2023 23:37
@nprokopic nprokopic force-pushed the move-nodepools-to-global branch from 273a64a to 8a87880 Compare November 29, 2023 23:38
@nprokopic nprokopic force-pushed the move-controlplane-to-global branch from b740497 to 4d5b5d1 Compare November 29, 2023 23:58
@nprokopic nprokopic force-pushed the move-nodepools-to-global branch from 8a87880 to 2e52982 Compare November 29, 2023 23:59
Base automatically changed from move-controlplane-to-global to master November 30, 2023 00:04
@nprokopic nprokopic force-pushed the move-nodepools-to-global branch from 2e52982 to 23eaec1 Compare November 30, 2023 00:08
@nprokopic nprokopic merged commit a6f33a4 into master Nov 30, 2023
14 of 15 checks passed
@nprokopic nprokopic deleted the move-nodepools-to-global branch November 30, 2023 00:12
@tinkerers-ci
Copy link

tinkerers-ci bot commented Nov 30, 2023

cluster-test-suites

Run name pr-cluster-aws-416-cluster-test-suitesqdw8p
Commit SHA 2e52982
Result Failed ❌

📋 View full results in Tekton Dashboard

Rerun trigger:
/run cluster-test-suites

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AndiDog AndiDog AndiDog approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nprokopic @AndiDog