goreleaser changes

Signed-off-by: Jyoti Mahapatra <jyotima@amazon.com>
kubernetes-sigs · Feb 10, 2022 · adf77b7 · adf77b7
1 parent 83bb933
commit adf77b7
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 250 deletions.
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -21,130 +21,28 @@ builds:
       - "-s -w -X pkg.Version={{.Version}} -X pkg.CommitID={{.Commit}} -buildid=''"
 
 dockers:
-  - ids:
-     - aws-iam-authenticator
-    use: buildx
+  - use: buildx
     goarch: amd64
-    dockerfile: Dockerfile.scratch
+    goos: linux
     build_flag_templates:
-      - "--platform=linux/amd64"
+    - "--platform=linux/amd64"
+    dockerfile: Dockerfile.goreleaser
     image_templates:
-     - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-scratch-amd64"
      - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-amd64"
-  - ids:
-      - aws-iam-authenticator
-    use: buildx
+  - use: buildx
     goarch: arm64
-    dockerfile: Dockerfile.scratch
+    goos: linux
     build_flag_templates:
-      - "--platform=linux/arm64"
+    - "--platform=linux/arm64"
+    dockerfile: Dockerfile.goreleaser
     image_templates:
-      - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-scratch-arm64"
-      - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-arm64"
-  - ids:
-     - aws-iam-authenticator
-    dockerfile: Dockerfile.alpine-3.6
-    image_templates:
-     - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-alpine-3.6"
-  - ids:
-     - aws-iam-authenticator
-    use: buildx
-    goarch: amd64
-    dockerfile: Dockerfile.alpine-3.7
-    build_flag_templates:
-      - "--platform=linux/amd64"
-    image_templates:
-     - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-alpine-3.7-amd64"
-     - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-alpine-amd64"
-  - ids:
-      - aws-iam-authenticator
-    use: buildx
-    goarch: arm64
-    dockerfile: Dockerfile.alpine-3.7
-    build_flag_templates:
-      - "--platform=linux/arm64"
-    image_templates:
-      - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-alpine-3.7-arm64"
-      - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-alpine-arm64"
-  - ids:
-     - aws-iam-authenticator
-    dockerfile: Dockerfile.debian-jessie
-    image_templates:
-     - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-debian-jessie"
-  - ids:
-     - aws-iam-authenticator
-    use: buildx
-    goarch: amd64
-    dockerfile: Dockerfile.debian-stretch
-    build_flag_templates:
-      - "--platform=linux/amd64"
-    image_templates:
-     - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-debian-stretch-amd64"
-     - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-debian-amd64"
-  - ids:
-      - aws-iam-authenticator
-    use: buildx
-    goarch: arm64
-    dockerfile: Dockerfile.debian-stretch
-    build_flag_templates:
-      - "--platform=linux/arm64"
-    image_templates:
-      - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-debian-stretch-3.7-arm64"
-      - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-debian-arm64"
-  - ids:
-     - aws-iam-authenticator
-    use: buildx
-    goarch: amd64
-    dockerfile: Dockerfile.amazonlinux-2
-    build_flag_templates:
-      - "--platform=linux/amd64"
-    image_templates:
-     - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-amazonlinux-2-amd64"
-     - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-amazonlinux-amd64"
-  - ids:
-      - aws-iam-authenticator
-    use: buildx
-    goarch: arm64
-    dockerfile: Dockerfile.amazonlinux-2
-    build_flag_templates:
-      - "--platform=linux/arm64"
-    image_templates:
-      - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-amazonlinux-2-arm64"
-      - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-amazonlinux-arm64"
+     - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-arm64"
 
 docker_manifests:
-  - name_template: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-scratch"
-    image_templates:
-      - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-scratch-amd64"
-      - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-scratch-arm64"
   - name_template: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}"
     image_templates:
       - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-amd64"
       - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-arm64"
-  - name_template: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-alpine-3.7"
-    image_templates:
-      - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-alpine-3.7-amd64"
-      - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-alpine-3.7-arm64"
-  - name_template: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-alpine"
-    image_templates:
-      - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-alpine-amd64"
-      - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-alpine-arm64"
-  - name_template: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-debian-stretch"
-    image_templates:
-      - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-debian-stretch-amd64"
-      - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-debian-stretch-arm64"
-  - name_template: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-debian"
-    image_templates:
-      - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-debian-amd64"
-      - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-debian-arm64"
-  - name_template: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-amazonlinux-2"
-    image_templates:
-      - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-amazonlinux-2-amd64"
-      - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-amazonlinux-2-arm64"
-  - name_template: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-amazonlinux"
-    image_templates:
-      - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-amazonlinux-amd64"
-      - "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-amazonlinux-arm64"
 
 snapshot:
   name_template: "git-{{.ShortCommit}}"

diff --git a/Dockerfile.alpine-3.7 b/Dockerfile.alpine-3.7
diff --git a/Dockerfile.amazonlinux-2 b/Dockerfile.amazonlinux-2
diff --git a/Dockerfile.debian-jessie b/Dockerfile.debian-jessie
diff --git a/Dockerfile.debian-stretch b/Dockerfile.debian-stretch
diff --git a/Dockerfile.alpine-3.6 → Dockerfile.goreleaser b/Dockerfile.alpine-3.6 → Dockerfile.goreleaser
@@ -1,4 +1,4 @@
-# Copyright 2017 by the contributors.
+# Copyright 2022 The Kubernetes Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,11 +11,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+ARG image=public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-nonroot:2021-12-01-1638322424
 
-FROM alpine:3.6
-RUN adduser -D -u 10000 aws-iam-authenticator
-RUN apk add --update ca-certificates
-COPY aws-iam-authenticator /
-RUN chown aws-iam-authenticator /aws-iam-authenticator
-USER aws-iam-authenticator
+FROM public.ecr.aws/eks-distro/kubernetes/go-runner:v0.9.0-eks-1-21-4 as go-runner
+
+FROM $image
+COPY --from=go-runner /usr/local/bin/go-runner /usr/local/bin/go-runner
+COPY aws-iam-authenticator /aws-iam-authenticator
 ENTRYPOINT ["/aws-iam-authenticator"]
diff --git a/Dockerfile.scratch b/Dockerfile.scratch
diff --git a/Makefile b/Makefile
@@ -81,7 +81,6 @@ build-all-bins:
 .PHONY: image
 image:
 	docker buildx build --output=type=registry --platform linux/amd64,linux/arm64 \
-		--build-arg image=public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-nonroot:2021-08-26-1630012071 \
 		--tag aws-iam-authenticator:$(VERSION)_$(GIT_COMMIT)_$(BUILD_DATE_STRIPPED) .
 
 .PHONY: goreleaser