-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update test framework and e2e to support v1beta1
Signed-off-by: Vince Prignano <[email protected]>
- Loading branch information
Showing
49 changed files
with
529 additions
and
44 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,4 +6,4 @@ metadata: | |
| spec: | ||
| rolloutStrategy: | ||
| rollingUpdate: | ||
| maxSurge: 0 | ||
| maxSurge: 0 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,4 +6,4 @@ spec: | |
| template: | ||
| metadata: | ||
| labels: | ||
| "e2e.remediation.label": "" | ||
| "e2e.remediation.label": "" | ||
83 changes: 83 additions & 0 deletions
83
test/e2e/data/infrastructure-docker/v1beta1/bases/cluster-with-kcp.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| --- | ||
| # DockerCluster object referenced by the Cluster object | ||
| apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 | ||
| kind: DockerCluster | ||
| metadata: | ||
| name: '${CLUSTER_NAME}' | ||
| --- | ||
| # Cluster object with | ||
| # - Reference to the KubeadmControlPlane object | ||
| # - the label cni=${CLUSTER_NAME}-crs-0, so the cluster can be selected by the ClusterResourceSet. | ||
| apiVersion: cluster.x-k8s.io/v1beta1 | ||
| kind: Cluster | ||
| metadata: | ||
| name: '${CLUSTER_NAME}' | ||
| labels: | ||
| cni: "${CLUSTER_NAME}-crs-0" | ||
| spec: | ||
| clusterNetwork: | ||
| services: | ||
| cidrBlocks: ['${DOCKER_SERVICE_CIDRS}'] | ||
| pods: | ||
| cidrBlocks: ['${DOCKER_POD_CIDRS}'] | ||
| serviceDomain: '${DOCKER_SERVICE_DOMAIN}' | ||
| infrastructureRef: | ||
| apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 | ||
| kind: DockerCluster | ||
| name: '${CLUSTER_NAME}' | ||
| controlPlaneRef: | ||
| kind: KubeadmControlPlane | ||
| apiVersion: controlplane.cluster.x-k8s.io/v1beta1 | ||
| name: "${CLUSTER_NAME}-control-plane" | ||
| --- | ||
| # DockerMachineTemplate object referenced by the KubeadmControlPlane object | ||
| apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 | ||
| kind: DockerMachineTemplate | ||
| metadata: | ||
| name: "${CLUSTER_NAME}-control-plane" | ||
| spec: | ||
| template: | ||
| spec: | ||
| extraMounts: | ||
| - containerPath: "/var/run/docker.sock" | ||
| hostPath: "/var/run/docker.sock" | ||
| --- | ||
| # KubeadmControlPlane referenced by the Cluster object with | ||
| # - the label kcp-adoption.step2, because it should be created in the second step of the kcp-adoption test. | ||
| kind: KubeadmControlPlane | ||
| apiVersion: controlplane.cluster.x-k8s.io/v1beta1 | ||
| metadata: | ||
| name: "${CLUSTER_NAME}-control-plane" | ||
| labels: | ||
| kcp-adoption.step2: "" | ||
| spec: | ||
| replicas: ${CONTROL_PLANE_MACHINE_COUNT} | ||
| machineTemplate: | ||
| infrastructureRef: | ||
| kind: DockerMachineTemplate | ||
| apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 | ||
| name: "${CLUSTER_NAME}-control-plane" | ||
| kubeadmConfigSpec: | ||
| clusterConfiguration: | ||
| controllerManager: | ||
| extraArgs: {enable-hostpath-provisioner: 'true'} | ||
| apiServer: | ||
| # host.docker.internal is required by kubetest when running on MacOS because of the way ports are proxied. | ||
| certSANs: [localhost, 127.0.0.1, 0.0.0.0, host.docker.internal] | ||
| initConfiguration: | ||
| nodeRegistration: | ||
| criSocket: /var/run/containerd/containerd.sock | ||
| kubeletExtraArgs: | ||
| # We have to pin the cgroupDriver to cgroupfs as kubeadm >=1.21 defaults to systemd | ||
| # kind will implement systemd support in: https://github.com/kubernetes-sigs/kind/issues/1726 | ||
| cgroup-driver: cgroupfs | ||
| eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%' | ||
| joinConfiguration: | ||
| nodeRegistration: | ||
| criSocket: /var/run/containerd/containerd.sock | ||
| kubeletExtraArgs: | ||
| # We have to pin the cgroupDriver to cgroupfs as kubeadm >=1.21 defaults to systemd | ||
| # kind will implement systemd support in: https://github.com/kubernetes-sigs/kind/issues/1726 | ||
| cgroup-driver: cgroupfs | ||
| eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%' | ||
| version: "${KUBERNETES_VERSION}" |
24 changes: 24 additions & 0 deletions
24
test/e2e/data/infrastructure-docker/v1beta1/bases/crs.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| --- | ||
| # ConfigMap object referenced by the ClusterResourceSet object and with | ||
| # the CNI resource defined in the test config file | ||
| apiVersion: v1 | ||
| kind: ConfigMap | ||
| metadata: | ||
| name: "cni-${CLUSTER_NAME}-crs-0" | ||
| data: ${CNI_RESOURCES} | ||
| binaryData: | ||
| --- | ||
| # ClusterResourceSet object with | ||
| # a selector that targets all the Cluster with label cni=${CLUSTER_NAME}-crs-0 | ||
| apiVersion: addons.cluster.x-k8s.io/v1beta1 | ||
| kind: ClusterResourceSet | ||
| metadata: | ||
| name: "${CLUSTER_NAME}-crs-0" | ||
| spec: | ||
| strategy: ApplyOnce | ||
| clusterSelector: | ||
| matchLabels: | ||
| cni: "${CLUSTER_NAME}-crs-0" | ||
| resources: | ||
| - name: "cni-${CLUSTER_NAME}-crs-0" | ||
| kind: ConfigMap |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| --- | ||
| # DockerMachineTemplate referenced by the MachineDeployment and with | ||
| # - extraMounts for the docker sock, thus allowing self-hosting test | ||
| apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 | ||
| kind: DockerMachineTemplate | ||
| metadata: | ||
| name: "${CLUSTER_NAME}-md-0" | ||
| spec: | ||
| template: | ||
| spec: | ||
| extraMounts: | ||
| - containerPath: "/var/run/docker.sock" | ||
| hostPath: "/var/run/docker.sock" | ||
| --- | ||
| # KubeadmConfigTemplate referenced by the MachineDeployment | ||
| apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 | ||
| kind: KubeadmConfigTemplate | ||
| metadata: | ||
| name: "${CLUSTER_NAME}-md-0" | ||
| spec: | ||
| template: | ||
| spec: | ||
| joinConfiguration: | ||
| nodeRegistration: | ||
| criSocket: /var/run/containerd/containerd.sock | ||
| kubeletExtraArgs: | ||
| # We have to pin the cgroupDriver to cgroupfs as kubeadm >=1.21 defaults to systemd | ||
| # kind will implement systemd support in: https://github.com/kubernetes-sigs/kind/issues/1726 | ||
| cgroup-driver: cgroupfs | ||
| eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%' | ||
| --- | ||
| # MachineDeployment object | ||
| apiVersion: cluster.x-k8s.io/v1beta1 | ||
| kind: MachineDeployment | ||
| metadata: | ||
| name: "${CLUSTER_NAME}-md-0" | ||
| spec: | ||
| clusterName: "${CLUSTER_NAME}" | ||
| replicas: ${WORKER_MACHINE_COUNT} | ||
| selector: | ||
| matchLabels: | ||
| template: | ||
| spec: | ||
| clusterName: "${CLUSTER_NAME}" | ||
| version: "${KUBERNETES_VERSION}" | ||
| bootstrap: | ||
| configRef: | ||
| name: "${CLUSTER_NAME}-md-0" | ||
| apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 | ||
| kind: KubeadmConfigTemplate | ||
| infrastructureRef: | ||
| name: "${CLUSTER_NAME}-md-0" | ||
| apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 | ||
| kind: DockerMachineTemplate |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| --- | ||
| # MachinePool which references the DockerMachinePool and KubeadmConfigTemplate below | ||
| apiVersion: cluster.x-k8s.io/v1beta1 | ||
| kind: MachinePool | ||
| metadata: | ||
| name: "${CLUSTER_NAME}-mp-0" | ||
| spec: | ||
| clusterName: '${CLUSTER_NAME}' | ||
| replicas: ${WORKER_MACHINE_COUNT} | ||
| template: | ||
| spec: | ||
| bootstrap: | ||
| configRef: | ||
| apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 | ||
| kind: KubeadmConfig | ||
| name: "${CLUSTER_NAME}-mp-0-config" | ||
| clusterName: '${CLUSTER_NAME}' | ||
| infrastructureRef: | ||
| apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 | ||
| kind: DockerMachinePool | ||
| name: "${CLUSTER_NAME}-dmp-0" | ||
| version: "${KUBERNETES_VERSION}" | ||
| --- | ||
| # DockerMachinePool using default values referenced by the MachinePool | ||
| apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 | ||
| kind: DockerMachinePool | ||
| metadata: | ||
| name: "${CLUSTER_NAME}-dmp-0" | ||
| --- | ||
| # KubeadmConfigTemplate referenced by the MachinePool | ||
| apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 | ||
| kind: KubeadmConfig | ||
| metadata: | ||
| name: "${CLUSTER_NAME}-mp-0-config" | ||
| spec: | ||
| joinConfiguration: | ||
| nodeRegistration: | ||
| kubeletExtraArgs: | ||
| # We have to pin the cgroupDriver to cgroupfs as kubeadm >=1.21 defaults to systemd | ||
| # kind will implement systemd support in: https://github.com/kubernetes-sigs/kind/issues/1726 | ||
| cgroup-driver: cgroupfs | ||
| eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0% |
22 changes: 22 additions & 0 deletions
22
test/e2e/data/infrastructure-docker/v1beta1/cluster-template-ipv6/kcp-ipv6.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| --- | ||
| kind: KubeadmControlPlane | ||
| apiVersion: controlplane.cluster.x-k8s.io/v1beta1 | ||
| metadata: | ||
| name: "${CLUSTER_NAME}-control-plane" | ||
| spec: | ||
| kubeadmConfigSpec: | ||
| clusterConfiguration: | ||
| apiServer: | ||
| # host.docker.internal is required by kubetest when running on MacOS because of the way ports are proxied. | ||
| certSANs: [localhost, "::", "::1", host.docker.internal] | ||
| initConfiguration: | ||
| localAPIEndpoint: | ||
| advertiseAddress: '::' | ||
| bindPort: 6443 | ||
| nodeRegistration: | ||
| kubeletExtraArgs: | ||
| node-ip: "::" | ||
| joinConfiguration: | ||
| nodeRegistration: | ||
| kubeletExtraArgs: | ||
| node-ip: "::" |
8 changes: 8 additions & 0 deletions
8
test/e2e/data/infrastructure-docker/v1beta1/cluster-template-ipv6/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| bases: | ||
| - ../bases/cluster-with-kcp.yaml | ||
| - ../bases/md.yaml | ||
| - ../bases/crs.yaml | ||
|
|
||
| patchesStrategicMerge: | ||
| - ./md-ipv6.yaml | ||
| - ./kcp-ipv6.yaml |
16 changes: 16 additions & 0 deletions
16
test/e2e/data/infrastructure-docker/v1beta1/cluster-template-ipv6/md-ipv6.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| --- | ||
| apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 | ||
| kind: KubeadmConfigTemplate | ||
| metadata: | ||
| name: "${CLUSTER_NAME}-md-0" | ||
| spec: | ||
| template: | ||
| spec: | ||
| initConfiguration: | ||
| nodeRegistration: | ||
| kubeletExtraArgs: | ||
| node-ip: "::" | ||
| joinConfiguration: | ||
| nodeRegistration: | ||
| kubeletExtraArgs: | ||
| node-ip: "::" |
Oops, something went wrong.