diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 99479f1065..55eea714ca 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -16,9 +16,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - uses: actions/setup-go@v2 + - uses: actions/setup-go@v3 with: - go-version: '~1.18' + go-version-file: "go.mod" - run: mkdir -p artifacts - run: make e2e-local E2E_TEST_CHUNK=${{ matrix.parallel-id }} E2E_TEST_NUM_CHUNKS=${{ strategy.job-total }} E2E_NODES=2 ARTIFACT_DIR=./artifacts/ SKIP='\[FLAKE\]' - name: Archive Test Artifacts # test results, failed or not, are always uploaded. diff --git a/.github/workflows/flaky-e2e.yml b/.github/workflows/flaky-e2e.yml index b99a50e981..2260a65346 100644 --- a/.github/workflows/flaky-e2e.yml +++ b/.github/workflows/flaky-e2e.yml @@ -12,9 +12,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - uses: actions/setup-go@v2 + - uses: actions/setup-go@v3 with: - go-version: '~1.18' + go-version-file: "go.mod" - run: mkdir -p artifacts - run: make e2e-local E2E_NODES=1 TEST='\[FLAKE\]' ARTIFACT_DIR=./artifacts/ - name: Archive Test Artifacts # test results, failed or not, are always uploaded. diff --git a/.github/workflows/goreleaser.yaml b/.github/workflows/goreleaser.yaml index 84325819c3..c66e177213 100644 --- a/.github/workflows/goreleaser.yaml +++ b/.github/workflows/goreleaser.yaml @@ -14,9 +14,9 @@ jobs: with: fetch-depth: 0 - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v3 with: - go-version: '~1.18' + go-version-file: "go.mod" - name: Get the image tag if: startsWith(github.ref, 'refs/tags') diff --git a/.github/workflows/run-kind-local.yml b/.github/workflows/run-kind-local.yml index 3a81536584..1b8455aa0f 100644 --- a/.github/workflows/run-kind-local.yml +++ b/.github/workflows/run-kind-local.yml @@ -9,9 +9,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - uses: actions/setup-go@v2 + - uses: actions/setup-go@v3 with: - go-version: '~1.18' + go-version-file: "go.mod" - name: Install kind run: | curl -sLo kind "$(curl -sL https://api.github.com/repos/kubernetes-sigs/kind/releases/latest | jq -r '[.assets[] | select(.name == "kind-linux-amd64")] | first | .browser_download_url')" diff --git a/.github/workflows/run-minikube-local.yml b/.github/workflows/run-minikube-local.yml index cbf32cefe6..8da949402d 100644 --- a/.github/workflows/run-minikube-local.yml +++ b/.github/workflows/run-minikube-local.yml @@ -9,9 +9,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - uses: actions/setup-go@v2 + - uses: actions/setup-go@v3 with: - go-version: '~1.18' + go-version-file: "go.mod" - name: Install minikube run: | sudo apt-get install conntrack diff --git a/.github/workflows/sanity.yaml b/.github/workflows/sanity.yaml index 6f466cf482..695c48f889 100644 --- a/.github/workflows/sanity.yaml +++ b/.github/workflows/sanity.yaml @@ -10,9 +10,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - uses: actions/setup-go@v2 + - uses: actions/setup-go@v3 with: - go-version: '~1.18' + go-version-file: "go.mod" - name: Run sanity checks run: make vendor && make diff lint: diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 8c05576c1c..d60d56ae1a 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -12,9 +12,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - uses: actions/setup-go@v2 + - uses: actions/setup-go@v3 with: - go-version: '~1.18' + go-version-file: "go.mod" - name: Envtest setup run: | go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index bb461300e8..a4ffba7bf0 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -10,9 +10,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - uses: actions/setup-go@v2 + - uses: actions/setup-go@v3 with: - go-version: '~1.18' + go-version-file: "go.mod" # Note(tflannag): We need to explicitly setup the GOPATH as the generate-internal-groups.sh # codegen script still relies on $GOPATH being set and will return an error otherwise. diff --git a/go.mod b/go.mod index 9705f7e078..343a301d2d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/operator-framework/operator-lifecycle-manager -go 1.18 +go 1.19 require ( github.com/blang/semver/v4 v4.0.0 diff --git a/pkg/api/client/clientset/versioned/fake/register.go b/pkg/api/client/clientset/versioned/fake/register.go index df006d61e7..8af3cc5f7f 100644 --- a/pkg/api/client/clientset/versioned/fake/register.go +++ b/pkg/api/client/clientset/versioned/fake/register.go @@ -43,14 +43,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/pkg/api/client/clientset/versioned/scheme/register.go b/pkg/api/client/clientset/versioned/scheme/register.go index e2b9a0b237..7eac09fdd1 100644 --- a/pkg/api/client/clientset/versioned/scheme/register.go +++ b/pkg/api/client/clientset/versioned/scheme/register.go @@ -43,14 +43,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/pkg/package-server/client/clientset/internalversion/fake/register.go b/pkg/package-server/client/clientset/internalversion/fake/register.go index fd788c0a9e..d66a4446ee 100644 --- a/pkg/package-server/client/clientset/internalversion/fake/register.go +++ b/pkg/package-server/client/clientset/internalversion/fake/register.go @@ -37,14 +37,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/pkg/package-server/client/clientset/versioned/fake/register.go b/pkg/package-server/client/clientset/versioned/fake/register.go index b85cf948ea..16f51478d6 100644 --- a/pkg/package-server/client/clientset/versioned/fake/register.go +++ b/pkg/package-server/client/clientset/versioned/fake/register.go @@ -37,14 +37,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/pkg/package-server/client/clientset/versioned/scheme/register.go b/pkg/package-server/client/clientset/versioned/scheme/register.go index 857ff0a6bd..63ead29be6 100644 --- a/pkg/package-server/client/clientset/versioned/scheme/register.go +++ b/pkg/package-server/client/clientset/versioned/scheme/register.go @@ -37,14 +37,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly.