Merge pull request #551 from cprivitere/e2e-test-fixes

cprivitere · web-flow · commit b1ece1507a72 · 2023-04-03T14:19:53.000-05:00
🐛 E2e-test-fixes
diff --git a/Makefile b/Makefile
@@ -162,13 +162,13 @@ run-e2e-tests: $(KUSTOMIZE) $(GINKGO) $(E2E_CONF_FILE) e2e-test-templates $(if $
 	cd test/e2e; time $(GINKGO) -v --trace --tags=e2e \
 		--randomize-all -race $(GINKGO_ADDITIONAL_ARGS) \
 		--focus=$(GINKGO_FOCUS) --skip=$(GINKGO_SKIP) \
-		-nodes=$(GINKGO_NODES) --no-color=$(GINKGO_NOCOLOR) \
+		--nodes=$(GINKGO_NODES) --no-color=$(GINKGO_NOCOLOR) \
 		--output-dir="$(ARTIFACTS)" --junit-report="junit.e2e_suite.1.xml" \
 		--flake-attempts=$(GINKGO_FLAKE_ATTEMPTS) ./ -- \
 		-e2e.artifacts-folder="$(ARTIFACTS)" \
 		-e2e.config="$(E2E_CONF_FILE)" \
 		-e2e.skip-resource-cleanup=$(SKIP_CLEANUP) \
-		-e2e.use-existing-cluster=$(SKIP_CREATE_MGMT_CLUSTER) 
+		-e2e.use-existing-cluster=$(SKIP_CREATE_MGMT_CLUSTER)
 
 .PHONY: test-e2e-conformance
 test-e2e-conformance:
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ You should then follow the [Cluster API Quick Start Guide](https://cluster-api.s
 
 If you do not change the generated `yaml` files, it will use defaults. You can look in the [templates/cluster-template.yaml](./templates/cluster-template.yaml) file for details.
 
-* `CPEM_VERSION`                 (defaults to `v3.5.0`)
+* `CPEM_VERSION`                 (defaults to `v3.6.0`)
 * `KUBE_VIP_VERSION`             (defaults to `v0.5.0`)
 * `NODE_OS`                      (defaults to `ubuntu_22_04`)
 * `POD_CIDR`                     (defaults to `192.168.0.0/16`)
diff --git a/clusterctl-settings.json b/clusterctl-settings.json
@@ -2,7 +2,7 @@
     "name": "infrastructure-packet",
     "config": {
       "componentsFile": "infrastructure-components.yaml",
-      "nextVersion": "v0.6.99"
+      "nextVersion": "v0.7.99"
     }
   }
   
diff --git a/templates/addons/calico.yaml b/templates/addons/calico.yaml
diff --git a/templates/addons/calico/kustomization.yaml b/templates/addons/calico/kustomization.yaml
@@ -1,13 +1,11 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-    - https://docs.projectcalico.org/v3.20/manifests/calico.yaml
+    - https://docs.projectcalico.org/v3.25/manifests/calico.yaml
 images:
 - name: docker.io/calico/kube-controllers
   newName: quay.io/calico/kube-controllers
 - name: docker.io/calico/node
   newName: quay.io/calico/node
 - name: docker.io/calico/cni
   newName: quay.io/calico/cni
-- name: docker.io/calico/pod2daemon-flexvol
-  newName: quay.io/calico/pod2daemon-flexvol
diff --git a/templates/cluster-template-crs-cni.yaml b/templates/cluster-template-crs-cni.yaml
@@ -164,7 +164,7 @@ spec:
       echo "complete -o default -F __start_kubectl k" >> $HOME/.bashrc
       if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
         export KUBECONFIG=/etc/kubernetes/admin.conf
-        export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/${CPEM_VERSION:=v3.5.0}/deployment.yaml
+        export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/${CPEM_VERSION:=v3.6.0}/deployment.yaml
         export SECRET_DATA='cloud-sa.json=''{"apiKey": "{{ .apiKey }}","projectID": "${PROJECT_ID}", "eipTag": "cluster-api-provider-packet:cluster-id:${CLUSTER_NAME}", "eipHealthCheckUseHostIP": true}'''
         kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}" || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}") || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}")
         kubectl apply -f $${CPEM_YAML} || (sleep 1 && kubectl apply -f $${CPEM_YAML}) || (sleep 1 && kubectl apply -f $${CPEM_YAML})
