K8S 1.25 Update (#200)

PR to Bump K8s version to 1.25 and golang to 1.19

Additionally bumped versions for the linter and underlying support packages to be compatible with the latest golang.

Author: theishshah

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v3
       with:
-        go-version: ~1.18
+        go-version: ~1.19
       id: go
 
     - name: Check out code into the Go module directory
@@ -56,7 +56,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v3
       with:
-        go-version: ~1.18
+        go-version: ~1.19
       id: go
 
     - name: Check out code into the Go module directory
@@ -65,7 +65,7 @@ jobs:
     - name: Lint
       uses: golangci/golangci-lint-action@v3
       with:
-        version: v1.45.2
+        version: v1.48.0
 
   go-apidiff:
     name: go-apidiff
@@ -76,7 +76,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v3
       with:
-        go-version: ~1.18
+        go-version: ~1.19
       id: go
 
     - name: Check out code into the Go module directory

.github/workflows/deploy.yml

@@ -28,7 +28,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v3
       with:
-        go-version: ~1.18
+        go-version: ~1.19
 
     - name: Create release
       run: |

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM --platform=$BUILDPLATFORM golang:1.18 as builder
+FROM --platform=$BUILDPLATFORM golang:1.19 as builder
 ARG TARGETOS
 ARG TARGETARCH
 

Makefile

@@ -61,13 +61,14 @@ build:
 
 .PHONY: setup-lint
 setup-lint: ## Setup the lint
-	fetch golangci-lint 1.45.2
+	fetch golangci-lint 1.48.0
 
 # Run various checks against code
 .PHONY: lint
 lint: setup-lint
 	golangci-lint run
 
+
 .PHONY: fix
 fix: setup-lint ## Fixup files in the repo.
 	go mod tidy

go.mod

@@ -38,7 +38,7 @@ var (
 	)
 )
 
