chore: Support docker manifests to release for arm64

furiko-io · Dec 5, 2022 · e2d0ed7 · e2d0ed7
1 parent 5ad6ccc
commit e2d0ed7
Show file tree

Hide file tree

Showing 5 changed files with 104 additions and 24 deletions.
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -14,6 +14,7 @@ builds:
       - linux
     goarch:
       - amd64
+      - arm64
   - id: execution-webhook
     main: ./cmd/execution-webhook
     binary: execution-webhook
@@ -23,6 +24,7 @@ builds:
       - linux
     goarch:
       - amd64
+      - arm64
   - id: furiko-cli
     main: ./cmd/furiko-cli
     binary: furiko
@@ -61,26 +63,101 @@ changelog:
 
 # Build Docker images for each entrypoint separately.
 dockers:
-  - id: execution-controller
+  - goos: linux
+    goarch: amd64
     use: buildx
     ids:
       - execution-controller
     image_templates:
-      - "furikoio/execution-controller:{{ if (index .Env \"IMAGE_TAG\") }}{{ index .Env \"IMAGE_TAG\" }}{{ else if .IsSnapshot }}v{{ .Version }}{{ else }}{{ .Tag }}{{ end }}"
-      - "furikoio/execution-controller:latest"
+      - "furikoio/execution-controller:{{ if (index .Env \"IMAGE_TAG\") }}{{ index .Env \"IMAGE_TAG\" }}{{ else if .IsSnapshot }}v{{ .Version }}{{ else }}{{ .Tag }}{{ end }}-amd64"
+      - "furikoio/execution-controller:latest-amd64"
     build_flag_templates:
       - "--platform=linux/amd64"
       - "--target=execution-controller"
-  - id: execution-webhook
+      - --label=org.opencontainers.image.title={{ .ProjectName }}
+      - --label=org.opencontainers.image.description={{ .ProjectName }}
+      - --label=org.opencontainers.image.url=https://github.com/furiko-io/{{ .ProjectName }}
+      - --label=org.opencontainers.image.source=https://github.com/furiko-io/{{ .ProjectName }}
+      - --label=org.opencontainers.image.version={{ .Version }}
+      - --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }}
+      - --label=org.opencontainers.image.revision={{ .FullCommit }}
+      - --label=org.opencontainers.image.licenses=Apache-2.0
+  - goos: linux
+    goarch: arm64
+    use: buildx
+    ids:
+      - execution-controller
+    image_templates:
+      - "furikoio/execution-controller:{{ if (index .Env \"IMAGE_TAG\") }}{{ index .Env \"IMAGE_TAG\" }}{{ else if .IsSnapshot }}v{{ .Version }}{{ else }}{{ .Tag }}{{ end }}-arm64v8"
+      - "furikoio/execution-controller:latest-arm64v8"
+    build_flag_templates:
+      - "--platform=linux/arm64/v8"
+      - "--target=execution-controller"
+      - --label=org.opencontainers.image.title={{ .ProjectName }}
+      - --label=org.opencontainers.image.description={{ .ProjectName }}
+      - --label=org.opencontainers.image.url=https://github.com/furiko-io/{{ .ProjectName }}
+      - --label=org.opencontainers.image.source=https://github.com/furiko-io/{{ .ProjectName }}
+      - --label=org.opencontainers.image.version={{ .Version }}
+      - --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }}
+      - --label=org.opencontainers.image.revision={{ .FullCommit }}
+      - --label=org.opencontainers.image.licenses=Apache-2.0
+  - goos: linux
+    goarch: amd64
     use: buildx
     ids:
       - execution-webhook
     image_templates:
-      - "furikoio/execution-webhook:{{ if (index .Env \"IMAGE_TAG\") }}{{ index .Env \"IMAGE_TAG\" }}{{ else if .IsSnapshot }}v{{ .Version }}{{ else }}{{ .Tag }}{{ end }}"
-      - "furikoio/execution-webhook:latest"
+      - "furikoio/execution-webhook:{{ if (index .Env \"IMAGE_TAG\") }}{{ index .Env \"IMAGE_TAG\" }}{{ else if .IsSnapshot }}v{{ .Version }}{{ else }}{{ .Tag }}{{ end }}-amd64"
+      - "furikoio/execution-webhook:latest-amd64"
     build_flag_templates:
       - "--platform=linux/amd64"
       - "--target=execution-webhook"
