Merge pull request #115 from mittwald/bump/operator

bump operator to latest tooling
mittwald · Apr 26, 2024 · fcb963d · fcb963d
2 parents b5fdcc2 + 692f4e8
commit fcb963d
Show file tree

Hide file tree

Showing 50 changed files with 999 additions and 1,838 deletions.
diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml
@@ -10,17 +10,17 @@ on:
   pull_request:
 
 env:
-  HELM_VERSION: v3.6.3
+  HELM_VERSION: v3.14.4
 
 jobs:
   helm-lint:
     name: Helm Template & Lint
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.18
+      - name: Set up Go 1.22
         uses: actions/setup-go@v2
         with:
-          go-version: 1.18
+          go-version: 1.22
         id: go
 
       - name: Check out code into the Go module directory
@@ -30,7 +30,7 @@ jobs:
         run: curl -sS -L https://raw.githubusercontent.com/helm/helm/${HELM_VERSION}/scripts/get-helm-3 | bash -s - --version ${HELM_VERSION}
 
       - name: Run helm template
-        run: helm template --values ./deploy/helm-chart/harbor-operator/values.yaml harbor-operator ./deploy/helm-chart/harbor-operator
+        run: helm template --values ./deploy/chart/values.yaml harbor-operator ./deploy/chart
 
       - name: Run helm lint
-        run: helm lint --values ./deploy/helm-chart/harbor-operator/values.yaml --debug --strict ./deploy/helm-chart/harbor-operator/.
+        run: helm lint --values ./deploy/chart/values.yaml --debug --strict ./deploy/chart/.
diff --git a/.github/workflows/verify-codegen.yml b/.github/workflows/verify-codegen.yml
@@ -7,10 +7,10 @@ jobs:
     name: Verify Code Generation
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.19
+      - name: Set up Go 1.22
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19
+          go-version: 1.22
         id: go
 
       - name: Check out code into the Go module directory

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -13,17 +13,17 @@ env:
   KUBECONFIG: /tmp/kubeconfig
   IMAGE_NAME: quay.io/mittwald/harbor-operator
   REGISTRY_URL: quay.io/mittwald
-  GOLANGCI_LINT_VERSION: v1.46.0
+  GOLANGCI_LINT_VERSION: v1.57.2
 
 jobs:
   lint:
     name: Lint
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.19
+      - name: Set up Go 1.22
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19
+          go-version: 1.22
         id: go
 
       - name: Check out code into the Go module directory
@@ -39,10 +39,10 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.19
+      - name: Set up Go 1.22
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19
+          go-version: 1.22
         id: go
 
       - name: Check out code into the Go module directory
@@ -56,10 +56,10 @@ jobs:
     name: Build Image
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.19
+      - name: Set up Go 1.22
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19
+          go-version: 1.22
         id: go
 
       - name: Check out code into the Go module directory
@@ -74,10 +74,10 @@ jobs:
     needs: ['test', 'build']
     if: github.ref == 'refs/heads/master'
     steps:
-      - name: Set up Go 1.19
+      - name: Set up Go 1.22
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19
+          go-version: 1.22
         id: go
 
       - name: Registry Login
@@ -98,10 +98,10 @@ jobs:
     needs: ['test', 'build']
     if: startsWith(github.ref, 'refs/tags/v')
     steps:
-      - name: Set up Go 1.19
+      - name: Set up Go 1.22
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19
+          go-version: 1.22
         id: go
 
       - name: Registry Login
@@ -123,7 +123,7 @@ jobs:
         uses: mittwald/bump-app-version-action@v1
         with:
           mode: 'publish'
-          chartYaml: './deploy/helm-chart/harbor-operator/Chart.yaml'
+          chartYaml: './deploy/chart/Chart.yaml'
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUBTOKEN }}"
-          HELM_REPO_PASSWORD: "${{ secrets.HELM_REPO_PASSWORD }}"
+          HELM_REPO_PASSWORD: "${{ secrets.HELM_REPO_PASSWORD }}"
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.19 as builder
+FROM golang:1.22 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests