update

kubernetes-sigs · Oct 14, 2021 · f9e2830 · f9e2830
1 parent ee8f295
commit f9e2830
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 24 deletions.
diff --git a/go.mod b/go.mod
@@ -42,4 +42,4 @@ require (
 	sigs.k8s.io/yaml v1.3.0
 )
 
-replace sigs.k8s.io/controller-runtime => github.com/vincepri/controller-runtime v0.10.1-0.20211013152123-b3225e0c7e86
+replace sigs.k8s.io/controller-runtime => github.com/vincepri/controller-runtime v0.10.1-0.20211013215004-81098136c987
diff --git a/go.sum b/go.sum
@@ -561,8 +561,8 @@ github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
-github.com/vincepri/controller-runtime v0.10.1-0.20211013152123-b3225e0c7e86 h1:58xmgxjBwfYq/0IUqcNfLqMez5otb3MsorctY14z6v0=
-github.com/vincepri/controller-runtime v0.10.1-0.20211013152123-b3225e0c7e86/go.mod h1:CQp8eyUQZ/Q7PJvnIrB6/hgfTC1kBkGylwsLgOQi1WY=
+github.com/vincepri/controller-runtime v0.10.1-0.20211013215004-81098136c987 h1:mSW5ZlfBIPa8VlJUhbfy7BkGP12Fs2uhYBNvhJtTH/I=
+github.com/vincepri/controller-runtime v0.10.1-0.20211013215004-81098136c987/go.mod h1:CQp8eyUQZ/Q7PJvnIrB6/hgfTC1kBkGylwsLgOQi1WY=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=

diff --git a/scripts/ci-e2e.sh b/scripts/ci-e2e.sh
@@ -94,12 +94,14 @@ trap "cleanup" EXIT SIGINT
 docker events > "${ARTIFACTS_LOCAL}/docker-events.txt" 2>&1 &
 ctr -n moby events > "${ARTIFACTS_LOCAL}/containerd-events.txt" 2>&1 &
 
+if [[ -n ${INIT_WITH_BINARY} ]]; then
+  echo "+ Detected upgrade test, sed'ing leader elect!"
+  grep "leader-elect=" < ./test/e2e/config/docker.yaml | sort -u
+  sed -i -e "s/leader-elect=true/leader-elect=false/g"  ./test/e2e/config/docker.yaml
+  grep "leader-elect=" < ./test/e2e/config/docker.yaml | sort -u
+fi
+
 # Run e2e tests
 mkdir -p "$ARTIFACTS"
-echo "+ run v1alpha3 => v1beta1 upgrade test!"
-
-export GINKGO_FOCUS="Should create a management cluster and then upgrade all the providers"
-export INIT_WITH_BINARY="https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.23/clusterctl-{OS}-{ARCH}"
-export INIT_WITH_PROVIDERS_CONTRACT=v1alpha3
-export INIT_WITH_KUBERNETES_VERSION=v1.21.2
+echo "+ run tests!"
 make -C test/e2e/ run
diff --git a/test/e2e/config/docker.yaml b/test/e2e/config/docker.yaml
@@ -35,7 +35,7 @@ providers:
     contract: v1alpha3
     replacements:
     - old: "--leader-elect"
-      new: "--leader-elect=false"
+      new: "--leader-elect=true"
     - old: --metrics-addr=127.0.0.1:8080
       new: --metrics-addr=:8080
     files:
@@ -46,7 +46,7 @@ providers:
     contract: v1alpha4
     replacements:
       - old: "--leader-elect"
-        new: "--leader-elect=false"
+        new: "--leader-elect=true"
       - old: --metrics-addr=127.0.0.1:8080
         new: --metrics-addr=:8080
     files:
@@ -55,7 +55,7 @@ providers:
     value: ../../../config/default
     replacements:
     - old: "--leader-elect"
-      new: "--leader-elect=false"
+      new: "--leader-elect=true"
     - old: --metrics-bind-addr=localhost:8080
       new: --metrics-bind-addr=:8080
     files:
@@ -70,7 +70,7 @@ providers:
     contract: v1alpha3
     replacements:
       - old: "--leader-elect"
-        new: "--leader-elect=false"
+        new: "--leader-elect=true"
       - old: --metrics-addr=127.0.0.1:8080
         new: --metrics-addr=:8080
     files:
@@ -81,7 +81,7 @@ providers:
     contract: v1alpha4
     replacements:
       - old: "--leader-elect"
-        new: "--leader-elect=false"
+        new: "--leader-elect=true"
       - old: --metrics-addr=127.0.0.1:8080
         new: --metrics-addr=:8080
     files:
@@ -90,7 +90,7 @@ providers:
     value: ../../../bootstrap/kubeadm/config/default
     replacements:
     - old: "--leader-elect"
-      new: "--leader-elect=false"
+      new: "--leader-elect=true"
     - old: --metrics-bind-addr=localhost:8080
       new: --metrics-bind-addr=:8080
     files:
@@ -105,7 +105,7 @@ providers:
     contract: v1alpha3
     replacements:
       - old: "--leader-elect"
-        new: "--leader-elect=false"
+        new: "--leader-elect=true"
       - old: --metrics-addr=127.0.0.1:8080
         new: --metrics-addr=:8080
     files:
@@ -116,7 +116,7 @@ providers:
     contract: v1alpha4
     replacements:
       - old: "--leader-elect"
-        new: "--leader-elect=false"
+        new: "--leader-elect=true"
       - old: --metrics-addr=127.0.0.1:8080
         new: --metrics-addr=:8080
     files:
@@ -125,7 +125,7 @@ providers:
     value: ../../../controlplane/kubeadm/config/default
     replacements:
     - old: "--leader-elect"
-      new: "--leader-elect=false"
+      new: "--leader-elect=true"
     - old: --metrics-bind-addr=localhost:8080
       new: --metrics-bind-addr=:8080
     files:
@@ -140,7 +140,7 @@ providers:
     contract: v1alpha3
     replacements:
       - old: "--leader-elect"
-        new: "--leader-elect=false"
+        new: "--leader-elect=true"
       - old: --metrics-addr=127.0.0.1:8080
         new: --metrics-addr=:8080
     files:
@@ -152,7 +152,7 @@ providers:
     contract: v1alpha4
     replacements:
       - old: "--leader-elect"
-        new: "--leader-elect=false"
+        new: "--leader-elect=true"
       - old: --metrics-addr=127.0.0.1:8080
         new: --metrics-addr=:8080
     files:
@@ -162,7 +162,7 @@ providers:
     value: ../../../test/infrastructure/docker/config/default
     replacements:
     - old: "--leader-elect"
-      new: "--leader-elect=false"
+      new: "--leader-elect=true"
     - old: --metrics-bind-addr=localhost:8080
       new: --metrics-bind-addr=:8080
     files:
@@ -200,9 +200,9 @@ variables:
   NODE_DRAIN_TIMEOUT: "60s"
   # NOTE: INIT_WITH_BINARY and INIT_WITH_KUBERNETES_VERSION are only used by the clusterctl upgrade test to initialize
   # the management cluster to be upgraded.
-  INIT_WITH_BINARY: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.4/clusterctl-{OS}-{ARCH}"
-  INIT_WITH_PROVIDERS_CONTRACT: "v1alpha4"
-  INIT_WITH_KUBERNETES_VERSION: "v1.22.0"
+  INIT_WITH_BINARY: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.23/clusterctl-{OS}-{ARCH}"
+  INIT_WITH_PROVIDERS_CONTRACT: "v1alpha3"
+  INIT_WITH_KUBERNETES_VERSION: "v1.21.2"
 
 intervals:
   default/wait-controllers: ["3m", "10s"]