+      - --label=org.opencontainers.image.title={{ .ProjectName }}
+      - --label=org.opencontainers.image.description={{ .ProjectName }}
+      - --label=org.opencontainers.image.url=https://github.com/furiko-io/{{ .ProjectName }}
+      - --label=org.opencontainers.image.source=https://github.com/furiko-io/{{ .ProjectName }}
+      - --label=org.opencontainers.image.version={{ .Version }}
+      - --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }}
+      - --label=org.opencontainers.image.revision={{ .FullCommit }}
+      - --label=org.opencontainers.image.licenses=Apache-2.0
+  - goos: linux
+    goarch: arm64
+    use: buildx
+    ids:
+      - execution-webhook
+    image_templates:
+      - "furikoio/execution-webhook:{{ if (index .Env \"IMAGE_TAG\") }}{{ index .Env \"IMAGE_TAG\" }}{{ else if .IsSnapshot }}v{{ .Version }}{{ else }}{{ .Tag }}{{ end }}-arm64v8"
+      - "furikoio/execution-webhook:latest-arm64v8"
+    build_flag_templates:
+      - "--platform=linux/arm64/v8"
+      - "--target=execution-webhook"
+      - --label=org.opencontainers.image.title={{ .ProjectName }}
+      - --label=org.opencontainers.image.description={{ .ProjectName }}
+      - --label=org.opencontainers.image.url=https://github.com/furiko-io/{{ .ProjectName }}
+      - --label=org.opencontainers.image.source=https://github.com/furiko-io/{{ .ProjectName }}
+      - --label=org.opencontainers.image.version={{ .Version }}
+      - --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }}
+      - --label=org.opencontainers.image.revision={{ .FullCommit }}
+      - --label=org.opencontainers.image.licenses=Apache-2.0
+
+# Support Docker manifests for multi-arch images.
+docker_manifests:
+- name_template: "furikoio/execution-controller:{{ if (index .Env \"IMAGE_TAG\") }}{{ index .Env \"IMAGE_TAG\" }}{{ else if .IsSnapshot }}v{{ .Version }}{{ else }}{{ .Tag }}{{ end }}"
+  image_templates:
+  - "furikoio/execution-controller:{{ if (index .Env \"IMAGE_TAG\") }}{{ index .Env \"IMAGE_TAG\" }}{{ else if .IsSnapshot }}v{{ .Version }}{{ else }}{{ .Tag }}{{ end }}-amd64"
+  - "furikoio/execution-controller:{{ if (index .Env \"IMAGE_TAG\") }}{{ index .Env \"IMAGE_TAG\" }}{{ else if .IsSnapshot }}v{{ .Version }}{{ else }}{{ .Tag }}{{ end }}-arm64v8"
+- name_template: "furikoio/execution-controller:latest"
+  image_templates:
+  - "furikoio/execution-controller:latest-amd64"
+  - "furikoio/execution-controller:latest-arm64v8"
+- name_template: "furikoio/execution-webhook:{{ if (index .Env \"IMAGE_TAG\") }}{{ index .Env \"IMAGE_TAG\" }}{{ else if .IsSnapshot }}v{{ .Version }}{{ else }}{{ .Tag }}{{ end }}"
+  image_templates:
+  - "furikoio/execution-webhook:{{ if (index .Env \"IMAGE_TAG\") }}{{ index .Env \"IMAGE_TAG\" }}{{ else if .IsSnapshot }}v{{ .Version }}{{ else }}{{ .Tag }}{{ end }}-amd64"
+  - "furikoio/execution-webhook:{{ if (index .Env \"IMAGE_TAG\") }}{{ index .Env \"IMAGE_TAG\" }}{{ else if .IsSnapshot }}v{{ .Version }}{{ else }}{{ .Tag }}{{ end }}-arm64v8"
+- name_template: "furikoio/execution-webhook:latest"
+  image_templates:
+  - "furikoio/execution-webhook:latest-amd64"
+  - "furikoio/execution-webhook:latest-arm64v8"
 
 # Prepare release assets.
 release:

diff --git a/pkg/cli/cmd/common.go b/pkg/cli/cmd/common.go
@@ -60,7 +60,8 @@ func NewContext(_ *cobra.Command) (controllercontext.Context, error) {
 
 // PrerunWithKubeconfig is a pre-run function that will set up the common context when kubeconfig is needed.
 // TODO(irvinlim): We currently reuse controllercontext, but most of it is unusable for CLI interfaces.
-//  We should create a new common context as needed.
+//
+//	We should create a new common context as needed.
 func PrerunWithKubeconfig(cmd *cobra.Command, _ []string) error {
 	// Already set up previously.
 	if ctrlContext != nil {
@@ -94,8 +95,9 @@ func GetNamespace(cmd *cobra.Command) (string, error) {
 
 // GetDynamicConfig loads the dynamic config by name and unmarshals to out.
 // TODO(irvinlim): If the current user does not have permissions to read the
-//  ConfigMap, or the ConfigMap uses a different name/namespace, we should
-//  gracefully handle this case.
+//
+//	ConfigMap, or the ConfigMap uses a different name/namespace, we should
+//	gracefully handle this case.
 func GetDynamicConfig(ctx context.Context, cmd *cobra.Command, name configv1alpha1.ConfigName, out interface{}) error {
 	cfgNamespace, err := cmd.Flags().GetString("dynamic-config-namespace")
 	if err != nil {

diff --git a/pkg/generated/clientset/versioned/fake/register.go b/pkg/generated/clientset/versioned/fake/register.go
diff --git a/pkg/generated/clientset/versioned/scheme/register.go b/pkg/generated/clientset/versioned/scheme/register.go
diff --git a/pkg/runtime/testing/fixture.go b/pkg/runtime/testing/fixture.go
@@ -41,7 +41,8 @@ func InitFixtures(ctx context.Context, client controllercontext.Clientsets, fixt
 
 // InitFixture initializes a single fixture against a clientset.
 // TODO(irvinlim): Currently we just hardcode a list of types to be initialized,
-//  we could probably use reflection instead.
+//
+//	we could probably use reflection instead.
 func InitFixture(ctx context.Context, client controllercontext.Clientsets, fixture runtime.Object) error {
 	var err error
 	switch f := fixture.(type) {