diff --git a/templates/cluster-template-kube-vip-crs-cni.yaml b/templates/cluster-template-kube-vip-crs-cni.yaml
@@ -157,7 +157,7 @@ spec:
       echo "complete -o default -F __start_kubectl k" >> $HOME/.bashrc
       if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
         export KUBECONFIG=/etc/kubernetes/admin.conf
-        export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/${CPEM_VERSION:=v3.5.0}/deployment.yaml
+        export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/${CPEM_VERSION:=v3.6.0}/deployment.yaml
         export SECRET_DATA='cloud-sa.json=''{"apiKey": "{{ .apiKey }}","projectID": "${PROJECT_ID}", "loadbalancer": "kube-vip://", "facility": "${FACILITY}"}'''
         kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}" || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}") || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}")
         kubectl apply -f $${CPEM_YAML} || (sleep 1 && kubectl apply -f $${CPEM_YAML}) || (sleep 1 && kubectl apply -f $${CPEM_YAML})
diff --git a/templates/cluster-template-kube-vip.yaml b/templates/cluster-template-kube-vip.yaml
@@ -136,7 +136,7 @@ spec:
       echo "complete -o default -F __start_kubectl k" >> $HOME/.bashrc
       if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
         export KUBECONFIG=/etc/kubernetes/admin.conf
-        export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/${CPEM_VERSION:=v3.5.0}/deployment.yaml
+        export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/${CPEM_VERSION:=v3.6.0}/deployment.yaml
         export SECRET_DATA='cloud-sa.json=''{"apiKey": "{{ .apiKey }}","projectID": "${PROJECT_ID}", "loadbalancer": "kube-vip://", "facility": "${FACILITY}"}'''
         kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}" || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}") || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}")
         kubectl apply -f $${CPEM_YAML} || (sleep 1 && kubectl apply -f $${CPEM_YAML}) || (sleep 1 && kubectl apply -f $${CPEM_YAML})
diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml
@@ -89,7 +89,7 @@ spec:
         echo "complete -o default -F __start_kubectl k" >> $HOME/.bashrc
         if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
           export KUBECONFIG=/etc/kubernetes/admin.conf
-          export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/${CPEM_VERSION:=v3.5.0}/deployment.yaml
+          export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/${CPEM_VERSION:=v3.6.0}/deployment.yaml
           export SECRET_DATA='cloud-sa.json=''{"apiKey": "{{ .apiKey }}","projectID": "${PROJECT_ID}", "eipTag": "cluster-api-provider-packet:cluster-id:${CLUSTER_NAME}", "eipHealthCheckUseHostIP": true}'''
           kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}" || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}") || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}")
           kubectl apply -f $${CPEM_YAML} || (sleep 1 && kubectl apply -f $${CPEM_YAML}) || (sleep 1 && kubectl apply -f $${CPEM_YAML})
diff --git a/templates/experimental-kube-vip/kustomization.yaml b/templates/experimental-kube-vip/kustomization.yaml
@@ -83,7 +83,7 @@ patches:
             echo "complete -o default -F __start_kubectl k" >> $HOME/.bashrc
             if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
               export KUBECONFIG=/etc/kubernetes/admin.conf
-              export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/${CPEM_VERSION:=v3.5.0}/deployment.yaml
+              export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/${CPEM_VERSION:=v3.6.0}/deployment.yaml
               export SECRET_DATA='cloud-sa.json=''{"apiKey": "{{ .apiKey }}","projectID": "${PROJECT_ID}", "loadbalancer": "kube-vip://", "facility": "${FACILITY}"}'''
               kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}" || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}") || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}")
               kubectl apply -f $${CPEM_YAML} || (sleep 1 && kubectl apply -f $${CPEM_YAML}) || (sleep 1 && kubectl apply -f $${CPEM_YAML})
