Merge remote-tracking branch 'origin/main' into PROD-2223-use-opentof…

…u-binary-in-terraform-dockerfile

.github/workflows/ci.yaml

@@ -10,35 +10,12 @@ env:
   GOPATH: /home/runner/go/
   GOPROXY: "https://proxy.golang.org"
 jobs:
-  prepare:
-    name: Prepare release
-    runs-on: ubuntu-latest
-    permissions:
-      contents: 'read'
-      id-token: 'write'
-    outputs:
-      new_release_version: ${{ steps.semantic_release.outputs.new_release_version }}
-      new_release_published: ${{ steps.semantic_release.outputs.new_release_published }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.PLURAL_BOT_PAT }}
-      - name: Semantic Release
-        uses: cycjimmy/semantic-release-action@v3
-        id: semantic_release
-        with:
-          dry_run: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.PLURAL_BOT_PAT }}
-          NODE_AUTH_TOKEN: ${{ secrets.PLURAL_BOT_NPM_TOKEN }}
   build:
     name: Build
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
           check-latest: true
@@ -48,28 +25,27 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
           check-latest: true
-      - run: PATH=$PATH:$GOPATH/bin make test
+      - run: PATH=$PATH:$GOPATH/bin make -d test
   lint:
     name: Lint
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
           check-latest: true
       - uses: golangci/golangci-lint-action@v3
         with:
-          version: latest
+          version: v1.60.2
   publish:
     name: Build and push Agent container
     runs-on: ubuntu-20.04
     needs:
-    - prepare
     - test
     permissions:
       contents: 'read'
@@ -122,31 +98,3 @@ jobs:
         cache-to: type=gha,mode=max
         build-args: |
           GIT_COMMIT=${{ github.sha }}
-  release:
-    runs-on: ubuntu-latest
-    needs: build
-    permissions:
-      contents: 'read'
-      id-token: 'write'
-    if: github.event_name != 'pull_request'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.PLURAL_BOT_PAT }}
-      - name: Semantic Release
-        uses: cycjimmy/semantic-release-action@v3
-        id: semantic_release
-        if: github.event_name != 'pull_request'
-        env:
-          GITHUB_TOKEN: ${{ secrets.PLURAL_BOT_PAT }}
-          NODE_AUTH_TOKEN: ${{ secrets.PLURAL_BOT_NPM_TOKEN }}
-      - name: slack webhook
-        uses: 8398a7/action-slack@v3
-        with:
-          status: ${{ job.status }}
-          fields: workflow,job,repo,message,commit,author
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} # required
-        if: always()

.github/workflows/e2e.yaml

@@ -0,0 +1,22 @@
+name: E2E
+on:
+  pull_request:
+    branches:
+      - main
+jobs:
+  create-cluster:
+    name: Create Kind cluster
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Install GO
+        uses: actions/setup-go@v4
+        with:
+          go-version-file: go.mod
+          cache: false
+      - name: Create kind cluster
+        uses: helm/[email protected]
+      - run: kind get clusters
+      - run: go test -v -race ./pkg/cache/... -tags="e2e"
+      - run: go test -v -race ./pkg/applier/filters/... -tags="e2e"

.github/workflows/lint-and-test.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Set up python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.7
+          python-version: 3.13
 
       - name: Setup Chart Linting
         id: lint

.github/workflows/publish-fips.yaml

@@ -0,0 +1,65 @@
+name: Publish agent FIPS
+
+on:
+  push:
+    tags:
+      - 'v*.*.*'
+
+env:
+  GOPATH: /home/runner/go/
+  GOPROXY: "https://proxy.golang.org"
+
+jobs:
+  publish-agent-fips:
+    name: Build and push agent FIPS container
+    runs-on: ubuntu-20.04
+    permissions:
+      contents: 'read'
+      id-token: 'write'
+      packages: 'write'
+    outputs:
+      version: ${{ steps.meta.outputs.version }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ghcr.io/pluralsh/deployment-operator
+            docker.io/pluralsh/deployment-operator
+          tags: |
+            type=semver,pattern={{version}},suffix=-fips,priority=1000
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Login to Docker
+        uses: docker/login-action@v3
+        with:
+          username: mjgpluralsh
+          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: "."
+          file: "./dockerfiles/agent/fips.Dockerfile"
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          build-args: |
+            GO_FIPS_IMAGE_REPO=ghcr.io/pluralsh/go-fips
+            GO_FIPS_IMAGE_TAG=1.23.2
+

.github/workflows/publish-harness-fips.yaml

@@ -0,0 +1,143 @@
+name: Publish Harness FIPS
+on:
+  pull_request:
+    branches:
+      - "main"
+  push:
+    tags:
+      - 'v*.*.*'
+env:
+  GOPATH: /home/runner/go/
+  GOPROXY: "https://proxy.golang.org"
+jobs:
+
+  publish-harness-base:
+    name: Build and push harness base FIPS container
+    runs-on: ubuntu-20.04
+    permissions:
+      contents: 'read'
+      id-token: 'write'
+      packages: 'write'
+    outputs:
+      version: ${{ steps.meta.outputs.version }}
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+    - name: Docker meta
+      id: meta
+      uses: docker/metadata-action@v5
+      with:
+        # list of Docker images to use as base name for tags
+        images: |
+          ghcr.io/pluralsh/stackrun-harness-base
+          docker.io/pluralsh/stackrun-harness-base
+        tags: |
+          type=semver,pattern={{version}},suffix=-fips,priority=1000
+          type=sha,suffix=-fips,priority=800
+          type=ref,event=pr,suffix=-fips,priority=600
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+    - name: Login to GHCR
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+    - name: Login to Docker
+      uses: docker/login-action@v3
+      with:
+        username: mjgpluralsh
+        password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+    - name: Build and push
+      uses: docker/build-push-action@v5
+      with:
+        context: "."
+        file: "./dockerfiles/harness/base.fips.Dockerfile"
+        push: true
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}
+        platforms: linux/amd64,linux/arm64
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
+        build-args: |
+          VERSION=${{ steps.meta.outputs.version }}
+          GO_FIPS_IMAGE_REPO=ghcr.io/pluralsh/go-fips
+          GO_FIPS_IMAGE_TAG=1.23.2
+            
+  publish-harness-ansible:
+    name: Build and push harness ansible FIPS container
+    runs-on: ubuntu-20.04
+    needs: [publish-harness-base]
+    strategy:
+      matrix:
+        versions:
+          - ansible: '7.7.0'
+            python: '3.11'
+            tag: '7.7'
+          - ansible: '8.7.0'
+            python: '3.11'
+            tag: '8.7'
+          - ansible: '9.0.0'
+            python: '3.12'
+            tag: '9.0'
+          - ansible: '10.0.0'
+            python: '3.12'
+            tag: '10.0'
+    permissions:
+      contents: write
+      discussions: write
+      pull-requests: write
+      packages: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ghcr.io/pluralsh/harness
+            docker.io/pluralsh/harness
+          tags: |
+            type=semver,pattern={{version}},suffix=-ansible-${{ matrix.versions.tag }}-fips,priority=1000
+            type=sha,suffix=-ansible-${{ matrix.versions.tag }}-fips,priority=800
+            type=ref,event=pr,suffix=-ansible-${{ matrix.versions.tag }}-fips,priority=600
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Login to Docker
+        uses: docker/login-action@v3
+        with:
+          username: mjgpluralsh
+          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: "."
+          file: "./dockerfiles/harness/ansible.fips.Dockerfile"
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          build-args: |
+            ANSIBLE_VERSION=${{ matrix.versions.ansible }}
+            PYTHON_VERSION=${{ matrix.versions.python }}
+            HARNESS_BASE_IMAGE_REPO=ghcr.io/pluralsh/stackrun-harness-base
+            HARNESS_BASE_IMAGE_TAG=${{ needs.publish-harness-base.outputs.version }}
+            GO_FIPS_IMAGE_REPO=ghcr.io/pluralsh/go-fips
+            GO_FIPS_IMAGE_TAG=1.23.2