ci: fix buildx cleanup on AWS

.github/workflows/ci.yaml

@@ -106,6 +106,13 @@ jobs:
         uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: 'trivy-results.sarif'
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        if: always()
+        with:
+          aws-region: us-east-2
+          role-to-assume: arn:aws:iam::312272277431:role/github-actions/buildx-deployments
+          role-session-name: PluralCLI
   cloud:
     name: Build cloud image
     runs-on: ubuntu-latest
@@ -206,6 +213,13 @@ jobs:
         uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: 'trivy-results.sarif'
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        if: always()
+        with:
+          aws-region: us-east-2
+          role-to-assume: arn:aws:iam::312272277431:role/github-actions/buildx-deployments
+          role-session-name: PluralCLI
   dind:
     name: Build dind image
     runs-on: ubuntu-latest
@@ -306,7 +320,13 @@ jobs:
         uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: 'trivy-results.sarif'
-
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        if: always()
+        with:
+          aws-region: us-east-2
+          role-to-assume: arn:aws:iam::312272277431:role/github-actions/buildx-deployments
+          role-session-name: PluralCLI
   trivy-scan:
     name: Trivy fs scan
     runs-on: ubuntu-latest
@@ -338,7 +358,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version-file: go.mod
       - run: make test
   lint:
     name: Lint
@@ -347,7 +367,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version-file: go.mod
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:

.github/workflows/codeql.yml

@@ -28,7 +28,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version-file: go.mod
       - uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}

.github/workflows/e2e.yaml

@@ -4,13 +4,53 @@ on:
     branches:
       - main
 jobs:
+  create-cluster-capi:
+    name: Create cluster with Cluster API
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Create kind cluster
+        uses: helm/[email protected]
+        with:
+          install_only: true
+      - run: |
+          wget -O- https://apt.releases.hashicorp.com/gpg | gpg --dearmor | sudo tee /usr/share/keyrings/hashicorp-archive-keyring.gpg
+          echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
+          sudo apt-get update
+          sudo apt-get install -y terraform
+      - run: |
+          GOBIN="$HOME"/bin make build-cli
+          chmod 755 plural.o
+          mv plural.o /usr/local/bin/plural
+      - run: hack/e2e/kind-install-for-capd.sh
+      - run: hack/e2e/setup-plural.sh
+        env:
+          CLI_E2E_CONF: ${{ secrets.CLI_E2E_CONF }}
+          CLI_E2E_IDENTITY_FILE: ${{ secrets.CLI_E2E_IDENTITY_FILE }}
+          CLI_E2E_KEY_FILE: ${{ secrets.CLI_E2E_KEY_FILE }}
+          CLI_E2E_PUBLIC_KEY: ${{ secrets.CLI_E2E_PUBLIC_KEY }}
+          CLI_E2E_PRIVATE_KEY: ${{ secrets.CLI_E2E_PRIVATE_KEY }}
+          CLI_E2E_SHARING_PRIVATE_KEY: ${{ secrets.CLI_E2E_SHARING_PRIVATE_KEY }}
+          CLI_E2E_SHARING_PUBLIC_KEY: ${{ secrets.CLI_E2E_SHARING_PUBLIC_KEY }}
+          USE_CLUSTER_API: true
+      - run: go test -v -race ./pkg/test/e2eclusterapi/... -tags="e2e"
+      - run: |
+          cd $HOME/test
+          plural destroy --force --all --commit=""
+        env:
+          PLURAL_DESTROY_CONFIRM: true
+          PLURAL_DESTROY_AFFIRM_UNINSTALL_APPS: true
+          PLURAL_DISABLE_MP_TABLE_VIEW: true
   create-cluster:
+    if: false
+    name: Create cluster
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Create k8s Kind Cluster
-        uses: helm/kind-action@v1.5.0
+      - name: Create kind cluster
+        uses: helm/kind-action@v1.8.0
         with:
           install_only: true
       - run: |
@@ -31,10 +71,12 @@ jobs:
           CLI_E2E_PRIVATE_KEY: ${{ secrets.CLI_E2E_PRIVATE_KEY }}
           CLI_E2E_SHARING_PRIVATE_KEY: ${{ secrets.CLI_E2E_SHARING_PRIVATE_KEY }}
           CLI_E2E_SHARING_PUBLIC_KEY: ${{ secrets.CLI_E2E_SHARING_PUBLIC_KEY }}
+          INSTALL_APP: console
+          INSTALL_RECIPE: console-kind
       - run: go test -v -race ./pkg/test/e2e/... -tags="e2e"
       - run: |
           cd $HOME/test
           plural destroy --force --all --commit=""
         env:
           PLURAL_DESTROY_CONFIRM: true
-          PLURAL_DESTROY_AFFIRM_UNINSTALL_APPS: true
+          PLURAL_DESTROY_AFFIRM_UNINSTALL_APPS: true

.github/workflows/goreleaser-cd.yml

@@ -233,6 +233,13 @@ jobs:
         uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: 'trivy-results.sarif'
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        if: always()
+        with:
+          aws-region: us-east-2
+          role-to-assume: arn:aws:iam::312272277431:role/github-actions/buildx-deployments
+          role-session-name: PluralCLI
   packer:
     name: Build EKS AMI
     runs-on: ubuntu-latest

.gitignore

@@ -1,10 +1,21 @@
-# Binaries for programs and plugins
+# IDE files
+.idea/
+.vscode/
+
+# Testing files
+context.yaml
+workspace.yaml
+
+# Build files and binaries
+dist/
+build/
 *.exe
 *.exe~
 *.dll
 *.so
 *.o
 *.dylib
+__debug_bin
 
 # Test binary, built with `go test -c`
 *.test
@@ -13,15 +24,6 @@
 *.out
 forge*.o
 plural*.o
-# Dependency directories (remove the comment below to include it)
-# vendor/
 
-# IDE dirs
-.idea/
-
-dist/
-build/
-
-# Testing files
-context.yaml
-workspace.yaml
+# Vendored dependencies
+vendor/

Makefile

@@ -37,8 +37,8 @@ git-push:
 	git push
 
 .PHONY: install
-install: build-cli-ui
-	mv $(OUTFILE) ~/bin/plural
+install:
+	go install -ldflags '$(LDFLAGS)' .
 
 .PHONY: build-cli
 build-cli: ## Build a CLI binary for the host architecture without embedded UI