diff --git a/test/e2e/capi_e2e_test.go b/test/e2e/capi_e2e_test.go
@@ -33,7 +33,7 @@ var _ = Describe("[General] Running the Cluster API E2E tests", func() {
 	// tested:
 	// - capi_e2e.KCPAdoptionSpec
 	// - capi_e2e.MachinePoolSpec ???
-	// - capi_e2e.ClusetrClassChangesSpec
+	// - capi_e2e.ClusterClassChangesSpec
 
 	// The following upstream tests are not implemented because they are subsets of
 	// capi_e2e.ClusterUpgradeConformanceSpec:
diff --git a/test/e2e/config/packet-ci-actions.yaml b/test/e2e/config/packet-ci-actions.yaml
@@ -22,17 +22,17 @@ providers:
       new: --metrics-addr=:8080
     files:
     - sourcePath: "../data/shared/v1beta1/metadata.yaml"
-  - name: v0.4.4 # latest published release in the v1alpha4 series
-    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.4/core-components.yaml"
+  - name: v0.4.8 # latest published release in the v1alpha4 series
+    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.8/core-components.yaml"
     type: "url"
     contract: v1alpha4
     replacements:
       - old: --metrics-addr=127.0.0.1:8080
         new: --metrics-addr=:8080
     files:
     - sourcePath: "../data/shared/v1beta1/metadata.yaml"
-  - name: v1.1.5 # latest published release in the v1beta1 series
-    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.5/core-components.yaml"
+  - name: v1.3.6 # latest published release in the v1beta1 series
+    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.6/core-components.yaml"
     type: "url"
     contract: v1beta1
     replacements:
@@ -53,17 +53,17 @@ providers:
         new: --metrics-addr=:8080
     files:
     - sourcePath: "../data/shared/v1beta1/metadata.yaml"
-  - name: v0.4.4 # latest published release in the v1alpha4 series
-    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.4/bootstrap-components.yaml"
+  - name: v0.4.8 # latest published release in the v1alpha4 series
+    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.8/bootstrap-components.yaml"
     type: "url"
     contract: v1alpha4
     replacements:
       - old: --metrics-addr=127.0.0.1:8080
         new: --metrics-addr=:8080
     files:
     - sourcePath: "../data/shared/v1beta1/metadata.yaml"
-  - name: v1.1.5 # latest published release in the v1beta1 series
-    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.5/bootstrap-components.yaml"
+  - name: v1.3.6 # latest published release in the v1beta1 series
+    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.6/bootstrap-components.yaml"
     type: "url"
     contract: v1beta1
     replacements:
@@ -84,17 +84,17 @@ providers:
         new: --metrics-addr=:8080
     files:
     - sourcePath: "../data/shared/v1beta1/metadata.yaml"
-  - name: v0.4.4 # latest published release in the v1alpha4 series; this is used for v1alpha4 --> v1beta1 clusterctl upgrades test only.
-    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.4/control-plane-components.yaml"
+  - name: v0.4.8 # latest published release in the v1alpha4 series; this is used for v1alpha4 --> v1beta1 clusterctl upgrades test only.
+    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.8/control-plane-components.yaml"
     type: "url"
     contract: v1alpha4
     replacements:
       - old: --metrics-addr=127.0.0.1:8080
         new: --metrics-addr=:8080
     files:
     - sourcePath: "../data/shared/v1beta1/metadata.yaml"
-  - name: v1.1.5 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
-    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.5/control-plane-components.yaml"
+  - name: v1.3.6 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
+    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.6/control-plane-components.yaml"
     type: "url"
     contract: v1beta1
     replacements:
@@ -114,7 +114,7 @@ providers:
       # Add cluster templates
       - sourcePath: "../data/v1alpha3/cluster-template-packet-ccm.yaml"
       - sourcePath: "../data/v1alpha3/cluster-template-cpem.yaml"
-  - name: v0.5.0
+  - name: v0.6.2
     value: "${MANIFEST_PATH:=..}/infrastructure-components.yaml"
     type: "url"
     contract: v1beta1
@@ -125,18 +125,7 @@ providers:
     - sourcePath: "../data/v1beta1/cluster-template-node-drain.yaml"
     - sourcePath: "../data/v1beta1/cluster-template-md-remediation.yaml"
     - sourcePath: "../data/v1beta1/cluster-template-kcp-remediation.yaml"
-  - name: v0.6.0
-    value: "${MANIFEST_PATH:=..}/infrastructure-components.yaml"
-    type: "url"
-    contract: v1beta1
-    files:
-    - sourcePath: "${MANIFEST_PATH:=..}/metadata.yaml"
-    - sourcePath: "../data/v1beta1/cluster-template.yaml"
-    - sourcePath: "../data/v1beta1/cluster-template-kcp-scale-in.yaml"
-    - sourcePath: "../data/v1beta1/cluster-template-node-drain.yaml"
-    - sourcePath: "../data/v1beta1/cluster-template-md-remediation.yaml"
-    - sourcePath: "../data/v1beta1/cluster-template-kcp-remediation.yaml"
-  - name: v0.6.99 # next; use manifest from source files
+  - name: v0.7.99 # next; use manifest from source files
     value: "${MANIFEST_PATH:=..}/infrastructure-components.yaml"
     type: "url"
     contract: v1beta1
@@ -150,12 +139,12 @@ providers:
     - sourcePath: "../data/v1beta1/cluster-template-kcp-remediation.yaml"
 
 variables:
-  KUBERNETES_VERSION_MANAGEMENT: "v1.24.0"
-  KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.24.0}"
-  KUBERNETES_VERSION_UPGRADE_FROM: "v1.23.6"
-  KUBERNETES_VERSION_UPGRADE_TO: "v1.24.0"
-  ETCD_VERSION_UPGRADE_TO: "3.5.3-0"
-  COREDNS_VERSION_UPGRADE_TO: "v1.8.6"
+  KUBERNETES_VERSION_MANAGEMENT: "v1.26.0"
+  KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.26.0}"
+  KUBERNETES_VERSION_UPGRADE_FROM: "v1.25.3"
+  KUBERNETES_VERSION_UPGRADE_TO: "v1.26.0"
+  ETCD_VERSION_UPGRADE_TO: "3.5.6-0"
+  COREDNS_VERSION_UPGRADE_TO: "v1.9.3"
 
   # Infra provider specific variables
   NODE_OS: "ubuntu_22_04"
@@ -175,7 +164,7 @@ variables:
   INIT_WITH_BINARY: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.25/clusterctl-{OS}-{ARCH}"
   # CAPI v0.3.x cannot be deployed on Kubernetes >= v1.22.
   INIT_WITH_PROVIDERS_CONTRACT: "v1alpha3"
-  INIT_WITH_KUBERNETES_VERSION: "v1.21.2"
+  INIT_WITH_KUBERNETES_VERSION: "v1.21.14"
 
 intervals:
   default/wait-cluster: ["20m", "10s"]
diff --git a/test/e2e/config/packet-ci.yaml b/test/e2e/config/packet-ci.yaml
diff --git a/test/e2e/data/v1alpha3/bases/cluster-with-kcp-cpem.yaml b/test/e2e/data/v1alpha3/bases/cluster-with-kcp-cpem.yaml

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"name": "infrastructure-packet",`
`3`	`3`	`"config": {`
`4`	`4`	`"componentsFile": "infrastructure-components.yaml",`
`5`		`- "nextVersion": "v0.6.99"`
	`5`	`+ "nextVersion": "v0.7.99"`
`6`	`6`	`}`
`7`	`7`	`}`
`8`	`8`