From d3862a9c2f34b7db055a9ed7a3766e50bafc5453 Mon Sep 17 00:00:00 2001 From: Ferruh Cihan <63190600+ferruhcihan@users.noreply.github.com> Date: Wed, 30 Oct 2024 13:36:51 +0100 Subject: [PATCH 1/4] test: obj wizard --- versions.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions.yaml b/versions.yaml index 75b226510d..0f35bd8282 100644 --- a/versions.yaml +++ b/versions.yaml @@ -1,5 +1,5 @@ -api: main -console: main +api: APL-284 +console: APL-284 consoleLogin: v3.0.0 tasks: main tools: 2.7.0 From 84a75249b9a85420bdb374a8f829f8f830908710 Mon Sep 17 00:00:00 2001 From: Ferruh Cihan <63190600+ferruhcihan@users.noreply.github.com> Date: Fri, 1 Nov 2024 13:28:19 +0100 Subject: [PATCH 2/4] feat: update values-schema.yaml --- values-schema.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/values-schema.yaml b/values-schema.yaml index a965db5097..55a9fe1634 100644 --- a/values-schema.yaml +++ b/values-schema.yaml @@ -3161,6 +3161,10 @@ properties: obj: properties: + showWizard: + type: boolean + default: true + description: Show the Object Storage wizard. provider: properties: linode: From fe83407154e1197d3bbc8ca82fccb2cc5a078e31 Mon Sep 17 00:00:00 2001 From: Ferruh Cihan <63190600+ferruhcihan@users.noreply.github.com> Date: Thu, 7 Nov 2024 09:23:02 +0100 Subject: [PATCH 3/4] feat: add cluster name placeholder in the integration workflows --- .github/workflows/integration.yml | 1 + tests/bootstrap/input.yaml | 1 + tests/integration/full.yaml | 2 +- tests/integration/minimal-with-team.yaml | 2 +- tests/integration/minimal.yaml | 2 +- tests/integration/monitoring-with-team.yaml | 2 +- tests/integration/upgrade.yaml | 2 +- 7 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 3c60f6f5d9..2750bf52a8 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -260,6 +260,7 @@ jobs: tag=${ref##*/} sed --in-place "s/APP_VERSION_PLACEHOLDER/$tag/g" chart/apl/Chart.yaml sed --in-place "s/CONTEXT_PLACEHOLDER/${{ env.LINODE_CLUSTER_CONTEXT }}/g" tests/integration/${{ inputs.install_profile }}.yaml + sed --in-place "s/CLUSTER_NAME_PLACEHOLDER/aplinstall${{ env.LINODE_CLUSTER_ID }}/g" tests/integration/${{ inputs.install_profile }}.yaml sed --in-place "s/OTOMI_VERSION_PLACEHOLDER/${GITHUB_REF##*/}/g" tests/integration/${{ inputs.install_profile }}.yaml touch values-container-registry.yaml diff --git a/tests/bootstrap/input.yaml b/tests/bootstrap/input.yaml index 2e93872704..bac38b8774 100644 --- a/tests/bootstrap/input.yaml +++ b/tests/bootstrap/input.yaml @@ -1,5 +1,6 @@ # Minimal values file with defaults cluster: + name: CLUSTER_NAME_PLACEHOLDER k8sContext: CONTEXT_PLACEHOLDER domainSuffix: local.host otomi: diff --git a/tests/integration/full.yaml b/tests/integration/full.yaml index c9b1bfa90b..ba2e304a22 100644 --- a/tests/integration/full.yaml +++ b/tests/integration/full.yaml @@ -1,6 +1,6 @@ # All apps enabled cluster: - name: 'dev' + name: CLUSTER_NAME_PLACEHOLDER k8sContext: CONTEXT_PLACEHOLDER otomi: isMultitenant: true diff --git a/tests/integration/minimal-with-team.yaml b/tests/integration/minimal-with-team.yaml index ffef20d9e0..e333ca3eeb 100644 --- a/tests/integration/minimal-with-team.yaml +++ b/tests/integration/minimal-with-team.yaml @@ -1,6 +1,6 @@ # Minimal values file with defaults cluster: - name: 'dev' + name: CLUSTER_NAME_PLACEHOLDER k8sContext: CONTEXT_PLACEHOLDER otomi: version: 'OTOMI_VERSION_PLACEHOLDER' diff --git a/tests/integration/minimal.yaml b/tests/integration/minimal.yaml index 28c0dbee20..50ba616fd0 100644 --- a/tests/integration/minimal.yaml +++ b/tests/integration/minimal.yaml @@ -1,6 +1,6 @@ # Minimal values file with defaults cluster: - name: 'dev' + name: CLUSTER_NAME_PLACEHOLDER k8sContext: CONTEXT_PLACEHOLDER otomi: version: 'OTOMI_VERSION_PLACEHOLDER' diff --git a/tests/integration/monitoring-with-team.yaml b/tests/integration/monitoring-with-team.yaml index b9501ac470..e07b5761b2 100644 --- a/tests/integration/monitoring-with-team.yaml +++ b/tests/integration/monitoring-with-team.yaml @@ -1,6 +1,6 @@ # Minimal values file with defaults cluster: - name: 'dev' + name: CLUSTER_NAME_PLACEHOLDER k8sContext: CONTEXT_PLACEHOLDER otomi: version: 'OTOMI_VERSION_PLACEHOLDER' diff --git a/tests/integration/upgrade.yaml b/tests/integration/upgrade.yaml index 4c852ab255..0d089dd28e 100644 --- a/tests/integration/upgrade.yaml +++ b/tests/integration/upgrade.yaml @@ -1,6 +1,6 @@ # Minimal values file with defaults cluster: - name: 'dev' + name: CLUSTER_NAME_PLACEHOLDER k8sContext: CONTEXT_PLACEHOLDER otomi: version: v0.26.0 From 06b379a35aed36df17dc4385273e806d0fd31fb7 Mon Sep 17 00:00:00 2001 From: Ferruh Cihan <63190600+ferruhcihan@users.noreply.github.com> Date: Thu, 7 Nov 2024 13:58:03 +0100 Subject: [PATCH 4/4] feat: update versions --- versions.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions.yaml b/versions.yaml index 494f3bb9fa..9fb0f2b405 100644 --- a/versions.yaml +++ b/versions.yaml @@ -1,5 +1,5 @@ -api: APL-284 -console: APL-284 +api: 3.1.0 +console: 3.1.0 consoleLogin: v3.0.0 tasks: 3.4.0 tools: 2.7.0