Skip to content

Commit 092aa3f

Browse files
committed
ci(e2e): hardcode kubernetesVersion=Automatic in ClusterConfiguration and drop deckhouse.kubernetesVersion from values
Signed-off-by: Anton Yachmenev <[email protected]>
1 parent 6945030 commit 092aa3f

File tree

5 files changed

+3
-42
lines changed

5 files changed

+3
-42
lines changed

.github/workflows/e2e-matrix.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -330,9 +330,6 @@ jobs:
330330
steps:
331331
- uses: actions/checkout@v4
332332

333-
- name: Install Task
334-
uses: arduino/setup-task@v2
335-
336333
- name: Install kubectl
337334
uses: azure/setup-kubectl@v4
338335
with:
@@ -371,4 +368,4 @@ jobs:
371368
run: |
372369
echo "### Cleanup Results" >> $GITHUB_STEP_SUMMARY
373370
echo "✅ Cleanup job completed" >> $GITHUB_STEP_SUMMARY
374-
echo "🧹 Attempted to clean up namespaces matching 'nightly-nested-e2e-*'" >> $GITHUB_STEP_SUMMARY
371+
echo "🧹 Attempted to clean up namespaces with prefix '${CLEANUP_PREFIX}'" >> $GITHUB_STEP_SUMMARY

ci/dvp-e2e/charts/cluster-config/templates/cluster-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cloud:
77
prefix: {{ .Values.clusterConfigurationPrefix | default "demo-cluster" }}
88
podSubnetCIDR: 10.112.0.0/16
99
serviceSubnetCIDR: 10.223.0.0/16
10-
kubernetesVersion: "{{ .Values.deckhouse.kubernetesVersion }}"
10+
kubernetesVersion: "Automatic"
1111
clusterDomain: "internal.cluster.local"
1212
---
1313
apiVersion: deckhouse.io/v1
@@ -45,4 +45,4 @@ masterNodeGroup:
4545
storageClass: {{ .Values.storageClasses.controlPlane.etcd }}
4646
provider:
4747
kubeconfigDataBase64: {{ .Values.kubeconfigDataBase64 }}
48-
namespace: {{ .Values.namespace }}
48+
namespace: {{ .Values.namespace }}

ci/dvp-e2e/charts/cluster-config/templates/nfs.yaml

Lines changed: 0 additions & 34 deletions
This file was deleted.

ci/dvp-e2e/charts/cluster-config/values.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ instances:
1717
# Deckhouse configuration
1818
deckhouse:
1919
tag: main
20-
kubernetesVersion: Automatic
2120

2221
# Virtualization configuration
2322
virtualization:

ci/dvp-e2e/values.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ domain: e2e.virtlab.flant.com
22
clusterConfigurationPrefix: e2e
33
deckhouse:
44
tag: main
5-
kubernetesVersion: Automatic
65
virtualization:
76
tag: main
87
features:

0 commit comments

Comments
 (0)