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

Include both schemas in values during migration #149

Merged
merged 1 commit into from
Dec 4, 2023
Merged

Include both schemas in values during migration #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Fixed

- include both schema versions in CAPA cluster values file while migration is underway

## [1.19.0] - 2023-12-01

### Added
Expand Down
19 changes: 19 additions & 0 deletions providers/capa/standard/test_data/cluster_values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,22 @@ global:
spotInstances:
enabled: true
maxPrice: 0.2960

# TODO: Old Schema - to be deleted when migration complete
metadata:
name: "{{ .ClusterName }}"
description: "E2E Test cluster"
organization: "{{ .Organization }}"
controlPlane:
containerdVolumeSizeGB: 15
etcdVolumeSizeGB: 50
kubeletVolumeSizeGB: 10
rootVolumeSizeGB: 10
nodePools:
pool0:
maxSize: 2
minSize: 1
rootVolumeSizeGB: 25
spotInstances:
enabled: true
maxPrice: 0.2960
32 changes: 26 additions & 6 deletions providers/capa/upgrade/test_data/cluster_values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,38 @@
global:
metadata:
name: "{{ .ClusterName }}"
description: "E2E Test cluster"
organization: "{{ .Organization }}"

controlPlane:
containerdVolumeSizeGB: 15
etcdVolumeSizeGB: 50
kubeletVolumeSizeGB: 10
rootVolumeSizeGB: 10

# We need to pass the node pools otherwise the test called "has all the worker nodes running" will fail because it
# expects to find the number of worker nodes in the helm values, but the value is not there if don't pass it, as it's
# defaulted in the chart template.
# @TODO: https://github.com/giantswarm/giantswarm/issues/28063
nodePools:
pool0:
maxSize: 2
minSize: 1
rootVolumeSizeGB: 25
spotInstances:
enabled: true
maxPrice: 0.2960

# TODO: Old Schema - to be deleted when migration complete
metadata:
name: "{{ .ClusterName }}"
description: "E2E Test cluster"
organization: "{{ .Organization }}"

controlPlane:
containerdVolumeSizeGB: 15
etcdVolumeSizeGB: 50
kubeletVolumeSizeGB: 10
rootVolumeSizeGB: 10

# We need to pass the node pools otherwise the test called "has all the worker nodes running" will fail because it
# expects to find the number of worker nodes in the helm values, but the value is not there if don't pass it, as it's
# defaulted in the chart template.
# @TODO: https://github.com/giantswarm/giantswarm/issues/28063
nodePools:
pool0:
maxSize: 2
Expand Down