Update admin console to 1.124.9 to support changing custom domains (#2018)

* updated adminconsole version

---------

Co-authored-by: emosbaugh <[email protected]>

Author: sgalsaleh

.github/workflows/ci.yaml

@@ -170,6 +170,8 @@ jobs:
           go-version-file: go.mod
           cache-dependency-path: "**/*.sum"
 
+      - uses: oras-project/setup-oras@v1
+
       - name: Install dagger
         run: |
           curl -fsSL https://dl.dagger.io/dagger/install.sh | sh
@@ -240,6 +242,8 @@ jobs:
           go-version-file: go.mod
           cache-dependency-path: "**/*.sum"
 
+      - uses: oras-project/setup-oras@v1
+
       - name: Install dagger
         run: |
           curl -fsSL https://dl.dagger.io/dagger/install.sh | sh
@@ -345,6 +349,8 @@ jobs:
           go-version-file: go.mod
           cache-dependency-path: "**/*.sum"
 
+      - uses: oras-project/setup-oras@v1
+
       - name: Install dagger
         run: |
           curl -fsSL https://dl.dagger.io/dagger/install.sh | sh

.github/workflows/release-prod.yaml

@@ -148,6 +148,8 @@ jobs:
           go-version-file: go.mod
           cache-dependency-path: "**/*.sum"
 
+      - uses: oras-project/setup-oras@v1
+
       - name: Download buildtools artifact
         uses: actions/download-artifact@v4
         with:

Makefile

@@ -18,11 +18,18 @@ K0S_BINARY_SOURCE_OVERRIDE =
 TROUBLESHOOT_VERSION = v0.117.0
 
 KOTS_VERSION = v$(shell awk '/^version/{print $$2}' pkg/addons/adminconsole/static/metadata.yaml | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+).*/\1/')
-# When updating KOTS_BINARY_URL_OVERRIDE, also update the KOTS_VERSION above or
-# scripts/ci-upload-binaries.sh may find the version in the cache and not upload the overridden binary.
+# If KOTS_BINARY_URL_OVERRIDE is set to a ttl.sh artifact, there's NO need to update the KOTS_VERSION above as it will be dynamically generated
 KOTS_BINARY_URL_OVERRIDE =
+# If KOTS_BINARY_FILE_OVERRIDE is set, there's NO need to update the KOTS_VERSION above as it will be dynamically generated
 # For dev env, build the kots binary in the kots repo with "make kots-linux-arm64" and set this to "../kots/bin/kots"
 KOTS_BINARY_FILE_OVERRIDE =
+
+ifeq ($(findstring ttl.sh,$(KOTS_BINARY_URL_OVERRIDE)),ttl.sh)
+KOTS_VERSION = kots-dev-$(shell oras manifest fetch $(KOTS_BINARY_URL_OVERRIDE) | jq '.layers[0].digest' | cut -c9-15)
+else ifdef KOTS_BINARY_FILE_OVERRIDE 
+KOTS_VERSION = kots-dev-$(shell shasum -a 256 $(KOTS_BINARY_FILE_OVERRIDE) | cut -c1-8)
+endif
+
 # TODO: move this to a manifest file
 LOCAL_ARTIFACT_MIRROR_IMAGE ?= proxy.replicated.com/anonymous/replicated/embedded-cluster-local-artifact-mirror:$(VERSION)
 # These are used to override the binary urls in dev and e2e tests
@@ -38,10 +45,6 @@ else ifeq ($(K0S_VERSION),v1.28.14+k0s.0-ec.0)
 K0S_BINARY_SOURCE_OVERRIDE = https://tf-staging-embedded-cluster-bin.s3.amazonaws.com/custom-k0s-binaries/k0s-v1.28.14%2Bk0s.0-ec.0-$(ARCH)
 endif
 
-ifneq ($(KOTS_BINARY_FILE_OVERRIDE),)
-KOTS_VERSION = kots-dev-$(shell shasum -a 256 $(KOTS_BINARY_FILE_OVERRIDE) | cut -c1-8)
-endif
-
 LD_FLAGS = \
 	-X github.com/replicatedhq/embedded-cluster/pkg/versions.K0sVersion=$(K0S_VERSION) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/versions.Version=$(VERSION) \
@@ -173,7 +176,11 @@ output/bins/kubectl-kots-%:
 output/bins/kubectl-kots-override:
 	mkdir -p output/bins
 	mkdir -p output/tmp
-	curl --retry 5 --retry-all-errors -fL -o output/tmp/kots.tar.gz "$(KOTS_BINARY_URL_OVERRIDE)"
+	if [[ "$(KOTS_BINARY_URL_OVERRIDE)" == ttl.sh* ]]; then \
+		oras pull "$(KOTS_BINARY_URL_OVERRIDE)" --output output/tmp ; \
+	else \
+		curl --retry 5 --retry-all-errors -fL -o output/tmp/kots.tar.gz "$(KOTS_BINARY_URL_OVERRIDE)" ; \
+	fi
 	tar -xzf output/tmp/kots.tar.gz -C output/tmp
 	mv output/tmp/kots $@
 	touch $@

README.md

@@ -23,6 +23,7 @@ Additionally, it includes a Registry when deployed in air gap mode, and SeaweedF
 - Dagger
 - shasum
 - jq
+- oras
 - Kubectl (for integration tests)
 - Kind (for integration tests)
 

e2e/kots-release-install-stable/nginx-app-helm-v1beta2.yaml

@@ -10,7 +10,10 @@ spec:
   values:
     server:
       image:
-        repository: repl{{ HasLocalRegistry | ternary LocalRegistryHost "ec-e2e-proxy.testcluster.net" }}/repl{{ HasLocalRegistry | ternary LocalRegistryNamespace "proxy/embedded-cluster-smoke-test-staging-app/us-east4-docker.pkg.dev/replicated-qa/ec-smoke-test" }}/nginx
+        # TODO: revert repo to "ec-e2e-proxy.testcluster.net" once EC 2.2.0 is released
+        # as custom domains have been disabled on the channel and enabled in the EC config
+        # but domains in the EC config are only supported in EC 2.2.0 and above
+        repository: repl{{ HasLocalRegistry | ternary LocalRegistryHost "proxy.staging.replicated.com" }}/repl{{ HasLocalRegistry | ternary LocalRegistryNamespace "proxy/embedded-cluster-smoke-test-staging-app/us-east4-docker.pkg.dev/replicated-qa/ec-smoke-test" }}/nginx
       service:
         type: ClusterIP
         port: 80
@@ -20,15 +23,21 @@ spec:
     client:
       enabled: true
       image:
-        repository: repl{{ HasLocalRegistry | ternary LocalRegistryHost "ec-e2e-proxy.testcluster.net" }}/repl{{ HasLocalRegistry | ternary LocalRegistryNamespace "proxy/embedded-cluster-smoke-test-staging-app/us-east4-docker.pkg.dev/replicated-qa/ec-smoke-test" }}/curl
+        # TODO: revert repo to "ec-e2e-proxy.testcluster.net" once EC 2.2.0 is released
+        # as custom domains have been disabled on the channel and enabled in the EC config
+        # but domains in the EC config are only supported in EC 2.2.0 and above
+        repository: repl{{ HasLocalRegistry | ternary LocalRegistryHost "proxy.staging.replicated.com" }}/repl{{ HasLocalRegistry | ternary LocalRegistryNamespace "proxy/embedded-cluster-smoke-test-staging-app/us-east4-docker.pkg.dev/replicated-qa/ec-smoke-test" }}/curl
       replicaCount: 1
       intervalSeconds: 60
       imagePullSecrets:
         - name: '{{repl ImagePullSecretName }}'
     replicated:
       enabled: true
       image:
-        registry: repl{{ HasLocalRegistry | ternary LocalRegistryHost "ec-e2e-proxy.testcluster.net" }}
+        # TODO: revert repo to "ec-e2e-proxy.testcluster.net" once EC 2.2.0 is released
+        # as custom domains have been disabled on the channel and enabled in the EC config
+        # but domains in the EC config are only supported in EC 2.2.0 and above
+        registry: repl{{ HasLocalRegistry | ternary LocalRegistryHost "proxy.staging.replicated.com" }}
         repository: repl{{ HasLocalRegistry | ternary LocalRegistryNamespace "proxy/embedded-cluster-smoke-test-staging-app/replicated" }}/replicated-sdk
       imagePullSecrets:
         - name: '{{repl ImagePullSecretName }}'

pkg/addons/adminconsole/static/metadata.yaml

@@ -5,26 +5,26 @@
 # $ make buildtools
 # $ output/bin/buildtools update addon <addon name>
 #
-version: 1.124.7
+version: 1.124.9
 location: oci://proxy.replicated.com/anonymous/registry.replicated.com/library/admin-console
 images:
     kotsadm:
         repo: proxy.replicated.com/anonymous/kotsadm/kotsadm
         tag:
-            amd64: v1.124.7-amd64@sha256:e4370d7ad72cdae4b970a186bb72c059c234b24c32981188b1f7bbe8cc3fbd0a
-            arm64: v1.124.7-arm64@sha256:fb7a46a24dec8cc5426e80a97f6f94ec883ac74a907441c4a5909ea3a28dfe15
+            amd64: v1.124.9-amd64@sha256:de29d4006e545bec78f1109f1d285bb8f7a67a0b88c6ef3620bbc130a278be0b
+            arm64: v1.124.9-arm64@sha256:e8558f7a87d241fa54439265d8832b2e48083c2bebf2f1c1044d85a0569e53ca
     kotsadm-migrations:
         repo: proxy.replicated.com/anonymous/kotsadm/kotsadm-migrations
         tag:
-            amd64: v1.124.7-amd64@sha256:b9cfff23e3febc76f9f53b68f8bcc2dea6ffe1073c2f4802790375c8548b3d21
-            arm64: v1.124.7-arm64@sha256:4083d493bfc3720a5b1946cc0e160a20931f73d0111101042efb95af4f73d561
+            amd64: v1.124.9-amd64@sha256:6aca1248729c3eb9d019b4003432968f982b7ebc8b27e213cb1d650a451cd03f
+            arm64: v1.124.9-arm64@sha256:6c970692485803d8eb4b697671c8ed5fad712e8b8c1a81b151331cc23d78fd06
     kurl-proxy:
         repo: proxy.replicated.com/anonymous/kotsadm/kurl-proxy
         tag:
-            amd64: v1.124.7-amd64@sha256:3803e23ab306b4a223ebf3717ed496e0db0cf39acce1e3d6e7b5e45ece7c3d7e
-            arm64: v1.124.7-arm64@sha256:9c1ead5f4c06876117fa1330df741c9c8f86da4b1ed44d137e07fefd72bcea41
+            amd64: v1.124.9-amd64@sha256:5c74ec100c2890399392d8a806fc32fb199cc0ac71a5da0992a8a67c5d69d005
+            arm64: v1.124.9-arm64@sha256:a7394a733f3cb545725bf3c060b57dc7771e5ba0f615a34ef0829e06d5d33838
     rqlite:
         repo: proxy.replicated.com/anonymous/kotsadm/rqlite
         tag:
-            amd64: 8.36.11-r0-amd64@sha256:a6cd95f6e7c80f35738ffd3f8eeea651c493c8d43553a04f1dd35fcea39887fc
-            arm64: 8.36.11-r0-arm64@sha256:509862e3feed4f131b20c29a71a6ba0928149ffcc6aea9c41e179d92df231aac
+            amd64: 8.36.14-r0-amd64@sha256:61ad2fa30ec52eaeb6c5599a325a6ee6e59de45db8b0133716fc6f24101d4c54
+            arm64: 8.36.14-r0-arm64@sha256:94ac76ae6626b28f0e72d7b8d794939ed14c044321824a37578302e0a21bad30

scripts/ci-upload-binaries.sh

@@ -114,7 +114,12 @@ function kotsbin() {
 
     if [ -n "${kots_url_override}" ]; then
         echo "KOTS_BINARY_URL_OVERRIDE is set to '${kots_url_override}', using that source"
-        curl --retry 5 --retry-all-errors -fL -o "build/kots_linux_${ARCH}.tar.gz" "${kots_url_override}"
+        if [[ "${kots_url_override}" == ttl.sh/* ]]; then
+            oras pull "${kots_url_override}" --output "build"
+            mv build/kots.tar.gz "build/kots_linux_${ARCH}.tar.gz"
+        else
+            curl --retry 5 --retry-all-errors -fL -o "build/kots_linux_${ARCH}.tar.gz" "${kots_url_override}"
+        fi
     elif [ -n "${kots_file_override}" ]; then
         echo "KOTS_BINARY_FILE_OVERRIDE is set to '${kots_file_override}', using that source"
         tar -czvf "build/kots_linux_${ARCH}.tar.gz" -C $(dirname "${kots_file_override}") $(basename "${kots_file_override}")