Merge pull request #405 from fidelity/dependabot/go_modules/github.co…

…m/fluxcd/pkg/apis/meta-1.2.0

feat: 2024 Jan release

.github/workflows/main.yaml

@@ -38,7 +38,7 @@ jobs:
         uses: actions/setup-go@v2
         with:
           # The Go version to download (if necessary) and use. Supports semver spec and ranges.
-          go-version: 1.19.3
+          go-version: 1.21.5
       - name: Setup dependencies
         run: |
           [ -z "${GOPATH}" ] && export GOPATH=$HOME/go
@@ -83,37 +83,16 @@ jobs:
         if: github.event_name == 'push'
         uses: docker/setup-buildx-action@master
 
-      - name: Build arm image
+      - name: Build image and Push
         if: github.event_name == 'push'
         uses: docker/build-push-action@v4
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .
           file: ./Dockerfile
-          platforms: linux/arm64
-          tags: ${{ steps.prep.outputs.tags }}-arm
-          outputs: type=docker,oci-mediatypes=false
-      - name: push arm
-        id: push-arm
-        if: github.event_name == 'push'
-        run: |
-          docker push ${{ steps.prep.outputs.tags }}-arm
-
-      - name: Build amd image
-        if: github.event_name == 'push'
-        uses: docker/build-push-action@v4
-        with:
-          builder: ${{ steps.buildx.outputs.name }}
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64
-          tags: ${{ steps.prep.outputs.tags }}-amd
-          outputs: type=docker,oci-mediatypes=false
-      - name: push amd
-        id: push-amd
-        if: github.event_name == 'push'
-        run: |
-          docker push ${{ steps.prep.outputs.tags }}-amd
+          platforms: linux/arm64,linux/amd64
+          tags: ${{ steps.prep.outputs.tags }}
+          push: true
 
   integration-test:
     needs: docker-build
@@ -124,7 +103,7 @@ jobs:
         run: |
           [ -z "${GOPATH}" ] && export GOPATH=$HOME/go
           PATH="${GOPATH}/bin:${PATH}"
-          kind create cluster --image kindest/node:v1.26.6
+          kind create cluster --image kindest/node:v1.27.3
           echo "sleep 60s to wait node ready"
           sleep 60s
           kubectl get node
@@ -144,7 +123,7 @@ jobs:
           GITREPO: ${{ github.event.pull_request.head.repo.full_name }}
         run: |
           [ "${{ github.event_name }}" == "pull_request" ] && export DOCKER_IMG='kraan-controller-prerelease' || export DOCKER_IMG='kraan-controller'
-          [ "${{ github.event_name }}" == "pull_request" ] && export VERSION=$(cat VERSION)-dev || export VERSION=$(cat VERSION)-amd
+          [ "${{ github.event_name }}" == "pull_request" ] && export VERSION=$(cat VERSION)-dev || export VERSION=$(cat VERSION)
           [ "${{ github.event_name }}" != "pull_request" ] && export GITREPO='fidelity/kraan'
           export CHART_VERSION=$VERSION
           export REPO=kraan

.golangci.yml

@@ -175,7 +175,6 @@ linters:
     - asciicheck
     - bodyclose
     - deadcode
-    - depguard
     - dogsled
     - dupl
     - exhaustive

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.19 as builder
+FROM golang:1.21 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -20,7 +20,7 @@ ARG TARGETOS
 # Build
 RUN mkdir bin
 RUN apt install -y curl tar
-RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.26.0/bin/${TARGETOS}/${TARGETARCH}/kubectl
+RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.28.4/bin/${TARGETOS}/${TARGETARCH}/kubectl
 RUN chmod +x ./kubectl
 RUN mv kubectl bin
 RUN curl -LO https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v3.8.7/kustomize_v3.8.7_${TARGETOS}_${TARGETARCH}.tar.gz

Dockerfile-check

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.19 as builder
+FROM golang:1.21 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -20,7 +20,7 @@ COPY bin/ bin/
 RUN apt install -y curl
 RUN bin/setup.sh
 # Temporary fix see https://github.com/fidelity/kraan/issues/114
-RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.26.0/bin/linux/amd64/kubectl
+RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.28.4/bin/linux/amd64/kubectl
 RUN chmod +x ./kubectl
 RUN mv kubectl bin
 RUN cp bin/* /usr/local/bin

Dockerfile-dev

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.19 as builder
+FROM golang:1.21 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -18,7 +18,7 @@ RUN go mod download
 RUN mkdir bin
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o bin/kraan-controller main/main.go
 RUN apt install -y curl
-RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.26.0/bin/linux/amd64/kubectl
+RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.28.4/bin/linux/amd64/kubectl
 RUN chmod +x ./kubectl
 RUN mv kubectl bin
 RUN curl -LO https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v3.8.7/kustomize_v3.8.7_linux_amd64.tar.gz

VERSION

@@ -1 +1 @@
-v0.3.36
+v0.3.37

bin/setup.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 # Set versions of software required
-linter_version=1.52.2
+linter_version=1.55.2
 mockgen_version=v1.6.0
 helm_version=v3.6.1
 kind_version=v0.11.1
-kubectl_version=v1.26.0
+kubectl_version=v1.28.4
 kustomize_version=v3.8.7
 
 function usage()

chart/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 description: A Helm chart for kraan controller
 name: kraan-controller
 type: application
-appVersion: v0.3.36
-version: v0.3.36
+appVersion: v0.3.37
+version: v0.3.37