Skip to content

Commit 9ffdbad

Browse files
committed
fix review findings
Signed-off-by: sivchari <shibuuuu5@gmail.com>
1 parent ee28a54 commit 9ffdbad

File tree

13 files changed

+13
-16
lines changed

13 files changed

+13
-16
lines changed

test/e2e/data/infrastructure-docker/main/bases/cluster-with-topology.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ spec:
1515
topology:
1616
classRef:
1717
name: "quick-start"
18+
namespace: '${CLUSTER_CLASS_NAMESPACE:-""}'
1819
version: "${KUBERNETES_VERSION}"
1920
controlPlane:
2021
metadata:

test/e2e/data/infrastructure-docker/main/cluster-template-kcp-pre-drain/cluster.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ spec:
77
topology:
88
classRef:
99
name: quick-start
10-
version: "${KUBERNETES_VERSION}"
1110
controlPlane:
1211
metadata:
1312
annotations:

test/e2e/data/infrastructure-docker/main/cluster-template-topology-dualstack-ipv4-primary/cluster.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ spec:
77
topology:
88
classRef:
99
name: quick-start
10-
version: "${KUBERNETES_VERSION}"
1110
variables:
1211
- name: ipv6Primary
1312
value: false

test/e2e/data/infrastructure-docker/main/cluster-template-topology-dualstack-ipv6-primary/cluster.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ spec:
77
topology:
88
classRef:
99
name: quick-start
10-
version: "${KUBERNETES_VERSION}"
1110
variables:
1211
- name: ipv6Primary
1312
value: true
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- op: add
2+
path: /spec/topology/classRef/name
3+
value: "quick-start-kcp-only"
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
resources:
22
- ../cluster-template-topology-no-workers
33

4+
patches:
5+
- path: cluster-topology-class.yaml
6+
target:
7+
group: cluster.x-k8s.io
8+
version: v1beta1
9+
kind: Cluster

test/e2e/data/infrastructure-docker/main/cluster-template-upgrades-runtimesdk/cluster-runtimesdk.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ spec:
1515
topology:
1616
classRef:
1717
name: "quick-start-runtimesdk"
18+
namespace: '${CLUSTER_CLASS_NAMESPACE:-""}'
1819
version: "${KUBERNETES_VERSION}"
1920
controlPlane:
2021
nodeDeletionTimeoutSeconds: 30

test/e2e/data/infrastructure-docker/main/clusterclass-quick-start.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ spec:
1919
kind: DockerMachineTemplate
2020
name: quick-start-control-plane
2121
machineHealthCheck:
22-
maxUnhealthy: 100%
2322
unhealthyNodeConditions:
2423
- type: e2e.remediation.condition
2524
status: "False"
@@ -48,9 +47,6 @@ spec:
4847
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
4948
kind: DockerMachineTemplate
5049
name: quick-start-default-worker-machinetemplate
51-
machineHealthCheck:
52-
maxUnhealthy: 100%
53-
# We are intentionally not setting the 'unhealthyNodeConditions' here to test that the field is optional.
5450
machinePools:
5551
- class: default-worker
5652
template:

test/extension/handlers/topologymutation/handler.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ func NewExtensionHandlers() *ExtensionHandlers {
7676
infrav1.GroupVersion,
7777
bootstrapv1.GroupVersion,
7878
bootstrapv1beta1.GroupVersion,
79-
infraexpv1beta1.GroupVersion,
80-
infraexpv1.GroupVersion,
8179
controlplanev1beta1.GroupVersion,
8280
controlplanev1.GroupVersion,
8381
),

test/extension/handlers/topologymutation/handler_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ func TestHandler_GeneratePatches(t *testing.T) {
349349
},
350350
Items: []runtimehooksv1.GeneratePatchesResponseItem{
351351
responseItem("1", `[
352-
{"op":"add","path":"/spec","value":{"template": {"spec":{"rolloutStrategy": {"rollingUpdate":{"maxSurge":3}}}}}}
352+
{"op":"add","path":"/spec","value":{"template": {"spec":{"rolloutStrategy": {"rollingUpdate":{"maxSurge":3}}}}}}
353353
]`),
354354
responseItem("2", `[
355355
{"op":"add","path":"/spec/template/spec/customImage","value":"kindest/node:v1.23.0"}

0 commit comments

Comments
 (0)