updated goreleaser

.github/workflows/release.yaml

@@ -72,10 +72,11 @@ jobs:
       - name: Login to Docker Hub
         run: |
           echo "${{ secrets.DOCKER_PASSWORD }}" | docker login docker.io -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
-      - name: GoReleaser
-        uses: goreleaser/goreleaser-action@v2
+      - name: Run GoReleaser
+        uses: goreleaser/goreleaser-action@v6
         with:
-          version: v1.26.2
-          args: release --skip-sign
+          distribution: goreleaser
+          version: '~> v2'
+          args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.goreleaser.yml

@@ -2,8 +2,9 @@ version: 2
 project_name: pulumi-kubernetes-operator
 
 builds:
-  - ldflags:
-      - -X github.com/pulumi/pulumi-kubernetes-operator/version.Version={{.Tag}}
+  - id: pulumi-kubernetes-operator
+    ldflags:
+      - -X github.com/pulumi/pulumi-kubernetes-operator/operator/version.Version={{.Tag}}
       - -w -extldflags "-static"
     flags:
       - -a
@@ -16,7 +17,8 @@ builds:
     env:
       - CGO_ENABLED=0
       - GO111MODULE=on
-    main: ./cmd/manager/main.go
+    main: ./cmd/main.go
+    dir: operator
     binary: pulumi-kubernetes-operator
 
   - id: pulumi-kubernetes-agent
@@ -72,7 +74,7 @@ dockers:
     goarch: amd64
 
     # Path to the Dockerfile (from the project root).
-    dockerfile: Dockerfile
+    dockerfile: operator/Dockerfile
 
     # Templates of the Docker image names.
     image_templates:
@@ -85,26 +87,3 @@ dockers:
       - "--label=org.label-schema.name={{ .ProjectName }}"
       - "--label=org.label-schema.vcs-ref={{ .ShortCommit }}"
       - "--label=org.label-schema.vcs-url='{{ .GitURL }}'"
-
-  - id: pulumi-kubernetes-agent
-    # GOOS of the built binary that should be used.
-    goos: linux
-
-    # GOARCH of the built binary that should be used.
-    goarch: amd64
-
-    # Path to the Dockerfile (from the project root).
-    dockerfile: agent/Dockerfile
-
-    # Templates of the Docker image names.
-    image_templates:
-      - "pulumi/pulumi-kubernetes-agent:latest"
-      - "pulumi/pulumi-kubernetes-agent:{{ .Version }}"
-
-    build_flag_templates:
-      - "--pull"
-      - "--label=org.label-schema.build-date={{.Date}}"
-      - "--label=org.label-schema.name={{ .ProjectName }}"
-      - "--label=org.label-schema.vcs-ref={{ .ShortCommit }}"
-      - "--label=org.label-schema.vcs-url='{{ .GitURL }}'"
-

operator/go.sum

@@ -52,8 +52,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/djherbis/times v1.5.0 h1:79myA211VwPhFTqUk8xehWrsEO+zcIZj0zT8mXPVARU=
 github.com/djherbis/times v1.5.0/go.mod h1:5q7FDLvbNg1L/KaBmPcWlVR9NmoKo3+ucqUA3ijQhA0=
-github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcejNsXKSkQ6lcIaNec2nyfOdlTBR2lU=
-github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
+github.com/elazarl/goproxy v0.0.0-20231117061959-7cc037d33fb5 h1:m62nsMU279qRD9PQSWD1l66kmkXzuYcnVJqL4XLeV2M=
+github.com/elazarl/goproxy v0.0.0-20231117061959-7cc037d33fb5/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
 github.com/emicklei/go-restful/v3 v3.12.0 h1:y2DdzBAURM29NFF94q6RaY4vjIH1rtwDapwQtU84iWk=
 github.com/emicklei/go-restful/v3 v3.12.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=