Skip to content

Commit 19bb373

Browse files
committed
fix(vendor/scoped): bump k8s version to 1.24, go version to 1.18 and fix scoped client (#2794)
* fix(vendor): bump k8s version to 1.24 and go version to 1.18 Signed-off-by: Vu Dinh <[email protected]> * Update clock package from apimachinery to utils The apimachinery/pkg/util/clock is deprecated and all clock utils is on k8s.io/utils/clock repo instead. Signed-off-by: Vu Dinh <[email protected]> * fix(go.mod): pin opentelemetry packages into specific versions Signed-off-by: Vu Dinh <[email protected]> Co-authored-by: timflannagan <[email protected]> * fix(scoped): update scoped client library to handle token secret In k8s 1.24, token secret is no longer referenced in ServiceAccount. By listing all secrets in the namespace and then filter them with SA name via kubernetes.io/service-account.name annotation, the token secret can be retrieved successfully. Signed-off-by: Vu Dinh <[email protected]> * fix(e2e): Fix several RBAC-related e2e test cases Create token secret for ServiceAccount to ensure those SA is valid for scoped client use. Signed-off-by: Vu Dinh <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: fd9017345aa0fbd7aaed7f0937ff23fca33a9df0 Co-authored-by: timflannagan <[email protected]> Signed-off-by: perdasilva <[email protected]>
1 parent ee57ca8 commit 19bb373

File tree

2,063 files changed

+121553
-51588
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,063 files changed

+121553
-51588
lines changed

go.mod

Lines changed: 102 additions & 91 deletions
Large diffs are not rendered by default.

go.sum

Lines changed: 497 additions & 381 deletions
Large diffs are not rendered by default.

manifests/0000_50_olm_00-clusterserviceversions.crd.yaml

Lines changed: 214 additions & 210 deletions
Large diffs are not rendered by default.

manifests/0000_50_olm_00-subscriptions.crd.yaml

Lines changed: 177 additions & 177 deletions
Large diffs are not rendered by default.

staging/operator-lifecycle-manager/.github/workflows/e2e-tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ jobs:
1818
- uses: actions/checkout@v1
1919
- uses: actions/setup-go@v2
2020
with:
21-
go-version: '~1.17'
21+
go-version: '~1.18'
22+
- run: mkdir -p artifacts
2223
- 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\]'
2324
- name: Archive Test Artifacts # test results, failed or not, are always uploaded.
2425
if: ${{ always() }}

staging/operator-lifecycle-manager/.github/workflows/flaky-e2e.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ jobs:
1414
- uses: actions/checkout@v1
1515
- uses: actions/setup-go@v2
1616
with:
17-
go-version: '~1.17'
17+
go-version: '~1.18'
18+
- run: mkdir -p artifacts
1819
- run: make e2e-local E2E_NODES=1 TEST='\[FLAKE\]' ARTIFACT_DIR=./artifacts/
1920
- name: Archive Test Artifacts # test results, failed or not, are always uploaded.
2021
if: ${{ always() }}
2122
uses: actions/upload-artifact@v2
2223
with:
2324
name: e2e-test-output-${{(github.event.pull_request.head.sha||github.sha)}}-${{ github.run_id }}
24-
path: ${{ github.workspace }}/bin/artifacts/*
25+
path: ${{ github.workspace }}/bin/artifacts/*

staging/operator-lifecycle-manager/.github/workflows/goreleaser.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up Go
1717
uses: actions/setup-go@v2
1818
with:
19-
go-version: '~1.17'
19+
go-version: '~1.18'
2020

2121
- name: Get the image tag
2222
if: startsWith(github.ref, 'refs/tags')

staging/operator-lifecycle-manager/.github/workflows/run-kind-local.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- uses: actions/checkout@v1
1212
- uses: actions/setup-go@v2
1313
with:
14-
go-version: '~1.17'
14+
go-version: '~1.18'
1515
- name: Install kind
1616
run: |
1717
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')"

staging/operator-lifecycle-manager/.github/workflows/run-minikube-local.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- uses: actions/checkout@v1
1212
- uses: actions/setup-go@v2
1313
with:
14-
go-version: '~1.17'
14+
go-version: '~1.18'
1515
- name: Install minikube
1616
run: |
1717
sudo apt-get install conntrack

staging/operator-lifecycle-manager/.github/workflows/sanity.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- uses: actions/checkout@v1
1313
- uses: actions/setup-go@v2
1414
with:
15-
go-version: '~1.17'
15+
go-version: '~1.18'
1616
- name: Run sanity checks
1717
run: make vendor && make diff
1818
lint:
@@ -22,4 +22,4 @@ jobs:
2222
- name: Run linting checks
2323
uses: "golangci/golangci-lint-action@v2"
2424
with:
25-
version: "v1.45.2"
25+
version: "v1.46.0"

staging/operator-lifecycle-manager/.github/workflows/unit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v1
1515
- uses: actions/setup-go@v2
1616
with:
17-
go-version: '~1.17'
17+
go-version: '~1.18'
1818
- name: Envtest setup
1919
run: |
2020
go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest

staging/operator-lifecycle-manager/.github/workflows/verify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- uses: actions/checkout@v1
1313
- uses: actions/setup-go@v2
1414
with:
15-
go-version: '~1.17'
15+
go-version: '~1.18'
1616

1717
# Note(tflannag): We need to explicitly setup the GOPATH as the generate-internal-groups.sh
1818
# codegen script still relies on $GOPATH being set and will return an error otherwise.

staging/operator-lifecycle-manager/cmd/catalog/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99

1010
configv1client "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
1111
"github.com/sirupsen/logrus"
12-
utilclock "k8s.io/apimachinery/pkg/util/clock"
1312
k8sscheme "k8s.io/client-go/kubernetes/scheme"
1413
"k8s.io/client-go/tools/clientcmd"
14+
utilclock "k8s.io/utils/clock"
1515

1616
"github.com/operator-framework/operator-lifecycle-manager/pkg/api/client"
1717
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog"

staging/operator-lifecycle-manager/deploy/chart/crds/0000_50_olm_00-clusterserviceversions.crd.yaml

Lines changed: 214 additions & 210 deletions
Large diffs are not rendered by default.

staging/operator-lifecycle-manager/deploy/chart/crds/0000_50_olm_00-subscriptions.crd.yaml

Lines changed: 177 additions & 177 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)