WIP: add CI image to target cluster

Author: lentzi90

scripts/ci-e2e.sh

@@ -84,6 +84,24 @@ fi
 
 "hack/ci/create_devstack.sh"
 
+# TODO: Upload image to swift for e2e clusterctl upgrade tests
+# This is just a quick hack to test the process
+make e2e-image
+make hack/tools/bin/gojq
+ARTIFACTS="$(pwd)/_artifacts"
+docker save -o ${ARTIFACTS}/capo-e2e-image.tar gcr.io/k8s-staging-capi-openstack/capi-openstack-controller:dev
+export OS_CLOUD=capo-e2e
+openstack container create --public capo-e2e
+openstack object create capo-e2e ${ARTIFACTS}/capo-e2e-image.tar --name capo-e2e-image.tar
+ACCOUNT=$(openstack object show capo-e2e capo-e2e-image.tar -f json | hack/tools/bin/gojq -r .account)
+URL=http://10.0.3.15:8080/v1/${ACCOUNT}/capo-e2e/capo-e2e-image.tar
+sed -i "s@CAPO_CONTAINER_IMAGE_URL@${URL}@" test/e2e/data/kustomize/upgrade-patches/ci-hack-kcp.yaml
+sed -i "s@CAPO_CONTAINER_IMAGE_URL@${URL}@" test/e2e/data/kustomize/upgrade-patches/ci-hack-kct.yaml
+unset OS_CLOUD
+# TODO: This is just to test the clusterctl upgrade tests
+export E2E_GINKGO_PARALLEL="1"
+export E2E_GINKGO_ARGS="-focus='\[clusterctl-upgrade\]'"
+
 export OPENSTACK_CLOUD_YAML_FILE
 OPENSTACK_CLOUD_YAML_FILE="$(pwd)/clouds.yaml"
 make test-e2e

test/e2e/data/e2e_conf.yaml

@@ -160,10 +160,8 @@ providers:
     - sourcePath: "./infrastructure-openstack/cluster-template-external-cloud-provider.yaml"
     - sourcePath: "./infrastructure-openstack/cluster-template-without-lb.yaml"
     replacements:
-    # TODO: We should use e2e here instead of main, but we need a way to get it into the workload cluster
-    # for upgrade tests for that to work.
     - old: gcr.io/k8s-staging-capi-openstack/capi-openstack-controller:dev
-      new: gcr.io/k8s-staging-capi-openstack/capi-openstack-controller:main
+      new: gcr.io/k8s-staging-capi-openstack/capi-openstack-controller:e2e
     - old: "imagePullPolicy: Always"
       new: "imagePullPolicy: IfNotPresent"
     - old: "--v=2"

test/e2e/data/kustomize/upgrade-patches/ci-hack-kcp.yaml

@@ -0,0 +1,23 @@
+---
+# Workaround for https://github.com/kubernetes-sigs/cluster-api/issues/7457
+# There is a small but important difference between these two:
+# path: /a/b/c
+# *creates* the c array, overwriting anything that was there before
+# path: /a/b/c/-
+# *adds* to the c array and does not work if the array is missing
+- op: add
+  path: /spec/kubeadmConfigSpec/preKubeadmCommands
+  value:
+  - /usr/local/bin/ci-artifacts-openstack.sh
+- op: add
+  path: /spec/kubeadmConfigSpec/files/-
+  value:
+    content: |
+      #!/bin/bash
+      # Download the locally built CAPO controller image
+      echo "Downloading CAPO_CONTAINER_IMAGE_URL"
+      wget "CAPO_CONTAINER_IMAGE_URL" -O "/tmp/capo-controller-manager.tar"
+      sudo ctr -n k8s.io images import "/tmp/capo-controller-manager.tar" || echo "* ignoring expected 'ctr images import' result"
+    owner: root:root
+    path: /usr/local/bin/ci-artifacts-openstack.sh
+    permissions: "0750"

test/e2e/data/kustomize/upgrade-patches/ci-hack-kct.yaml

@@ -0,0 +1,23 @@
+---
+# Workaround for https://github.com/kubernetes-sigs/cluster-api/issues/7457
+# There is a small but important difference between these two:
+# path: /a/b/c
+# *creates* the c array, overwriting anything that was there before
+# path: /a/b/c/-
+# *adds* to the c array and does not work if the array is missing
+- op: add
+  path: /spec/template/spec/preKubeadmCommands
+  value:
+  - /usr/local/bin/ci-artifacts-openstack.sh
+- op: add
+  path: /spec/template/spec/files/-
+  value:
+    content: |
+      #!/bin/bash
+      # Download the locally built CAPO controller image
+      echo "Downloading CAPO_CONTAINER_IMAGE_URL"
+      wget "CAPO_CONTAINER_IMAGE_URL" -O "/tmp/capo-controller-manager.tar"
+      sudo ctr -n k8s.io images import "/tmp/capo-controller-manager.tar" || echo "* ignoring expected 'ctr images import' result"
+    owner: root:root
+    path: /usr/local/bin/ci-artifacts-openstack.sh
+    permissions: "0750"

test/e2e/data/kustomize/upgrade-patches/kustomization.yaml

@@ -0,0 +1,14 @@
+# Modifications to release templates for clusterctl upgrade scenarios
+---
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+patches:
+- target:
+    kind: KubeadmControlPlane
+    name: \${CLUSTER_NAME}-control-plane
+  path: ci-hack-kcp.yaml
+- target:
+    kind: KubeadmConfigTemplate
+    name: \${CLUSTER_NAME}-md-0
+  path: ci-hack-kct.yaml

test/e2e/data/kustomize/v1alpha4/kustomization.yaml

@@ -4,3 +4,4 @@ resources:
 
 components:
 - ../common-patches
+- ../upgrade-patches

test/e2e/data/kustomize/v1alpha5/kustomization.yaml

@@ -4,3 +4,4 @@ resources:
 
 components:
 - ../common-patches
+- ../upgrade-patches