Revert "Support arm64 builds (carvel-dev#85)"

This reverts commit 9e4aaee.
neil-hickey · Jul 7, 2022 · 5a1341a · 5a1341a
1 parent 3f27cca
commit 5a1341a
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 21 deletions.
diff --git a/.github/workflows/kind-action.yml b/.github/workflows/kind-action.yml
@@ -37,7 +37,7 @@ jobs:
           only: ytt, kapp, kbld
           ytt: v0.40.1
           kapp: v0.47.0
-          kbld: v0.34.0
+          kbld: v0.33.0
       # Run benchmark with `go test -bench` and stores the output to a file
       - name: Install sg and run e2e tests on kind
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,7 +24,7 @@ jobs:
           only: ytt, kapp, kbld, imgpkg
           ytt: v0.40.1
           kapp: v0.47.0
-          kbld: v0.34.0
+          kbld: v0.33.0
           imgpkg: v0.29.0
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2

diff --git a/.github/workflows/test-gh.yml b/.github/workflows/test-gh.yml
@@ -32,7 +32,7 @@ jobs:
         only: ytt, kapp, kbld
         ytt: v0.40.1
         kapp: v0.47.0
-        kbld: v0.34.0
+        kbld: v0.33.0
     - name: Run Tests
       run: |
         set -e -x

diff --git a/Dockerfile b/Dockerfile
@@ -1,11 +1,11 @@
-FROM --platform=$BUILDPLATFORM golang:1.18.3 AS deps
+FROM golang:1.18.3 AS deps
 
-ARG TARGETOS TARGETARCH SGCTRL_VER=development
+ARG SGCTRL_VER=development
 WORKDIR /workspace
 
 COPY . .
 # helpful ldflags reference: https://www.digitalocean.com/community/tutorials/using-ldflags-to-set-version-information-for-go-applications
-RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOSARCH=${TARGETARCH} go build -mod=vendor -ldflags="-X 'main.Version=$SGCTRL_VER' -buildid=" -trimpath -o controller ./cmd/controller/...
+RUN CGO_ENABLED=0 GOOS=linux go build -mod=vendor -ldflags="-X 'main.Version=$SGCTRL_VER' -buildid=" -trimpath -o controller ./cmd/controller/...
 
 # --- run ---
 FROM scratch

diff --git a/config/dev/build.yml b/config/dev/build.yml
@@ -7,7 +7,7 @@ sources:
 - image: secretgen-controller
   path: .
   docker:
-    buildx:
+    build:
       #@ if data.values.dev.rapid_deploy:
       pull: false
       noCache: false
@@ -17,10 +17,7 @@ sources:
       #! Always rebuild image
       pull: true
       noCache: true
-      rawOptions:
-      - #@ "--build-arg=SGCTRL_VER="+data.values.dev.version
-      #@ if/end data.values.dev.platform != "":
-      - #@ "--platform="+data.values.dev.platform
+      rawOptions: #@ ["--build-arg", "SGCTRL_VER="+data.values.dev.version]
       #@ end
 
 #@ if/end data.values.dev.push_images:

diff --git a/config/dev/values-schema.yml b/config/dev/values-schema.yml
@@ -12,5 +12,3 @@ dev:
   image_repo: docker.io/k14s/secretgen-controller-test
   #@schema/desc "Development version"
   version: develop
-  #@schema/desc "Comma separated list of supported architectures"
-  platform: ""
diff --git a/config/release/build.yml b/config/release/build.yml
@@ -7,14 +7,11 @@ sources:
 - image: secretgen-controller
   path: .
   docker:
-    buildx:
+    build:
       #! Always rebuild image
       pull: true
       noCache: true
-      rawOptions:
-      - #@ "--build-arg=SGCTRL_VER="+data.values.dev.version
-      #@ if/end data.values.dev.platform != "":
-      - #@ "--platform="+data.values.dev.platform
+      rawOptions: #@ ["--build-arg", "SGCTRL_VER="+data.values.dev.version]
 ---
 apiVersion: kbld.k14s.io/v1alpha1
 kind: ImageDestinations

diff --git a/config/release/values-schema.yml b/config/release/values-schema.yml
@@ -7,6 +7,4 @@ dev:
   #@schema/desc "Location of secretgen-controller image"
   image_repo: ghcr.io/neil-hickey/carvel-secretgen-controller
   #@schema/desc "Development version"
-  version: develop
-  #@schema/desc "Comma separated list of supported architectures"
-  platform: "linux/amd64,linux/arm64"
+  version: develop