Skip to content

Commit 63f1343

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #801 from openshift-bot/synchronize-upstream
NO-ISSUE: Synchronize From Upstream Repositories
2 parents 02e3f41 + 5274dd9 commit 63f1343

File tree

18 files changed

+182
-94
lines changed

18 files changed

+182
-94
lines changed

‎go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,15 +246,15 @@ require (
246246
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
247247
gopkg.in/warnings.v0 v0.1.2 // indirect
248248
gopkg.in/yaml.v3 v3.0.1 // indirect
249-
k8s.io/apiextensions-apiserver v0.30.1 // indirect
250-
k8s.io/apiserver v0.30.1 // indirect
249+
k8s.io/apiextensions-apiserver v0.30.2 // indirect
250+
k8s.io/apiserver v0.30.2 // indirect
251251
k8s.io/cli-runtime v0.30.0 // indirect
252252
k8s.io/component-base v0.30.2 // indirect
253253
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
254254
k8s.io/klog v1.0.0 // indirect
255255
k8s.io/klog/v2 v2.120.1 // indirect
256-
k8s.io/kms v0.30.1 // indirect
257-
k8s.io/kube-aggregator v0.30.1 // indirect
256+
k8s.io/kms v0.30.2 // indirect
257+
k8s.io/kube-aggregator v0.30.2 // indirect
258258
k8s.io/kubectl v0.30.0 // indirect
259259
oras.land/oras-go v1.2.5 // indirect
260260
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect

‎go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3151,14 +3151,14 @@ k8s.io/api v0.18.0/go.mod h1:q2HRQkfDzHMBZL9l/y9rH63PkQl4vae0xRT+8prbrK8=
31513151
k8s.io/api v0.21.0-rc.0/go.mod h1:Dkc/ZauWJrgZhjOjeBgW89xZQiTBJA2RaBKYHXPsi2Y=
31523152
k8s.io/api v0.30.2 h1:+ZhRj+28QT4UOH+BKznu4CBgPWgkXO7XAvMcMl0qKvI=
31533153
k8s.io/api v0.30.2/go.mod h1:ULg5g9JvOev2dG0u2hig4Z7tQ2hHIuS+m8MNZ+X6EmI=
3154-
k8s.io/apiextensions-apiserver v0.30.1 h1:4fAJZ9985BmpJG6PkoxVRpXv9vmPUOVzl614xarePws=
3155-
k8s.io/apiextensions-apiserver v0.30.1/go.mod h1:R4GuSrlhgq43oRY9sF2IToFh7PVlF1JjfWdoG3pixk4=
3154+
k8s.io/apiextensions-apiserver v0.30.2 h1:l7Eue2t6QiLHErfn2vwK4KgF4NeDgjQkCXtEbOocKIE=
3155+
k8s.io/apiextensions-apiserver v0.30.2/go.mod h1:lsJFLYyK40iguuinsb3nt+Sj6CmodSI4ACDLep1rgjw=
31563156
k8s.io/apimachinery v0.18.0/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA=
31573157
k8s.io/apimachinery v0.21.0-rc.0/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY=
31583158
k8s.io/apimachinery v0.30.2 h1:fEMcnBj6qkzzPGSVsAZtQThU62SmQ4ZymlXRC5yFSCg=
31593159
k8s.io/apimachinery v0.30.2/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
3160-
k8s.io/apiserver v0.30.1 h1:BEWEe8bzS12nMtDKXzCF5Q5ovp6LjjYkSp8qOPk8LZ8=
3161-
k8s.io/apiserver v0.30.1/go.mod h1:i87ZnQ+/PGAmSbD/iEKM68bm1D5reX8fO4Ito4B01mo=
3160+
k8s.io/apiserver v0.30.2 h1:ACouHiYl1yFI2VFI3YGM+lvxgy6ir4yK2oLOsLI1/tw=
3161+
k8s.io/apiserver v0.30.2/go.mod h1:BOTdFBIch9Sv0ypSEcUR6ew/NUFGocRFNl72Ra7wTm8=
31623162
k8s.io/cli-runtime v0.30.0 h1:0vn6/XhOvn1RJ2KJOC6IRR2CGqrpT6QQF4+8pYpWQ48=
31633163
k8s.io/cli-runtime v0.30.0/go.mod h1:vATpDMATVTMA79sZ0YUCzlMelf6rUjoBzlp+RnoM+cg=
31643164
k8s.io/client-go v0.18.0/go.mod h1:uQSYDYs4WhVZ9i6AIoEZuwUggLVEF64HOD37boKAtF8=
@@ -3185,10 +3185,10 @@ k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
31853185
k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
31863186
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
31873187
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
3188-
k8s.io/kms v0.30.1 h1:gEIbEeCbFiaN2tNfp/EUhFdGr5/CSj8Eyq6Mkr7cCiY=
3189-
k8s.io/kms v0.30.1/go.mod h1:GrMurD0qk3G4yNgGcsCEmepqf9KyyIrTXYR2lyUOJC4=
3190-
k8s.io/kube-aggregator v0.30.1 h1:ymR2BsxDacTKwzKTuNhGZttuk009c+oZbSeD+IPX5q4=
3191-
k8s.io/kube-aggregator v0.30.1/go.mod h1:SFbqWsM6ea8dHd3mPLsZFzJHbjBOS5ykIgJh4znZ5iQ=
3188+
k8s.io/kms v0.30.2 h1:VSZILO/tkzrz5Tu2j+yFQZ2Dc5JerQZX2GqhFJbQrfw=
3189+
k8s.io/kms v0.30.2/go.mod h1:GrMurD0qk3G4yNgGcsCEmepqf9KyyIrTXYR2lyUOJC4=
3190+
k8s.io/kube-aggregator v0.30.2 h1:0+yk/ED6foCprY8VmkDPUhngjaAPKsNTXB/UrtvbIz0=
3191+
k8s.io/kube-aggregator v0.30.2/go.mod h1:EhqCfDdxysNWXk1wRL9SEHAdo1DKl6EULQagztkBcXE=
31923192
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
31933193
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE=
31943194
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=

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

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,16 @@ jobs:
1919
go-version-file: "go.mod"
2020

2121
- name: Get the image tag
22-
if: startsWith(github.ref, 'refs/tags')
2322
run: |
2423
# Source: https://i.8713187.xyzmunity/t/how-to-get-just-the-tag-name/16241/32
2524
if [[ $GITHUB_REF == refs/tags/* ]]; then
2625
echo IMAGE_TAG="${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
26+
else
27+
echo IMAGE_TAG="snapshot" >> $GITHUB_ENV
2728
fi
28-
29-
# TODO dtfranz
30-
# This action uses node12 and the source repo is archived;
31-
# we should remove it or find a suitable replacement before it becomes a blocker.
29+
3230
- name: Create a draft release
33-
uses: actions/create-release@v1
31+
uses: softprops/action-gh-release@v2
3432
id: release
3533
if: startsWith(github.ref, 'refs/tags')
3634
env:
@@ -42,7 +40,6 @@ jobs:
4240

4341
- name: Set up QEMU
4442
uses: docker/setup-qemu-action@v3
45-
if: startsWith(github.ref, 'refs/tags')
4643

4744
- name: Docker Login
4845
uses: docker/login-action@v3
@@ -54,17 +51,15 @@ jobs:
5451

5552
- name: Run GoReleaser
5653
uses: goreleaser/goreleaser-action@v6
57-
if: startsWith(github.ref, 'refs/tags')
5854
with:
5955
version: 0.177.0
60-
args: release --rm-dist
56+
args: release --rm-dist ${{ github.event_name == 'pull_request' && '--snapshot' || '' }}
6157
env:
6258
GITHUB_TOKEN: ${{ github.token }}
6359
IMAGE_REPO: quay.io/operator-framework/olm
6460
PKG: github.com/operator-framework/operator-lifecycle-manager
6561

6662
- name: Generate quickstart release manifests
67-
if: startsWith(github.ref, 'refs/tags')
6863
run: make release ver=${{ env.IMAGE_TAG }} IMAGE_REPO=quay.io/operator-framework/olm
6964

7065
- name: Update release artifacts with rendered Kubernetes release manifests

‎staging/operator-lifecycle-manager/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,7 @@ E2E_TIMEOUT ?= 90m
247247
E2E_TEST_NS ?= operators
248248
E2E_INSTALL_NS ?= operator-lifecycle-manager
249249
E2E_CATALOG_NS ?= $(E2E_INSTALL_NS)
250-
E2E_FLAKE_ATTEMPTS ?= 1
251-
GINKGO_OPTS += -v -randomize-suites -race -trace --show-node-events --flake-attempts=$(E2E_FLAKE_ATTEMPTS) $(if $(E2E_SEED),-seed '$(E2E_SEED)') $(if $(TEST),-focus '$(TEST)',) $(if $(SKIP), -skip '$(SKIP)')
250+
GINKGO_OPTS += -v -randomize-suites -race -trace $(if $(E2E_FLAKE_ATTEMPTS),--flake-attempts='$(E2E_FLAKE_ATTEMPTS)') $(if $(E2E_SEED),-seed '$(E2E_SEED)') $(if $(TEST),-focus '$(TEST)',) $(if $(SKIP), -skip '$(SKIP)')
252251

253252
.PHONY: e2e
254253
e2e: #HELP Run e2e tests against a cluster running OLM (params: $E2E_TEST_NS (operator), $E2E_INSTALL_NS (operator-lifecycle-manager), $E2E_CATALOG_NS (operator-lifecycle-manager), $E2E_TIMEOUT (90m), $E2E_FLAKE_ATTEMPTS (1), $TEST(undefined))

‎staging/operator-lifecycle-manager/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ require (
4040
google.golang.org/grpc v1.64.0
4141
gopkg.in/yaml.v2 v2.4.0
4242
k8s.io/api v0.30.2
43-
k8s.io/apiextensions-apiserver v0.30.1
43+
k8s.io/apiextensions-apiserver v0.30.2
4444
k8s.io/apimachinery v0.30.2
45-
k8s.io/apiserver v0.30.1
45+
k8s.io/apiserver v0.30.2
4646
k8s.io/client-go v0.30.2
4747
k8s.io/code-generator v0.30.2
4848
k8s.io/component-base v0.30.2
4949
k8s.io/klog v1.0.0
5050
k8s.io/klog/v2 v2.120.1
51-
k8s.io/kube-aggregator v0.30.1
51+
k8s.io/kube-aggregator v0.30.2
5252
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
5353
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
5454
sigs.k8s.io/controller-runtime v0.18.4
@@ -168,7 +168,7 @@ require (
168168
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
169169
gopkg.in/yaml.v3 v3.0.1 // indirect
170170
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
171-
k8s.io/kms v0.30.1 // indirect
171+
k8s.io/kms v0.30.2 // indirect
172172
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
173173
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
174174
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

‎staging/operator-lifecycle-manager/go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2818,12 +2818,12 @@ honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
28182818
honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las=
28192819
k8s.io/api v0.30.2 h1:+ZhRj+28QT4UOH+BKznu4CBgPWgkXO7XAvMcMl0qKvI=
28202820
k8s.io/api v0.30.2/go.mod h1:ULg5g9JvOev2dG0u2hig4Z7tQ2hHIuS+m8MNZ+X6EmI=
2821-
k8s.io/apiextensions-apiserver v0.30.1 h1:4fAJZ9985BmpJG6PkoxVRpXv9vmPUOVzl614xarePws=
2822-
k8s.io/apiextensions-apiserver v0.30.1/go.mod h1:R4GuSrlhgq43oRY9sF2IToFh7PVlF1JjfWdoG3pixk4=
2821+
k8s.io/apiextensions-apiserver v0.30.2 h1:l7Eue2t6QiLHErfn2vwK4KgF4NeDgjQkCXtEbOocKIE=
2822+
k8s.io/apiextensions-apiserver v0.30.2/go.mod h1:lsJFLYyK40iguuinsb3nt+Sj6CmodSI4ACDLep1rgjw=
28232823
k8s.io/apimachinery v0.30.2 h1:fEMcnBj6qkzzPGSVsAZtQThU62SmQ4ZymlXRC5yFSCg=
28242824
k8s.io/apimachinery v0.30.2/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
2825-
k8s.io/apiserver v0.30.1 h1:BEWEe8bzS12nMtDKXzCF5Q5ovp6LjjYkSp8qOPk8LZ8=
2826-
k8s.io/apiserver v0.30.1/go.mod h1:i87ZnQ+/PGAmSbD/iEKM68bm1D5reX8fO4Ito4B01mo=
2825+
k8s.io/apiserver v0.30.2 h1:ACouHiYl1yFI2VFI3YGM+lvxgy6ir4yK2oLOsLI1/tw=
2826+
k8s.io/apiserver v0.30.2/go.mod h1:BOTdFBIch9Sv0ypSEcUR6ew/NUFGocRFNl72Ra7wTm8=
28272827
k8s.io/client-go v0.30.2 h1:sBIVJdojUNPDU/jObC+18tXWcTJVcwyqS9diGdWHk50=
28282828
k8s.io/client-go v0.30.2/go.mod h1:JglKSWULm9xlJLx4KCkfLLQ7XwtlbflV6uFFSHTMgVs=
28292829
k8s.io/code-generator v0.30.2 h1:ZY1+aGkqZVwKIyGsOzquaeZ5rSfE6wZHur8z3jQAaiw=
@@ -2836,10 +2836,10 @@ k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
28362836
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
28372837
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
28382838
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
2839-
k8s.io/kms v0.30.1 h1:gEIbEeCbFiaN2tNfp/EUhFdGr5/CSj8Eyq6Mkr7cCiY=
2840-
k8s.io/kms v0.30.1/go.mod h1:GrMurD0qk3G4yNgGcsCEmepqf9KyyIrTXYR2lyUOJC4=
2841-
k8s.io/kube-aggregator v0.30.1 h1:ymR2BsxDacTKwzKTuNhGZttuk009c+oZbSeD+IPX5q4=
2842-
k8s.io/kube-aggregator v0.30.1/go.mod h1:SFbqWsM6ea8dHd3mPLsZFzJHbjBOS5ykIgJh4znZ5iQ=
2839+
k8s.io/kms v0.30.2 h1:VSZILO/tkzrz5Tu2j+yFQZ2Dc5JerQZX2GqhFJbQrfw=
2840+
k8s.io/kms v0.30.2/go.mod h1:GrMurD0qk3G4yNgGcsCEmepqf9KyyIrTXYR2lyUOJC4=
2841+
k8s.io/kube-aggregator v0.30.2 h1:0+yk/ED6foCprY8VmkDPUhngjaAPKsNTXB/UrtvbIz0=
2842+
k8s.io/kube-aggregator v0.30.2/go.mod h1:EhqCfDdxysNWXk1wRL9SEHAdo1DKl6EULQagztkBcXE=
28432843
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
28442844
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
28452845
k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ=

‎vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation.go

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/validation.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/apiserver/pkg/admission/plugin/cel/compile.go

Lines changed: 36 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/apiserver/pkg/admission/plugin/cel/interface.go

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/apiserver/pkg/admission/plugin/policy/validating/plugin.go

Lines changed: 21 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/apiserver/pkg/admission/plugin/policy/validating/typechecking.go

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)