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

Jump to bottom

🌱 test: use cluster without worker definition for kcp only test #11212

Merged
merged 5 commits into from
Sep 26, 2024
Merged

🌱 test: use cluster without worker definition for kcp only test #11212

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
182d3ee
test: use cluster without worker definition for kcp only test
chrischdi Sep 20, 2024
2d975a0
add additional quick-start test for covering zero replicas
chrischdi Sep 24, 2024
d3038e5
Rewrite quick-start test
chrischdi Sep 25, 2024
bc7726b
comment fix
chrischdi Sep 25, 2024
029099b
fix kcp-only clusterclass
chrischdi Sep 25, 2024
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ generate-e2e-templates-main: $(KUSTOMIZE)
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/main/cluster-template-ipv6 --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/main/cluster-template-ipv6.yaml
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/main/cluster-template-topology-dualstack-ipv6-primary --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/main/cluster-template-topology-dualstack-ipv6-primary.yaml
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/main/cluster-template-topology-dualstack-ipv4-primary --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/main/cluster-template-topology-dualstack-ipv4-primary.yaml
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/main/cluster-template-topology-single-node-cluster --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/main/cluster-template-topology-single-node-cluster.yaml
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/main/cluster-template-topology-single-kcp-cluster --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/main/cluster-template-topology-single-kcp-cluster.yaml
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/main/cluster-template-topology-autoscaler --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/main/cluster-template-topology-autoscaler.yaml
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/main/cluster-template-topology --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/main/cluster-template-topology.yaml
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/main/cluster-template-ignition --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/main/cluster-template-ignition.yaml
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/config/docker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ providers:
- sourcePath: "../data/infrastructure-docker/main/cluster-template-ipv6.yaml"
- sourcePath: "../data/infrastructure-docker/main/cluster-template-topology-dualstack-ipv6-primary.yaml"
- sourcePath: "../data/infrastructure-docker/main/cluster-template-topology-dualstack-ipv4-primary.yaml"
- sourcePath: "../data/infrastructure-docker/main/cluster-template-topology-single-node-cluster.yaml"
- sourcePath: "../data/infrastructure-docker/main/cluster-template-topology-single-kcp-cluster.yaml"
- sourcePath: "../data/infrastructure-docker/main/cluster-template-topology-autoscaler.yaml"
- sourcePath: "../data/infrastructure-docker/main/cluster-template-topology.yaml"
- sourcePath: "../data/infrastructure-docker/main/cluster-template-ignition.yaml"
Expand Down
0 ...disable-control-plane-taint-variable.yaml → ...disable-control-plane-taint-variable.yaml
View file
Open in desktop
File renamed without changes.
6 changes: 5 additions & 1 deletion ...gy-single-node-cluster/kustomization.yaml → ...ogy-single-kcp-cluster/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,8 @@ patches:
group: cluster.x-k8s.io
version: v1beta1
kind: Cluster

- path: remove-topology-workers.yaml
target:
group: cluster.x-k8s.io
version: v1beta1
kind: Cluster
2 changes: 2 additions & 0 deletions ...ure-docker/main/cluster-template-topology-single-kcp-cluster/remove-topology-workers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- op: remove
path: /spec/topology/workers
3 changes: 1 addition & 2 deletions test/e2e/self_hosted_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,9 @@ var _ = Describe("When testing Cluster API working on single-node self-hosted cl
BootstrapClusterProxy: bootstrapClusterProxy,
chrischdi marked this conversation as resolved.
Show resolved Hide resolved
ArtifactFolder: artifactFolder,
SkipCleanup: skipCleanup,
Flavor: "topology-single-node-cluster",
Flavor: "topology-single-kcp-cluster",
InfrastructureProvider: ptr.To("docker"),
ControlPlaneMachineCount: ptr.To[int64](1),
chrischdi marked this conversation as resolved.
Show resolved Hide resolved
WorkerMachineCount: ptr.To[int64](0),
}
})
})
Loading