-//RegisterBuildInfo registers buildInfo Collector to be included in metrics collection
+// RegisterBuildInfo registers buildInfo Collector to be included in metrics collection
 func RegisterBuildInfo(r prometheus.Registerer) {
 	buildInfo.Set(1)
 	r.MustRegister(buildInfo)

go.sum

@@ -19,7 +19,6 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -95,15 +94,15 @@ func ReplaceInFile(path, old, new string) error {
 	if err != nil {
 		return err
 	}
-	b, err := ioutil.ReadFile(path)
+	b, err := os.ReadFile(path)
 	if err != nil {
 		return err
 	}
 	if !strings.Contains(string(b), old) {
 		return errors.New("unable to find the content to be replaced")
 	}
 	s := strings.Replace(string(b), old, new, -1)
-	err = ioutil.WriteFile(path, []byte(s), info.Mode())
+	err = os.WriteFile(path, []byte(s), info.Mode())
 	if err != nil {
 		return err
 	}
@@ -122,15 +121,15 @@ func ReplaceRegexInFile(path, match, replace string) error {
 	if err != nil {
 		return err
 	}
-	b, err := ioutil.ReadFile(path)
+	b, err := os.ReadFile(path)
 	if err != nil {
 		return err
 	}
 	s := matcher.ReplaceAllString(string(b), replace)
 	if s == string(b) {
 		return errors.New("unable to find the content to be replaced")
 	}
-	err = ioutil.WriteFile(path, []byte(s), info.Mode())
+	err = os.WriteFile(path, []byte(s), info.Mode())
 	if err != nil {
 		return err
 	}
@@ -142,7 +141,7 @@ func ReplaceRegexInFile(path, match, replace string) error {
 // todo(camilamacedo86): this func exists in upstream/kb but there the error is not thrown. We need to
 // push this change. See: https://github.com/kubernetes-sigs/kubebuilder/blob/master/test/e2e/utils/util.go
 func UncommentCode(filename, target, prefix string) error {
-	content, err := ioutil.ReadFile(filename)
+	content, err := os.ReadFile(filename)
 	if err != nil {
 		return err
 	}
@@ -184,5 +183,5 @@ func UncommentCode(filename, target, prefix string) error {
 	}
 	// false positive
 	// nolint:gosec
-	return ioutil.WriteFile(filename, out.Bytes(), 0644)
+	return os.WriteFile(filename, out.Bytes(), 0644)
 }

internal/metrics/metrics.go

@@ -21,23 +21,22 @@ limitations under the License.
 //
 // To disable hooks based on annotations the InstallDisableHooks is passed to the reconciler as an option.
 //
-//    r, err := reconciler.New(
-//	    reconciler.WithChart(*w.Chart),
-//	    reconciler.WithGroupVersionKind(w.GroupVersionKind),
-//	    reconciler.WithInstallAnnotations(annotation.InstallDisableHook{}),
-//	  )
+//	   r, err := reconciler.New(
+//		    reconciler.WithChart(*w.Chart),
+//		    reconciler.WithGroupVersionKind(w.GroupVersionKind),
+//		    reconciler.WithInstallAnnotations(annotation.InstallDisableHook{}),
+//		  )
 //
 // If the reconciler detects an annotation named "helm.sdk.operatorframework.io/install-disable-hooks"
 // on the watched custom resource it sets the install.DisableHooks option to the annotations value. For more information
 // take a look at the InstallDisableHooks.InstallOption method.
 //
-//   kind: OperatorHelmKind
-//   apiVersion: test.example.com/v1
-//   metadata:
-//     name: nginx-sample
-//     annotations:
-//       "helm.sdk.operatorframework.io/install-disable-hooks": true
-//
+//	kind: OperatorHelmKind
+//	apiVersion: test.example.com/v1
+//	metadata:
+//	  name: nginx-sample
+//	  annotations:
+//	    "helm.sdk.operatorframework.io/install-disable-hooks": true
 package annotation
 
 import (

internal/testutils/utils.go

@@ -17,7 +17,6 @@ package chartutil
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -52,7 +51,7 @@ type Options struct {
 // NewChart creates a new helm chart for the project from helm's default template.
 // It returns a chart.Chart that references the newly created chart or an error.
 func NewChart(name string) (*chart.Chart, error) {
-	tmpDir, err := ioutil.TempDir("", "osdk-helm-chart")
+	tmpDir, err := os.MkdirTemp("", "osdk-helm-chart")
 	if err != nil {
 		return nil, err
 	}
@@ -86,22 +85,22 @@ func NewChart(name string) (*chart.Chart, error) {
 // If opts.Repo is not specified, the following chart reference formats are supported:
 //
 //   - <repoName>/<chartName>: Fetch the helm chart named chartName from the helm
-//                             chart repository named repoName, as specified in the
-//                             $HELM_HOME/repositories/repositories.yaml file.
+//     chart repository named repoName, as specified in the
+//     $HELM_HOME/repositories/repositories.yaml file.
 //
 //   - <url>: Fetch the helm chart archive at the specified URL.
 //
 // If opts.Repo is specified, only one chart reference format is supported:
 //
 //   - <chartName>: Fetch the helm chart named chartName in the helm chart repository
-//                  specified by opts.Repo
+//     specified by opts.Repo
 //
 // If opts.Version is not set, it will fetch the latest available version of the helm
 // chart. Otherwise, it will fetch the specified version.
 // opts.Version is not used when opts.Chart itself refers to a specific version, for
 // example when it is a local path or a URL.
 func LoadChart(opts Options) (*chart.Chart, error) {
-	tmpDir, err := ioutil.TempDir("", "osdk-helm-chart")
+	tmpDir, err := os.MkdirTemp("", "osdk-helm-chart")
 	if err != nil {
 		return nil, err
 	}
@@ -152,7 +151,7 @@ func downloadChart(destDir string, opts Options) (string, error) {
 
 // ScaffoldChart scaffolds the provided chart.Chart to a known directory relative to projectDir
 //
-// It also fetches the dependencies and reloads the chart.Chart
+// # It also fetches the dependencies and reloads the chart.Chart
 //
 // It returns the reloaded chart, the relative path, or an error.
 func ScaffoldChart(chrt *chart.Chart, projectDir string) (*chart.Chart, string, error) {