diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml index b11e7af339..e995132d48 100644 --- a/.github/workflows/build-test.yaml +++ b/.github/workflows/build-test.yaml @@ -744,7 +744,6 @@ jobs: --shared-password password \ --kotsadm-registry ttl.sh \ --kotsadm-namespace automated-${{ github.run_id }} \ - --skip-preflights \ --kotsadm-tag 24h | tee output.txt if ! grep -q "The Kubernetes RBAC policy that the Admin Console is running with does not have access to complete the Preflight Checks. It's recommended that you run these manually before proceeding." output.txt; then @@ -1156,8 +1155,11 @@ jobs: - name: minimal rbac override on command line run: | + set +e + echo ${{ secrets.MINIMAL_RBAC_LICENSE }} | base64 -d > license.yaml ./bin/kots \ install "$APP_SLUG/automated" \ + --license-file license.yaml \ --app-version-label "$APP_VERSION_LABEL" \ --no-port-forward \ --namespace "$APP_SLUG" \ @@ -1214,8 +1216,11 @@ jobs: - name: no minimal rbac override on command line run: | + set +e + echo ${{ secrets.MINIMAL_RBAC_LICENSE }} | base64 -d > license.yaml ./bin/kots \ install "$APP_SLUG/automated" \ + --license-file license.yaml \ --app-version-label "$APP_VERSION_LABEL" \ --no-port-forward \ --namespace "$APP_SLUG" \ diff --git a/hack/build-ttl.sh b/hack/build-ttl.sh index a6a625be17..7d2aafe493 100755 --- a/hack/build-ttl.sh +++ b/hack/build-ttl.sh @@ -12,4 +12,4 @@ printf "\n\n\n" printf "Run command: ${GREEN}kubectl edit deployment kotsadm${NC}\n" printf "Replace image with: ${GREEN}ttl.sh/${CURRENT_USER}/kotsadm:24h${NC}\n" printf "\n" -printf "These images are good for 12 hours\n" +printf "These images are good for 24 hours\n" diff --git a/migrations/build-ttl.sh b/migrations/build-ttl.sh index ed3e921fe1..32a9769e95 100755 --- a/migrations/build-ttl.sh +++ b/migrations/build-ttl.sh @@ -14,4 +14,4 @@ printf "\n\n\n" printf "Run command: ${GREEN}kubectl edit deployment kotsadm${NC}\n" printf "Replace image with: ${GREEN}${IMAGE}${NC}\n" printf "\n" -printf "This image is good for 12 hours\n" +printf "This image is good for 24 hours\n"