Skip to content

Commit adf617d

Browse files
committed
fix: dedicated test values files for join/upgrade
Signed-off-by: Tyler Gillson <[email protected]>
1 parent 9612f72 commit adf617d

File tree

4 files changed

+33
-2
lines changed

4 files changed

+33
-2
lines changed

test/e2e/clusteradm/joinhubscenario_klusterletvaluesfile_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ var _ = ginkgo.Describe("test clusteradm join with klusterlet values file", gink
3838

3939
ginkgo.By("managedcluster1 join hub with klusterlet values file")
4040

41-
klusterletValuesFile, err := filepath.Abs(filepath.Join("testdata", "klusterlet-values.yaml"))
41+
klusterletValuesFile, err := filepath.Abs(filepath.Join("testdata", "klusterlet-values-join.yaml"))
4242
gomega.Expect(err).NotTo(gomega.HaveOccurred(), "failed to get absolute path for klusterlet values file")
4343

4444
err = e2e.Clusteradm().Join(

test/e2e/clusteradm/testdata/klusterlet-values.yaml renamed to test/e2e/clusteradm/testdata/klusterlet-values-join.yaml

File renamed without changes.
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Copyright Contributors to the Open Cluster Management project
2+
klusterlet:
3+
clusterName: clusteradm-e2e-test-c1
4+
namespace: open-cluster-management-agent-advanced
5+
mode: Default
6+
nodePlacement:
7+
nodeSelector:
8+
node-role.kubernetes.io/control-plane: ""
9+
tolerations:
10+
- key: node-role.kubernetes.io/control-plane
11+
operator: Exists
12+
effect: NoSchedule
13+
resourceRequirement:
14+
type: ResourceRequirement
15+
resourceRequirements:
16+
requests:
17+
cpu: 200m
18+
memory: 256Mi
19+
limits:
20+
cpu: 500m
21+
memory: 512Mi
22+
registrationConfiguration:
23+
clientCertExpirationSeconds: 86400
24+
featureGates:
25+
- feature: ClusterClaim
26+
mode: Enable
27+
workConfiguration:
28+
featureGates:
29+
- feature: RawFeedbackJsonString
30+
mode: Enable
31+
statusSyncInterval: 60s

test/e2e/clusteradm/upgrade_klusterletvaluesfile_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ var _ = ginkgo.Describe("test clusteradm upgrade klusterlet with klusterlet valu
7272

7373
ginkgo.By("upgrade klusterlet with advanced klusterlet file")
7474

75-
klusterletValuesFile, err := filepath.Abs(filepath.Join("testdata", "klusterlet-values.yaml"))
75+
klusterletValuesFile, err := filepath.Abs(filepath.Join("testdata", "klusterlet-values-upgrade.yaml"))
7676
gomega.Expect(err).NotTo(gomega.HaveOccurred(), "failed to get absolute path for klusterlet values file")
7777

7878
err = e2e.Clusteradm().Upgrade(

0 commit comments

Comments
 (0)