Merge pull request #52 from dweomer/prepare-v0.4.0

prepare for v0.4.0
rancher · Mar 25, 2020 · 437dfc5 · 437dfc5
2 parents 0da8696 + 36d625e
commit 437dfc5
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 17 deletions.
diff --git a/Dockerfile.dapper b/Dockerfile.dapper
@@ -24,14 +24,16 @@ RUN rm -rf /go/src /go/pkg
 RUN if [ "${ARCH}" == "amd64" ]; then \
         curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.15.0; \
     fi
+RUN if [ "${ARCH}" == "amd64" ]; then \
+        GO111MODULE=on go install sigs.k8s.io/kustomize/kustomize/v3; \
+    fi
 ARG SONOBUOY_VERSION=0.17.2
 RUN if [ "${ARCH}" != "arm" ]; then \
         set -x; \
         curl -sL "https://github.com/vmware-tanzu/sonobuoy/releases/download/v${SONOBUOY_VERSION}/sonobuoy_${SONOBUOY_VERSION}_linux_${ARCH}.tar.gz" \
         | tar -xz -C /usr/local/bin; \
         chmod +x /usr/local/bin/sonobuoy; \
     fi
-
 # ENV DAPPER_RUN_ARGS --privileged
 ENV DAPPER_ENV REPO TAG DRONE_TAG
 ENV DAPPER_SOURCE /go/src/github.com/rancher/system-upgrade-controller/

diff --git a/examples/ubuntu/docker-compose.yaml b/examples/ubuntu/docker-compose.yaml
@@ -23,7 +23,7 @@ services:
       - target: /var/lib/rancher
         type: volume
       - target: /var/lib/rancher/k3s/server/manifests/system-upgrade-controller.yaml
-        source: ../../manifests/system-upgrade-controller.yaml
+        source: ../../dist/artifacts/system-upgrade-controller.yaml
         type: bind
       - target: /var/lib/rancher/k3s/server/manifests/system-upgrade-plans/bionic.yaml
         source: ./bionic.yaml
@@ -51,7 +51,7 @@ services:
       - target: /var/lib/rancher
         type: volume
       - target: /var/lib/rancher/k3s/server/manifests/system-upgrade-controller.yaml
-        source: ../../manifests/system-upgrade-controller.yaml
+        source: ../../dist/artifacts/system-upgrade-controller.yaml
         type: bind
       - target: /var/lib/rancher/k3s/server/manifests/system-upgrade-plans/bionic.yaml
         source: ./bionic.yaml

diff --git a/kustomization.yaml b/kustomization.yaml
@@ -4,4 +4,4 @@ resources:
 - manifests/system-upgrade-controller.yaml
 images:
 - name: rancher/system-upgrade-controller
-  newTag: v0.3.1
+  newTag: v0.4.0
diff --git a/manifests/system-upgrade-controller.yaml b/manifests/system-upgrade-controller.yaml
@@ -1,4 +1,3 @@
----
 apiVersion: v1
 kind: Namespace
 metadata:
@@ -32,8 +31,8 @@ data:
   SYSTEM_UPGRADE_CONTROLLER_DEBUG: "false"
   SYSTEM_UPGRADE_CONTROLLER_THREADS: "2"
   SYSTEM_UPGRADE_JOB_ACTIVE_DEADLINE_SECONDS: "900"
-  SYSTEM_UPGRADE_JOB_BACKOFF_LIMIT: "6"
-  SYSTEM_UPGRADE_JOB_IMAGE_PULL_POLICY: "IfNotPresent"
+  SYSTEM_UPGRADE_JOB_BACKOFF_LIMIT: "99"
+  SYSTEM_UPGRADE_JOB_IMAGE_PULL_POLICY: "Always"
   SYSTEM_UPGRADE_JOB_KUBECTL_IMAGE: "rancher/kubectl:v1.17.0"
   SYSTEM_UPGRADE_JOB_PRIVILEGED: "true"
   SYSTEM_UPGRADE_JOB_TTL_SECONDS_AFTER_FINISH: "900"
@@ -62,7 +61,7 @@ spec:
       serviceAccountName: system-upgrade
       containers:
         - name: system-upgrade-controller
-          image: rancher/system-upgrade-controller:v0.3.1
+          image: rancher/system-upgrade-controller:v0.4.0
           imagePullPolicy: IfNotPresent
           envFrom:
             - configMapRef:

diff --git a/scripts/package-controller b/scripts/package-controller
@@ -25,3 +25,14 @@ docker image save --output ./dist/artifacts/system-upgrade-controller-${ARCH}.ta
   ${REPO}/system-upgrade-controller:latest
 echo ${REPO}/system-upgrade-controller:${TAG} > ./dist/images.txt
 echo Built ${REPO}/system-upgrade-controller:${TAG}
+
+reset-kustomization() {
+  cp -vf /tmp/kustomization.yaml .
+}
+
+if [ "$ARCH" = "amd64" ]; then
+  cp kustomization.yaml /tmp/
+  trap reset-kustomization EXIT
+  kustomize edit set image "rancher/system-upgrade-controller=${REPO}/system-upgrade-controller:${VERSION}"
+  kustomize build --reorder=none --output ./dist/artifacts/system-upgrade-controller.yaml
+fi
diff --git a/scripts/package-e2e-tests b/scripts/package-e2e-tests
@@ -28,13 +28,11 @@ docker image save --output ./dist/artifacts/system-upgrade-controller-e2e-tests-
 echo ${REPO}/system-upgrade-controller:${TAG}-e2e-tests >> ./dist/images.txt
 echo Built ${REPO}/system-upgrade-controller:${TAG}-e2e-tests
 
-if [ "$ARCH" == "arm" ]; then
-    exit 0
+if [ "$ARCH" = "amd64" ]; then
+  sonobuoy gen plugin \
+    --format=junit \
+    --image ${REPO}/system-upgrade-controller:${VERSION}-e2e-tests \
+    --name system-upgrade-controller \
+    --type job \
+  > ./dist/artifacts/system-upgrade-controller-e2e-tests.yaml
 fi
-
-sonobuoy gen plugin \
-  --format=junit \
-  --image ${REPO}/system-upgrade-controller:${VERSION}-e2e-tests \
-  --name system-upgrade-controller \
-  --type job \
-> ./dist/artifacts/system-upgrade-controller-e2e-tests.yaml