Merge pull request #6918 from killianmuldoon/runtimeSDK/e2e-more-patches

🌱  Add more patches to test extension

Author: k8s-ci-robot

internal/controllers/topology/cluster/patches/variables/errors.go

@@ -0,0 +1,46 @@
+/*
+Copyright 2022 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package variables
+
+const notFoundReason = "variable not found"
+
+type errorWithReason interface {
+	Reason() string
+}
+
+// IsNotFoundError checks if the passed error is a notFoundError.
+func IsNotFoundError(err error) bool {
+	if e, ok := err.(errorWithReason); ok {
+		return e.Reason() == notFoundReason
+	}
+	return false
+}
+
+// notFoundError is used when a variable is not found.
+type notFoundError struct {
+	reason  string
+	message string
+}
+
+func (e notFoundError) Error() string {
+	return e.message
+}
+
+// Reason returns the notFoundReason.
+func (e notFoundError) Reason() string {
+	return e.reason
+}

internal/controllers/topology/cluster/patches/variables/value.go

@@ -17,6 +17,7 @@ limitations under the License.
 package variables
 
 import (
+	"fmt"
 	"strconv"
 	"strings"
 
@@ -46,7 +47,7 @@ func GetVariableValue(variables map[string]apiextensionsv1.JSON, variablePath st
 	// Get the variable.
 	value, ok := variables[variableNameSegment.path]
 	if !ok {
-		return nil, errors.Errorf("variable %q does not exist", variableName)
+		return nil, notFoundError{reason: notFoundReason, message: fmt.Sprintf("variable %q does not exist", variableName)}
 	}
 
 	// Return the value, if variablePath points to a top-level variable, i.e. hos no relativePath and no
@@ -88,7 +89,7 @@ func GetVariableValue(variables map[string]apiextensionsv1.JSON, variablePath st
 
 		// Return if the variable does not exist.
 		if !variable.Exists(pathSegment.path) {
-			return nil, errors.Errorf("variable %q does not exist: failed to lookup segment %q", variablePath, pathSegment.path)
+			return nil, notFoundError{reason: notFoundReason, message: fmt.Sprintf("variable %q does not exist: failed to lookup segment %q", variablePath, pathSegment.path)}
 		}
 
 		// Get the variable from the variable object.

test/e2e/cluster_upgrade_runtimesdk.go

@@ -488,7 +488,7 @@ func runtimeHookTestHandler(ctx context.Context, c client.Client, namespace, clu
 	Eventually(func() bool {
 		return blockingCondition()
 	}, intervals...).Should(BeFalse(),
-		fmt.Sprintf("ClusterTopology reconcile did proceed as expected when calling %s", hookName))
+		fmt.Sprintf("ClusterTopology reconcile did not proceed as expected when calling %s", hookName))
 }
 
 // clusterConditionShowsHookBlocking checks if the TopologyReconciled condition message contains both the hook name and hookFailedMessage.

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

@@ -27,9 +27,9 @@ spec:
         replicas: ${WORKER_MACHINE_COUNT}
         failureDomain: fd4
     variables:
-    - name: etcdImageTag
       # We set an empty value to use the default tag kubeadm init is using.
+    - name: etcdImageTag
       value: ""
-    - name: coreDNSImageTag
       # We set an empty value to use the default tag kubeadm init is using.
-      value: ""
+    - name: coreDNSImageTag
+      value: ""

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

@@ -1,5 +1,6 @@
 resources:
-- ../cluster-template-upgrades-cgroupfs
+- ../cluster-template-upgrades-runtimesdk
+- ./mp-cgroupfs.yaml
 
 patches:
-- ./cluster-runtimesdk.yaml
+- ./mp-default-cgroupfs.yaml

test/e2e/data/infrastructure-docker/v1beta1/cluster-template-upgrades-runtimesdk-cgroupfs/kustomization.yaml

@@ -0,0 +1,13 @@
+# KubeadmConfigTemplate referenced by the MachinePool for cgroupfs
+apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+kind: KubeadmConfig
+metadata:
+  name: "${CLUSTER_NAME}-mp-0-config-cgroupfs"
+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%

test/e2e/data/infrastructure-docker/v1beta1/cluster-template-upgrades-runtimesdk-cgroupfs/mp-cgroupfs.yaml

@@ -0,0 +1,10 @@
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: MachinePool
+metadata:
+  name: "${CLUSTER_NAME}-mp-0"
+spec:
+  template:
+    spec:
+      bootstrap:
+        configRef:
+          name: "${CLUSTER_NAME}-mp-0-config-cgroupfs"

test/e2e/data/infrastructure-docker/v1beta1/cluster-template-upgrades-runtimesdk-cgroupfs/mp-default-cgroupfs.yaml

@@ -3,6 +3,29 @@ kind: Cluster
 metadata:
   name: '${CLUSTER_NAME}'
   namespace: default
+  labels:
+    cni: "${CLUSTER_NAME}-crs-0"
 spec:
+  clusterNetwork:
+    services:
+      cidrBlocks: ['${DOCKER_SERVICE_CIDRS}']
+    pods:
+      cidrBlocks: ['${DOCKER_POD_CIDRS}']
+    serviceDomain: '${DOCKER_SERVICE_DOMAIN}'
   topology:
     class: "quick-start-runtimesdk"
+    version: "${KUBERNETES_VERSION}"
+    controlPlane:
+      metadata: {}
+      nodeDeletionTimeout: "30s"
+      replicas: ${CONTROL_PLANE_MACHINE_COUNT}
+    workers:
+      machineDeployments:
+        - class: "default-worker"
+          name: "md-0"
+          nodeDeletionTimeout: "30s"
+          replicas: ${WORKER_MACHINE_COUNT}
+          failureDomain: fd4
+    variables:
+      - name: kubeadmControlPlaneMaxSurge
+        value: "1"

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

@@ -1,5 +1,4 @@
 resources:
-- ../cluster-template-upgrades
-
-patches:
-- ./cluster-runtimesdk.yaml
+  - ../bases/crs.yaml
+  - ../bases/mp.yaml
+  - ./cluster-runtimesdk.yaml