make multi-master_test os type configurable (#290)

* make node os configurable

* remove dead code

* add ubuntu support for upload-image.sh

* remove outdated dependency from the integration-tests-container target

* fix typo in kubeadm_init resource name

* update dependencies

* mv examples/footloose/ubuntu1804 to examples/footloose/ubuntu18.04

* switch to capei controller

* Debug integration tests (#295)

* add node debugging

* whoops

* pin the controller image

* fix log typo

* see the kubeconfig in output

* fix debugging;

* display controller logs

* more debug

* more

* more

* more yet

* sheesh

* switch controller image

* fix wksctl image lookup from manifest

* switch image for debugging

* include changes to manifest

* more debug

* switch to weavek8sops and allow for the fact that the controller is always running in debug mode

* More namespace fixes

* lint fixes

Co-authored-by: Jerry Jackson <jerry@weave.works>

* support node os override

* fix multimaster test and os override

* make image available for online test

* cleanup yumrepo and registry post-test

Co-authored-by: Jerry Jackson <jerry@weave.works>
Co-authored-by: Jerry R. Jackson <jrryjcksn@gmail.com>

Makefile

@@ -132,8 +132,13 @@ mkfile_dir := $(dir $(mkfile_path))
 container-tests: pkg/apis/wksprovider/machine/scripts/scripts_vfsdata.go pkg/apis/wksprovider/controller/manifests/manifests_vfsdata.go
 	go test -count=1 ./test/container/...
 
+
 integration-tests-container: cmd/wksctl/wksctl
-	IMAGE_TAG=$(IMAGE_TAG) go test -v -timeout 20m ./test/integration/container/...
+	APK_INDEX='https://https:dl-cdn.alpinelinux.org/alpine/v3.11/main/x86_64/APKINDEX.tar.gz https://dl-cdn.alpinelinux.org/alpine/v3.11/community/x86_64/APKINDEX.tar.gz'
+	NODE_OS1="centos"
+	NODE_OS2="ubuntu"
+	NODE_OS_CHOICE=$${NODE_OS_CHOICE:-"$$(echo $$NODE_OS1 $$NODE_OS2 | tr ' ' '\n' | shuf | head -1)"}
+	IMAGE_TAG=$(IMAGE_TAG) NODE_OS="$${NODE_OS_CHOICE}" go test -v -timeout 40m ./test/integration/container/...
 
 FORCE:
 

cmd/wksctl/apply/apply.go

@@ -16,7 +16,6 @@ import (
 	"github.com/weaveworks/wksctl/pkg/plan/runners/ssh"
 	"github.com/weaveworks/wksctl/pkg/specs"
 	"github.com/weaveworks/wksctl/pkg/utilities/manifest"
-	"github.com/weaveworks/wksctl/pkg/version"
 )
 
 // Cmd represents the apply command
@@ -172,7 +171,6 @@ func (a *Applier) initiateCluster(clusterManifestPath, machinesManifestPath stri
 		},
 		Controller: wksos.ControllerParams{
 			ImageOverride: controllerImage,
-			ImageBuiltin:  "docker.io/weaveworks/wksctl-controller:" + version.ImageTag,
 		},
 		GitData: wksos.GitParams{
 			GitURL:           a.Params.gitURL,

cmd/wksctl/plan/view/view.go

@@ -13,7 +13,6 @@ import (
 	"github.com/weaveworks/wksctl/pkg/plan/runners/ssh"
 	"github.com/weaveworks/wksctl/pkg/specs"
 	"github.com/weaveworks/wksctl/pkg/utilities/manifest"
-	"github.com/weaveworks/wksctl/pkg/version"
 )
 
 // Cmd represents the plan view command
@@ -114,7 +113,6 @@ func displayPlan(clusterManifestPath, machinesManifestPath string) error {
 		},
 		Controller: wksos.ControllerParams{
 			ImageOverride: viewOptions.controllerImage,
-			ImageBuiltin:  "docker.io/weaveworks/wksctl-controller:" + version.ImageTag,
 		},
 		GitData: wksos.GitParams{
 			GitURL:           viewOptions.gitURL,

examples/footloose/upload-controller-image.sh

@@ -3,4 +3,5 @@
 scriptdir="$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)"
 toolsdir=$scriptdir/../../tools
 
-$scriptdir/upload-image.sh node0 docker.io/weaveworks/wksctl-controller:$($toolsdir/image-tag) $@
+$scriptdir/upload-image.sh centos-multimaster-node0 docker.io/weaveworks/wksctl-controller:$($toolsdir/image-tag) $@
+$scriptdir/upload-image.sh ubuntu-multimaster-node0 docker.io/weaveworks/wksctl-controller:$($toolsdir/image-tag) $@

go.mod

@@ -42,6 +42,7 @@ require (
 	k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19
 	sigs.k8s.io/cluster-api v0.3.6
 	sigs.k8s.io/controller-runtime v0.6.0
+	sigs.k8s.io/kustomize/kyaml v0.6.0 // indirect
 	sigs.k8s.io/yaml v1.2.0
 )
 

go.sum

@@ -795,14 +795,13 @@ github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv
 github.com/vishvananda/netlink v1.0.0/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk=
 github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI=
 github.com/vmware/govmomi v0.20.3/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU=
-github.com/weaveworks/cluster-api-provider-existinginfra v0.0.1 h1:mL9ydxwdcoDOeasQ+w2ZTAXIN1QyAZ4/S1nAM63BLOI=
-github.com/weaveworks/cluster-api-provider-existinginfra v0.0.1/go.mod h1:1+bY5QfDcvqYDHCLF7a57X+/Zt3OSqyL/x7wayf+Wbo=
 github.com/weaveworks/cluster-api-provider-existinginfra v0.0.2 h1:Z/OUvMxnX4KjyIZgXUKbveTZPKKr9J2GorwEeIs2Wkk=
 github.com/weaveworks/cluster-api-provider-existinginfra v0.0.2/go.mod h1:1+bY5QfDcvqYDHCLF7a57X+/Zt3OSqyL/x7wayf+Wbo=
 github.com/weaveworks/footloose v0.0.0-20200609124411-8f3df89ea188 h1:BuiVM+91YRjWUSMvF93A7Sm7s7IHrxjrPcc/5boO2V0=
 github.com/weaveworks/footloose v0.0.0-20200609124411-8f3df89ea188/go.mod h1:nxDdCjg1kb5+luh4mUCp+mtBZIWrhzoLIArrD99y+Sc=
 github.com/weaveworks/go-checkpoint v0.0.0-20170503165305-ebbb8b0518ab h1:mW+hgchD9qUUBqnuaDBj7BkcpFPk/FxeFcUFI5lvvUw=
 github.com/weaveworks/go-checkpoint v0.0.0-20170503165305-ebbb8b0518ab/go.mod h1:qkbvw5GPibQ/Nf7IZJL0UoLwmJ6858b4S/hUWRd+cH4=
+github.com/weaveworks/launcher v0.0.0-20180824102238-59a4fcc32c9c h1:YTNC1c2AM3xjrL6DM4vuq0HNJ79GFR8ScT+QKWadFUw=
 github.com/weaveworks/launcher v0.0.0-20180824102238-59a4fcc32c9c/go.mod h1:w9Z1vnQmPobkEZ0F3oyiqRYP+62qDqTGnK6t5uhe1kg=
 github.com/weaveworks/libgitops v0.0.2 h1:Brdmd+2DI8iPtrfWoyzyyzYcuFFlAGj+kf8asdKRjBg=
 github.com/weaveworks/libgitops v0.0.2/go.mod h1:P3TjYVc4kFAUmXolRTMWUoUNTvN2HPMTo1ZWrpOCwFM=
@@ -1217,8 +1216,9 @@ sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5
 sigs.k8s.io/kustomize/api v0.4.1/go.mod h1:NqxqT+wbYHrD0P19Uu4dXiMsVwI1IwQs+MJHlLhmPqQ=
 sigs.k8s.io/kustomize/kyaml v0.1.11 h1:/VvWxVIgH5gG1K4A7trgbyLgO3tRBiAWNhLFVU1HEmo=
 sigs.k8s.io/kustomize/kyaml v0.1.11/go.mod h1:72/rLkSi+L/pHM1oCjwrf3ClU+tH5kZQvvdLSqIHwWU=
-sigs.k8s.io/kustomize/kyaml v0.4.2 h1:9/Tb90gnThv4vgUldZOLnrT+9Esdh7+Og2UIq024Ykg=
 sigs.k8s.io/kustomize/kyaml v0.4.2/go.mod h1:XJL84E6sOFeNrQ7CADiemc1B0EjIxHo3OhW4o1aJYNw=
+sigs.k8s.io/kustomize/kyaml v0.6.0 h1:Z/9TxsiG21sbcd6JD4IeM6BVZ2+04001KKzbxCf+qeY=
+sigs.k8s.io/kustomize/kyaml v0.6.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
 sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
 sigs.k8s.io/structured-merge-diff/v3 v3.0.0 h1:dOmIZBMfhcHS09XZkMyUgkq5trg3/jRyJYFZUiaOp8E=
 sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=

pkg/apis/wksprovider/controller/manifests/yaml/04_controller.yaml

@@ -42,7 +42,7 @@ spec:
         operator: Exists
       containers:
       - name: controller
-        image: docker.io/weaveworks/wksctl-controller:latest
+        image: weaveworks/cluster-api-existinginfra-controller:v0.0.2
         args:
         - --verbose
         resources: