operator-framework · acornett21 · Aug 30, 2024 · Sep 23, 2024 · Sep 24, 2024 · Sep 25, 2024
diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk
@@ -29,11 +29,11 @@ $(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
 	@echo "(re)installing $(GOBIN)/golangci-lint-v1.55.2"
 	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.55.2 "github.com/golangci/golangci-lint/cmd/golangci-lint"
 
-GORELEASER := $(GOBIN)/goreleaser-v1.16.2
+GORELEASER := $(GOBIN)/goreleaser-v1.26.2
 $(GORELEASER): $(BINGO_DIR)/goreleaser.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/goreleaser-v1.16.2"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=goreleaser.mod -o=$(GOBIN)/goreleaser-v1.16.2 "github.com/goreleaser/goreleaser"
+	@echo "(re)installing $(GOBIN)/goreleaser-v1.26.2"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=goreleaser.mod -o=$(GOBIN)/goreleaser-v1.26.2 "github.com/goreleaser/goreleaser"
 
 KIND := $(GOBIN)/kind-v0.20.0
 $(KIND): $(BINGO_DIR)/kind.mod

diff --git a/.bingo/goreleaser.mod b/.bingo/goreleaser.mod
@@ -1,5 +1,7 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.21.3
+go 1.22
 
-require github.com/goreleaser/goreleaser v1.16.2
+toolchain go1.22.5
+
+require github.com/goreleaser/goreleaser v1.26.2
diff --git a/.bingo/goreleaser.sum b/.bingo/goreleaser.sum
diff --git a/.bingo/variables.env b/.bingo/variables.env
@@ -12,7 +12,7 @@ BINGO="${GOBIN}/bingo-v0.9.0"
 
 GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.55.2"
 
-GORELEASER="${GOBIN}/goreleaser-v1.16.2"
+GORELEASER="${GOBIN}/goreleaser-v1.26.2"
 
 KIND="${GOBIN}/kind-v0.20.0"
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,9 +13,10 @@ on:
     - main
 
 jobs:
+  #todo-adam maybe just make this seperate jobs that take in the file name, then execute the manifest release as a depends on
   goreleaser:
     name: goreleaser
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
     - name: Check out code into the Go module directory
       uses: actions/checkout@v3

diff --git a/.github/workflows/test-ansible.yml b/.github/workflows/test-ansible.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   e2e:
     name: e2e
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v3
         with:

diff --git a/.github/workflows/test-sanity.yml b/.github/workflows/test-sanity.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   sanity:
     name: sanity
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v3
       with:

diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   unit:
     name: unit
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v3
         with:

diff --git a/.goreleaser.amd64.yml b/.goreleaser.amd64.yml
@@ -0,0 +1,43 @@
+before:
+  hooks:
+    - go mod tidy
+    - go mod download
+builds:
+  - id: binary
+    main: ./cmd/ansible-operator/
+    binary: ansible-operator
+    asmflags: "{{ .Env.GO_BUILD_ASMFLAGS }}"
+    gcflags: "{{ .Env.GO_BUILD_GCFLAGS }}"
+    ldflags: "{{ .Env.GO_BUILD_LDFLAGS }}"
+    mod_timestamp: "{{ .CommitTimestamp }}"
+    goos:
+    - linux
+    goarch:
+    - amd64
+dockers:
+- image_templates:
+  - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-amd64"
+  dockerfile: images/ansible-operator/Dockerfile
+  goos: linux
+  goarch: amd64
+  use: buildx
+  build_flag_templates:
+    - "--platform=linux/amd64"
+  extra_files:
+    - "images/ansible-operator/Pipfile"
+    - "images/ansible-operator/Pipfile.lock"
+#docker_manifests:
+#- name_template: "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}"
+#  image_templates:
+#    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-amd64"
+#    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-arm64"
+#    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-ppc64le"
+#    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-s390x"
+archives:
+  - format: binary
+    name_template: "{{ .Binary }}_{{ .Os }}_{{ .Arch }}"
+changelog:
+  use: github-native
+  skip: '{{ ne .Env.ENABLE_RELEASE_PIPELINE "true" }}'
+release:
+  disable: '{{ ne .Env.ENABLE_RELEASE_PIPELINE "true" }}'
diff --git a/.goreleaser.arm64.yml b/.goreleaser.arm64.yml
@@ -0,0 +1,43 @@
+before:
+  hooks:
+    - go mod tidy
+    - go mod download
+builds:
+  - id: binary
+    main: ./cmd/ansible-operator/
+    binary: ansible-operator
+    asmflags: "{{ .Env.GO_BUILD_ASMFLAGS }}"
+    gcflags: "{{ .Env.GO_BUILD_GCFLAGS }}"
+    ldflags: "{{ .Env.GO_BUILD_LDFLAGS }}"
+    mod_timestamp: "{{ .CommitTimestamp }}"
+    goos:
+    - linux
+    goarch:
+    - arm64
+dockers:
+- image_templates:
+    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-arm64"
+  dockerfile: images/ansible-operator/Dockerfile
+  goos: linux
+  goarch: arm64
+  use: buildx
+  build_flag_templates:
+    - "--platform=linux/arm64"
+  extra_files:
+    - "images/ansible-operator/Pipfile"
+    - "images/ansible-operator/Pipfile.lock"
+#docker_manifests:
+#- name_template: "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}"
+#  image_templates:
+#    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-amd64"
+#    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-arm64"
+#    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-ppc64le"
+#    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-s390x"
+archives:
+  - format: binary
+    name_template: "{{ .Binary }}_{{ .Os }}_{{ .Arch }}"
+changelog:
+  use: github-native
+  skip: '{{ ne .Env.ENABLE_RELEASE_PIPELINE "true" }}'
+release:
+  disable: '{{ ne .Env.ENABLE_RELEASE_PIPELINE "true" }}'
diff --git a/.goreleaser.manifest.yml b/.goreleaser.manifest.yml
@@ -0,0 +1,12 @@
+docker_manifests:
+- name_template: "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}"
+  image_templates:
+    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-amd64"
+    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-arm64"
+    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-ppc64le"
+    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-s390x"
+changelog:
+  use: github-native
+  skip: '{{ ne .Env.ENABLE_RELEASE_PIPELINE "true" }}'
+release:
+  disable: '{{ ne .Env.ENABLE_RELEASE_PIPELINE "true" }}'
diff --git a/.goreleaser.ppc64le.yml b/.goreleaser.ppc64le.yml
@@ -0,0 +1,43 @@
+before:
+  hooks:
+    - go mod tidy
+    - go mod download
+builds:
+  - id: binary
+    main: ./cmd/ansible-operator/
+    binary: ansible-operator
+    asmflags: "{{ .Env.GO_BUILD_ASMFLAGS }}"
+    gcflags: "{{ .Env.GO_BUILD_GCFLAGS }}"
+    ldflags: "{{ .Env.GO_BUILD_LDFLAGS }}"
+    mod_timestamp: "{{ .CommitTimestamp }}"
+    goos:
+    - linux
+    goarch:
+    - ppc64le
+dockers:
+- image_templates:
+    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-ppc64le"
+  dockerfile: images/ansible-operator/Dockerfile
+  goos: linux
+  goarch: ppc64le
+  use: buildx
+  build_flag_templates:
+    - "--platform=linux/ppc64le"
+  extra_files:
+    - "images/ansible-operator/Pipfile"
+    - "images/ansible-operator/Pipfile.lock"
+#docker_manifests:
+#- name_template: "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}"
+#  image_templates:
+#    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-amd64"
+#    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-arm64"
+#    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-ppc64le"
+#    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-s390x"
+archives:
+  - format: binary
+    name_template: "{{ .Binary }}_{{ .Os }}_{{ .Arch }}"
+changelog:
+  use: github-native
+  skip: '{{ ne .Env.ENABLE_RELEASE_PIPELINE "true" }}'
+release:
+  disable: '{{ ne .Env.ENABLE_RELEASE_PIPELINE "true" }}'
diff --git a/.goreleaser.s390x.yml b/.goreleaser.s390x.yml
@@ -0,0 +1,43 @@
+before:
+  hooks:
+    - go mod tidy
+    - go mod download
+builds:
+  - id: binary
+    main: ./cmd/ansible-operator/
+    binary: ansible-operator
+    asmflags: "{{ .Env.GO_BUILD_ASMFLAGS }}"
+    gcflags: "{{ .Env.GO_BUILD_GCFLAGS }}"
+    ldflags: "{{ .Env.GO_BUILD_LDFLAGS }}"
+    mod_timestamp: "{{ .CommitTimestamp }}"
+    goos:
+    - linux
+    goarch:
+    - s390x
+dockers:
+- image_templates:
+    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-s390x"
+  dockerfile: images/ansible-operator/Dockerfile
+  goos: linux
+  goarch: s390x
+  use: buildx
+  build_flag_templates:
+    - "--platform=linux/s390x"
+  extra_files:
+    - "images/ansible-operator/Pipfile"
+    - "images/ansible-operator/Pipfile.lock"
+#docker_manifests:
+#- name_template: "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}"
+#  image_templates:
+#    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-amd64"
+#    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-arm64"
+#    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-ppc64le"
+#    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-s390x"
+archives:
+  - format: binary
+    name_template: "{{ .Binary }}_{{ .Os }}_{{ .Arch }}"
+changelog:
+  use: github-native
+  skip: '{{ ne .Env.ENABLE_RELEASE_PIPELINE "true" }}'
+release:
+  disable: '{{ ne .Env.ENABLE_RELEASE_PIPELINE "true" }}'
diff --git a/.goreleaser.yml b/.goreleaser.yml
diff --git a/Makefile b/Makefile
@@ -171,10 +171,29 @@ LOCALBIN ?= $(shell pwd)/bin
 $(LOCALBIN):
 	mkdir -p $(LOCALBIN)
 
+#.PHONY: release
+#release: $(addprefix release-arch-,$(ARCHITECTURES))
+#
+#ARCHITECTURES=amd64 arm64 ppc64le s390x
+#
+#define RELEASE_template
+#export ENABLE_RELEASE_PIPELINE ?= false
+#export GORELEASER_ARGS         ?= --snapshot --clean --timeout=120m --debug
+#.PHONY: release-arch-$(1)
+#release-arch-$(1): $(GORELEASER) ## Runs goreleaser. By default, this will run only as a snapshot and will not publish any artifacts unless it is run with different arguments. To override the arguments, run with "GORELEASER_ARGS=...". When run as a github action from a tag, this target will publish a full release.
+#	$(GORELEASER) $(GORELEASER_ARGS) --config .goreleaser.$(1).yml
+#endef
+#
+#$(foreach arch,$(ARCHITECTURES),$(eval $(call RELEASE_template,$(arch))))
+
 export ENABLE_RELEASE_PIPELINE ?= false
-export GORELEASER_ARGS         ?= --snapshot --clean --timeout=120m
+export GORELEASER_ARGS         ?= --snapshot --clean --timeout=120m --debug
 release: $(GORELEASER) ## Runs goreleaser. By default, this will run only as a snapshot and will not publish any artifacts unless it is run with different arguments. To override the arguments, run with "GORELEASER_ARGS=...". When run as a github action from a tag, this target will publish a full release.
-	$(GORELEASER) $(GORELEASER_ARGS)
+	$(GORELEASER) $(GORELEASER_ARGS) --config .goreleaser.amd64.yml
+	$(GORELEASER) $(GORELEASER_ARGS) --config .goreleaser.arm64.yml
+	$(GORELEASER) $(GORELEASER_ARGS) --config .goreleaser.ppc64le.yml
+	$(GORELEASER) $(GORELEASER_ARGS) --config .goreleaser.s390x.yml
+	$(GORELEASER) $(GORELEASER_ARGS) --config .goreleaser.manifest.yml
 
 .DEFAULT_GOAL := help
 .PHONY: help

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/operator-framework/ansible-operator-plugins
 
-go 1.21
+go 1.22
 
 require (
 	github.com/go-logr/logr v1.4.1

diff --git a/hack/generate/samples/ansible/testdata/inventory/hosts b/hack/generate/samples/ansible/testdata/inventory/hosts
@@ -2,4 +2,4 @@
 127.0.0.1 ansible_connection=local
 
 [all:vars]
-ansible_python_interpreter=/usr/bin/python3
+ansible_python_interpreter=/usr/bin/python3.12