Merge branch 'develop'

appvia · Mar 17, 2024 · c2f3a43 · c2f3a43
2 parents 24917e2 + e67cb83
commit c2f3a43
Show file tree

Hide file tree

Showing 399 changed files with 29,290 additions and 1,244 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.22"
       - name: Unit Tests
         run: make test
 
@@ -29,7 +29,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.22"
       - name: Check CLI
         run: make tnctl
 
@@ -41,7 +41,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.22"
       - name: Check Binaries
         run: |
           make preload
@@ -66,7 +66,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.22"
       - name: Linting
         run: |
           make check-gofmt

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -23,7 +23,7 @@ on:
       cloud:
         description: Cloud to run against
         required: false
-        default: 'aws'
+        default: "aws"
         type: choice
         options:
           - aws
@@ -49,7 +49,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Build
-        uses: docker/build-push-action@v5.1.0
+        uses: docker/build-push-action@v5.2.0
         with:
           context: .
           file: images/Dockerfile.controller
@@ -71,7 +71,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Build
-        uses: docker/build-push-action@v5.1.0
+        uses: docker/build-push-action@v5.2.0
         with:
           context: .
           file: images/Dockerfile.executor
@@ -99,7 +99,7 @@ jobs:
           sudo apt install bats jq
 
       - name: Install Kubectl
-        uses: azure/setup-kubectl@v3.2
+        uses: azure/setup-kubectl@v4
         with:
           version: v1.28.0
 

diff --git a/.github/workflows/images.yaml b/.github/workflows/images.yaml
@@ -8,7 +8,7 @@ jobs:
   push-image:
     strategy:
       matrix:
-        image: ['controller', 'executor', 'cli']
+        image: ["controller", "executor", "cli"]
     runs-on: ubuntu-latest
     permissions:
       actions: none
@@ -36,9 +36,9 @@ jobs:
         id: get_image_tag
         run: |
           if [[ "${GITHUB_REF##*/}" == "master" ]]; then
-            echo "::set-output name=image_tag::latest"
+            echo "image_tag=latest" >> $GITHUB_OUTPUT
           else
-            echo "::set-output name=image_tag::${GITHUB_REF##*/}"
+            echo "image_tag=${GITHUB_REF##*/}" >> $GITHUB_OUTPUT
           fi
       - name: Docker Metadata
         id: docker_meta
@@ -51,7 +51,7 @@ jobs:
           tags: |
             type=raw,value=${{ steps.get_image_tag.outputs.image_tag }}
       - name: Build & Push
-        uses: docker/build-push-action@v5.1.0
+        uses: docker/build-push-action@v5.2.0
         with:
           build-args: VERSION=${{ steps.get_image_tag.outputs.image_tag }}
           context: .

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -13,12 +13,12 @@ jobs:
     with:
       cloud: aws
 
-#  e2e-azure:
-#    uses: ./.github/workflows/e2e.yaml
-#    secrets: inherit
-#    with:
-#      cloud: azurerm
-#
+  #  e2e-azure:
+  #    uses: ./.github/workflows/e2e.yaml
+  #    secrets: inherit
+  #    with:
+  #      cloud: azurerm
+  #
   e2e-google:
     uses: ./.github/workflows/e2e.yaml
     secrets: inherit
@@ -29,14 +29,14 @@ jobs:
     needs:
       - e2e-aws
       - e2e-google
-#      - e2e-azure
+    #      - e2e-azure
     uses: ./.github/workflows/images.yaml
     secrets: inherit
 
   release:
     needs:
       - e2e-aws
-#      - e2e-azure
+      #      - e2e-azure
       - e2e-google
     name: Github Release
     runs-on: ubuntu-latest
@@ -46,13 +46,13 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: "1.22"
       - name: Build CLI
         run: |
           export VERSION=${GITHUB_REF##*/}
           make release-cli
       - name: Github Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           generate_release_notes: true
           prerelease: true

diff --git a/go.mod b/go.mod
@@ -1,12 +1,14 @@
 module github.com/appvia/terranetes-controller
 
-go 1.19
+go 1.21
+
+toolchain go1.22.1
 
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.7
 	github.com/Masterminds/semver v1.5.0
 	github.com/Masterminds/sprig/v3 v3.2.3
-	github.com/aws/aws-sdk-go v1.50.32
+	github.com/aws/aws-sdk-go v1.51.0
 	github.com/bbalet/stopwords v1.0.0
 	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d
 	github.com/enescakir/emoji v1.0.0
@@ -42,11 +44,11 @@ require (
 	golang.org/x/oauth2 v0.18.0
 	golang.org/x/tools v0.19.0
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.29.2
+	k8s.io/api v0.29.3
 	k8s.io/apiextensions-apiserver v0.29.2
-	k8s.io/apimachinery v0.29.2
+	k8s.io/apimachinery v0.29.3
 	k8s.io/cli-runtime v0.29.2
-	k8s.io/client-go v0.29.2
+	k8s.io/client-go v0.29.3
 	k8s.io/code-generator v0.29.2
 	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
@@ -145,7 +147,7 @@ require (
 	github.com/gofrs/flock v0.8.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
 	github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
 	github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe // indirect
@@ -327,7 +329,7 @@ require (
 	google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
 	google.golang.org/grpc v1.59.0 // indirect
-	google.golang.org/protobuf v1.32.0 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect