f

replicatedhq · Sep 8, 2024 · fd5e875 · fd5e875
1 parent 02f7fc7
commit fd5e875
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -134,6 +134,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.DEV_EMBEDDED_CLUSTER_UPLOAD_IAM_SECRET }}
           AWS_REGION: "us-east-1"
           USE_CHAINGUARD: "1"
+          SKIP_S3_UPLOAD: "0"
           DO_RELEASE: "0"
         run: |
           export K0S_VERSION=$(make print-K0S_VERSION)
@@ -197,6 +198,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.DEV_EMBEDDED_CLUSTER_UPLOAD_IAM_SECRET }}
           AWS_REGION: "us-east-1"
           USE_CHAINGUARD: "1"
+          SKIP_S3_UPLOAD: "0"
           DO_RELEASE: "0"
           MANGLE_METADATA: "1"
         run: |
@@ -260,6 +262,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.DEV_EMBEDDED_CLUSTER_UPLOAD_IAM_SECRET }}
           AWS_REGION: "us-east-1"
           USE_CHAINGUARD: "1"
+          SKIP_S3_UPLOAD: "0"
           DO_RELEASE: "0"
           MANGLE_METADATA: "1"
         run: |

diff --git a/Makefile b/Makefile
@@ -26,9 +26,9 @@ LD_FLAGS = \
 	-X github.com/replicatedhq/embedded-cluster/pkg/versions.Version=$(VERSION) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/versions.TroubleshootVersion=$(TROUBLESHOOT_VERSION) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/versions.LocalArtifactMirrorImage=$(LOCAL_ARTIFACT_MIRROR_IMAGE) \
-	-X github.com/replicatedhq/embedded-cluster/cmd/embedded-cluster/metadata.K0sBinaryURLOverride=$(METADATA_K0S_BINARY_URL_OVERRIDE) \
-	-X github.com/replicatedhq/embedded-cluster/cmd/embedded-cluster/metadata.KOTSBinaryURLOverride=$(METADATA_KOTS_BINARY_URL_OVERRIDE) \
-	-X github.com/replicatedhq/embedded-cluster/cmd/embedded-cluster/metadata.OperatorBinaryURLOverride=$(METADATA_OPERATOR_BINARY_URL_OVERRIDE) \
+	-X github.com/replicatedhq/embedded-cluster/cmd/embedded-cluster/main.K0sBinaryURLOverride=$(METADATA_K0S_BINARY_URL_OVERRIDE) \
+	-X github.com/replicatedhq/embedded-cluster/cmd/embedded-cluster/main.KOTSBinaryURLOverride=$(METADATA_KOTS_BINARY_URL_OVERRIDE) \
+	-X github.com/replicatedhq/embedded-cluster/cmd/embedded-cluster/main.OperatorBinaryURLOverride=$(METADATA_OPERATOR_BINARY_URL_OVERRIDE) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.ChartRepoOverride=$(ADMIN_CONSOLE_CHART_REPO_OVERRIDE) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.KurlProxyImageOverride=$(ADMIN_CONSOLE_KURL_PROXY_IMAGE_OVERRIDE) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.KotsVersion=$(KOTS_VERSION) \

diff --git a/scripts/dev-build.sh b/scripts/dev-build.sh
@@ -11,6 +11,8 @@ APP_CHANNEL=${APP_CHANNEL:-Unstable}
 RELEASE_YAML_DIR=${RELEASE_YAML_DIR:-e2e/kots-release-install}
 REPLICATED_API_ORIGIN=${REPLICATED_API_ORIGIN:-https://api.staging.replicated.com/vendor}
 
+SKIP_S3_UPLOAD=${SKIP_S3_UPLOAD:-1}
+
 ARCH=${ARCH:-amd64}
 USE_CHAINGUARD=${USE_CHAINGUARD:-0}
 
@@ -41,7 +43,9 @@ function build() {
     ./scripts/ci-build-deps.sh
     ./scripts/ci-build.sh
     ./scripts/ci-embed-release.sh
-    ./scripts/ci-cache-files.sh
+    if [ "$SKIP_S3_UPLOAD" != "1" ]; then
+        ./scripts/ci-cache-files.sh
+    fi
     if [ "$DO_RELEASE" == "1" ]; then
         ./scripts/ci-release-app.sh
     fi