chore(ci): Fix goreleaser (#141)

Author: irvinlim

.dockerignore

@@ -3,16 +3,17 @@
 .gitignore
 .github/
 .local/
-bin/
+/bin/
 testbin/
-build/
-dist/
-yamls/
-config/
-docs/
-hack/
-Makefile
-LICENSE
+/build/
+/dist/
+/dist-*/
+/config/
+/docs/
+/examples/
+/hack/
+/Makefile
+/LICENSE
 *.md
 *.yaml
 *.yml

.github/workflows/release.yaml

@@ -51,10 +51,10 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Run goreleaser
-        uses: goreleaser/goreleaser-action@v2
+        uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser
-          version: latest
+          version: "~> v2"
           args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -30,6 +30,6 @@ testbin/*
 .local
 
 # Build output
-build/
-dist/
-yamls/
+/build/
+/dist/
+/dist-*/

.goreleaser.yaml

@@ -1,3 +1,5 @@
+version: 2
+
 # Package the YAML manifests.
 before:
   hooks:
@@ -62,14 +64,15 @@ archives:
   - id: furiko-cli
     builds:
       - furiko-cli
-    format: binary
+    formats:
+      - binary
     name_template: >-
       {{ .Binary }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}_{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}
 
 checksum:
   name_template: 'checksums.txt'
 snapshot:
-  name_template: "{{ incpatch .Version }}-next"
+  version_template: "{{ incpatch .Version }}-next"
 changelog:
   use: github-native
 
@@ -245,4 +248,4 @@ release:
   draft: true
   extra_files:
     # Add all YAML manifests to release as well
-    - glob: ./yamls/*.yaml
+    - glob: ./dist-yamls/*.yaml

Makefile

@@ -135,11 +135,11 @@ install-furiko-cli: ## Install furiko-cli to PATH.
 ##@ YAML Configuration
 
 ## Location to write YAMLs to
-YAML_DEST ?= $(shell pwd)/yamls
+YAML_DEST ?= $(shell pwd)/dist-yamls
 $(YAML_DEST): ## Ensure that the directory exists
 	mkdir -p $(YAML_DEST)
 
-KUSTOMIZE_DEST ?= $(shell pwd)/dist/kustomize
+KUSTOMIZE_DEST ?= $(shell pwd)/dist-kustomize
 $(KUSTOMIZE_DEST):
 	mkdir -p $(KUSTOMIZE_DEST)
 
@@ -148,7 +148,7 @@ yaml: yaml-execution ## Build kustomize configs. Outputs to dist folder.
 
 .PHONY: yaml-execution
 yaml-execution: manifests kustomize $(YAML_DEST) $(KUSTOMIZE_DEST) ## Build furiko-execution.yaml with Kustomize.
-	DEST_DIR=$(KUSTOMIZE_DEST) ./hack/generate-kustomization.sh "$(IMAGE_NAME_PREFIX)" "$(IMAGE_TAG)"
+	DEST_DIR=$(KUSTOMIZE_DEST) BASE_CONFIG=../config/default ./hack/generate-kustomization.sh "$(IMAGE_NAME_PREFIX)" "$(IMAGE_TAG)"
 	$(KUSTOMIZE) build $(KUSTOMIZE_DEST) -o $(YAML_DEST)/furiko-execution.yaml
 
 .PHONY: manifests

config/execution/controller/deployment.yaml

@@ -50,11 +50,11 @@ spec:
               subPath: config.yaml
           resources:
             limits:
-              cpu: 4
-              memory: 2Gi
+              cpu: "4"
+              memory: "2Gi"
             requests:
-              cpu: 500m
-              memory: 512Mi
+              cpu: "500m"
+              memory: "512Mi"
         - name: kube-rbac-proxy
           image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
           args:
@@ -68,11 +68,11 @@ spec:
               name: https
           resources:
             limits:
-              cpu: 500m
-              memory: 128Mi
+              cpu: "500m"
+              memory: "128Mi"
             requests:
-              cpu: 5m
-              memory: 64Mi
+              cpu: "5m"
+              memory: "64Mi"
       volumes:
         - name: controller-config
           configMap:

config/execution/webhook/deployment.yaml

@@ -53,11 +53,11 @@ spec:
               readOnly: true
           resources:
             limits:
-              cpu: 4
-              memory: 2Gi
+              cpu: "4"
+              memory: "2Gi"
             requests:
-              cpu: 500m
-              memory: 512Mi
+              cpu: "500m"
+              memory: "512Mi"
         - name: kube-rbac-proxy
           image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
           args:
@@ -74,11 +74,11 @@ spec:
               protocol: TCP
           resources:
             limits:
-              cpu: 500m
-              memory: 128Mi
+              cpu: "500m"
+              memory: "128Mi"
             requests:
-              cpu: 5m
-              memory: 64Mi
+              cpu: "5m"
+              memory: "64Mi"
       volumes:
         - name: webhook-config
           configMap:

config/execution/webhook/webhook_certgen_job.yaml

@@ -24,11 +24,11 @@ spec:
             - "--secret-name=execution-webhook-certs"
           resources:
             requests:
-              cpu: 10m
-              memory: 64Mi
+              cpu: "10m"
+              memory: "64Mi"
             limits:
-              cpu: 500m
-              memory: 512Mi
+              cpu: "500m"
+              memory: "512Mi"
           securityContext:
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: true
@@ -47,11 +47,11 @@ spec:
             - "--webhook-name=furiko-execution-validating-webhook-configuration"
           resources:
             requests:
-              cpu: 10m
-              memory: 64Mi
+              cpu: "10m"
+              memory: "64Mi"
             limits:
-              cpu: 500m
-              memory: 512Mi
+              cpu: "500m"
+              memory: "512Mi"
           securityContext:
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: true
@@ -67,11 +67,11 @@ spec:
             - "--webhook-name=furiko-execution-mutating-webhook-configuration"
           resources:
             requests:
-              cpu: 10m
-              memory: 64Mi
+              cpu: "10m"
+              memory: "64Mi"
             limits:
-              cpu: 500m
-              memory: 512Mi
+              cpu: "500m"
+              memory: "512Mi"
           securityContext:
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: true

hack/generate-kustomization.sh

@@ -53,7 +53,7 @@ fi
 # Optional environment variables
 DEST_DIR="${DEST_DIR:-$(pwd)}"
 KUSTOMIZE="${KUSTOMIZE:-$(pwd)/bin/kustomize}"
-BASE_CONFIG="${BASE_CONFIG:-$(realpath --relative-to="${DEST_DIR}" "$(pwd)/config/default")}" # NOTE: Cannot be absolute, otherwise kustomize will complain
+BASE_CONFIG="${BASE_CONFIG:-./config/default}"
 
 # Get path to image names.
 DOCKER_IMAGES="$(pwd)/hack/docker-images.txt"