From 0685a438547b5ab1f980c08b89e1f48be410c46e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 21 Mar 2026 12:50:39 +0000 Subject: [PATCH 1/2] [release-1.36][gomod]: Bump the patch group across 1 directory with 3 updates Bumps the patch group with 3 updates in the / directory: [github.com/spf13/pflag](https://github.com/spf13/pflag), [go.uber.org/zap](https://github.com/uber-go/zap) and [github.com/go-logr/logr](https://github.com/go-logr/logr). Updates `github.com/spf13/pflag` from 1.0.6-0.20210604193023-d5e0c0615ace to 1.0.10 - [Release notes](https://github.com/spf13/pflag/releases) - [Commits](https://github.com/spf13/pflag/commits/v1.0.10) Updates `go.uber.org/zap` from 1.27.0 to 1.27.1 - [Release notes](https://github.com/uber-go/zap/releases) - [Changelog](https://github.com/uber-go/zap/blob/master/CHANGELOG.md) - [Commits](https://github.com/uber-go/zap/compare/v1.27.0...v1.27.1) Updates `github.com/go-logr/logr` from 1.4.2 to 1.4.3 - [Release notes](https://github.com/go-logr/logr/releases) - [Changelog](https://github.com/go-logr/logr/blob/master/CHANGELOG.md) - [Commits](https://github.com/go-logr/logr/compare/v1.4.2...v1.4.3) --- updated-dependencies: - dependency-name: github.com/spf13/pflag dependency-version: 1.0.10 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch - dependency-name: go.uber.org/zap dependency-version: 1.27.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch - dependency-name: github.com/go-logr/logr dependency-version: 1.4.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch ... Signed-off-by: dependabot[bot] --- go.mod | 6 +- go.sum | 11 +- vendor/github.com/IBM/sarama/entrypoint.sh | 0 .../github.com/cespare/xxhash/v2/testall.sh | 0 .../emicklei/go-restful/v3/bench_test.sh | 0 .../emicklei/go-restful/v3/coverage.sh | 0 vendor/github.com/go-logr/logr/.golangci.yaml | 16 +- .../v2/internal/httprule/BUILD.bazel | 35 ++++ .../grpc-gateway/v2/runtime/BUILD.bazel | 97 ++++++++++++ .../grpc-gateway/v2/utilities/BUILD.bazel | 31 ++++ vendor/github.com/json-iterator/go/build.sh | 0 vendor/github.com/json-iterator/go/test.sh | 0 vendor/github.com/klauspost/compress/gen.sh | 0 .../manifestival/manifestival/manifestival.go | 10 +- .../github.com/modern-go/concurrent/test.sh | 0 .../api/route/v1/test-route-validation.sh | 0 vendor/github.com/pelletier/go-toml/v2/ci.sh | 0 .../rcrowley/go-metrics/validate.sh | 0 .../github.com/rickb777/plural/build+test.sh | 0 vendor/github.com/spf13/pflag/.editorconfig | 12 ++ vendor/github.com/spf13/pflag/.golangci.yaml | 4 + vendor/github.com/spf13/pflag/README.md | 27 ++++ vendor/github.com/spf13/pflag/bool_func.go | 40 +++++ vendor/github.com/spf13/pflag/count.go | 2 +- vendor/github.com/spf13/pflag/errors.go | 149 ++++++++++++++++++ vendor/github.com/spf13/pflag/flag.go | 121 +++++++++----- vendor/github.com/spf13/pflag/func.go | 37 +++++ vendor/github.com/spf13/pflag/golangflag.go | 56 +++++++ vendor/github.com/spf13/pflag/ipnet_slice.go | 2 +- .../spf13/pflag/string_to_string.go | 10 +- vendor/github.com/spf13/pflag/text.go | 81 ++++++++++ vendor/github.com/spf13/pflag/time.go | 124 +++++++++++++++ vendor/go.uber.org/zap/.golangci.yml | 2 +- vendor/go.uber.org/zap/CHANGELOG.md | 10 ++ vendor/go.uber.org/zap/CODE_OF_CONDUCT.md | 4 +- vendor/go.uber.org/zap/LICENSE | 2 +- vendor/go.uber.org/zap/Makefile | 2 +- vendor/go.uber.org/zap/checklicense.sh | 0 vendor/go.uber.org/zap/field.go | 10 ++ vendor/go.uber.org/zap/http_handler.go | 2 +- vendor/go.uber.org/zap/logger.go | 6 +- vendor/go.uber.org/zap/options.go | 6 +- vendor/go.uber.org/zap/sink.go | 2 +- .../zap/zapcore/buffered_write_syncer.go | 23 +-- .../zap/zapcore/console_encoder.go | 2 +- vendor/go.uber.org/zap/zapcore/entry.go | 14 +- vendor/go.uber.org/zap/zapcore/lazy_with.go | 35 +++- vendor/go.uber.org/zap/zapcore/level.go | 14 +- vendor/golang.org/x/sys/plan9/mkall.sh | 0 vendor/golang.org/x/sys/plan9/mkerrors.sh | 0 .../golang.org/x/sys/plan9/mksysnum_plan9.sh | 0 vendor/golang.org/x/sys/unix/mkall.sh | 0 vendor/golang.org/x/sys/unix/mkerrors.sh | 0 .../k8s.io/apimachinery/pkg/api/errors/OWNERS | 16 ++ .../k8s.io/apimachinery/pkg/api/meta/OWNERS | 14 ++ .../apimachinery/pkg/api/resource/OWNERS | 10 ++ .../apimachinery/pkg/api/validation/OWNERS | 11 ++ .../apimachinery/pkg/apis/meta/v1/OWNERS | 16 ++ .../apimachinery/pkg/util/mergepatch/OWNERS | 6 + .../pkg/util/strategicpatch/OWNERS | 9 ++ .../apimachinery/pkg/util/validation/OWNERS | 11 ++ .../third_party/forked/golang/json/OWNERS | 6 + vendor/k8s.io/client-go/openapi/OWNERS | 4 + .../pkg/apis/clientauthentication/OWNERS | 8 + vendor/k8s.io/client-go/rest/OWNERS | 14 ++ vendor/k8s.io/client-go/tools/auth/OWNERS | 8 + vendor/k8s.io/client-go/tools/cache/OWNERS | 28 ++++ .../client-go/tools/leaderelection/OWNERS | 11 ++ vendor/k8s.io/client-go/tools/metrics/OWNERS | 5 + vendor/k8s.io/client-go/tools/record/OWNERS | 6 + vendor/k8s.io/client-go/transport/OWNERS | 8 + vendor/k8s.io/client-go/util/cert/OWNERS | 8 + vendor/k8s.io/client-go/util/keyutil/OWNERS | 6 + vendor/k8s.io/client-go/util/retry/OWNERS | 4 + vendor/k8s.io/code-generator/OWNERS | 15 ++ .../code-generator/cmd/client-gen/OWNERS | 11 ++ .../code-generator/cmd/go-to-protobuf/OWNERS | 6 + .../k8s.io/code-generator/generate-groups.sh | 0 .../generate-internal-groups.sh | 0 vendor/k8s.io/code-generator/kube_codegen.sh | 0 vendor/k8s.io/klog/v2/OWNERS | 16 ++ .../kube-openapi/pkg/generators/rules/OWNERS | 4 + .../k8s.io/kube-openapi/pkg/util/proto/OWNERS | 2 + vendor/k8s.io/utils/pointer/OWNERS | 10 ++ vendor/k8s.io/utils/ptr/OWNERS | 10 ++ vendor/knative.dev/eventing/test/OWNERS | 10 ++ .../knative.dev/eventing/test/e2e-common.sh | 0 .../eventing/test/e2e-conformance-tests.sh | 0 .../eventing/test/e2e-rekt-tests.sh | 0 vendor/knative.dev/eventing/test/e2e-tests.sh | 0 .../eventing/test/e2e-upgrade-tests.sh | 0 .../test/lib/recordevents/resources.go | 4 - .../eventing/test/microbenchmarks-compare.sh | 0 .../eventing/test/microbenchmarks-run.sh | 0 .../eventing/test/presubmit-tests.sh | 0 .../eventing/test/upload-test-images.sh | 0 vendor/knative.dev/hack/OWNERS | 8 + vendor/knative.dev/hack/OWNERS_ALIASES | 143 +++++++++++++++++ vendor/knative.dev/hack/codegen-library.sh | 0 vendor/knative.dev/hack/e2e-tests.sh | 0 vendor/knative.dev/hack/infra-library.sh | 0 vendor/knative.dev/hack/library.sh | 0 vendor/knative.dev/hack/microbenchmarks.sh | 0 vendor/knative.dev/hack/performance-tests.sh | 0 vendor/knative.dev/hack/presubmit-tests.sh | 0 vendor/knative.dev/hack/release.sh | 0 .../knative.dev/hack/shellcheck-presubmit.sh | 0 .../v1beta1/knativeeventing_lifecycle.go | 3 +- .../v1beta1/knativeserving_lifecycle.go | 3 +- .../operator/pkg/reconciler/common/job.go | 2 +- .../pkg/reconciler/common/releases.go | 26 ++- .../reconciler/knativeeventing/controller.go | 20 --- .../eventing_backstage_plugin.go | 79 ---------- .../knativeeventing/knativeeventing.go | 9 +- .../knativeserving/knativeserving.go | 33 +--- vendor/knative.dev/pkg/apis/OWNERS | 15 ++ vendor/knative.dev/pkg/apis/duck/OWNERS | 8 + vendor/knative.dev/pkg/controller/OWNERS | 7 + .../pkg/environment/client_config.go | 6 +- vendor/knative.dev/pkg/hack/format-code.sh | 0 .../knative.dev/pkg/hack/generate-knative.sh | 0 vendor/knative.dev/pkg/hack/update-codegen.sh | 0 vendor/knative.dev/pkg/hack/update-deps.sh | 0 vendor/knative.dev/pkg/hack/verify-codegen.sh | 0 vendor/knative.dev/pkg/reconciler/OWNERS | 7 + vendor/knative.dev/pkg/resolver/OWNERS | 8 + vendor/knative.dev/pkg/test/OWNERS | 10 ++ vendor/knative.dev/pkg/test/helpers/name.go | 2 +- .../knative.dev/pkg/test/presubmit-tests.sh | 0 .../pkg/test/spoof/openshift_checks.go | 22 --- vendor/knative.dev/pkg/test/spoof/spoof.go | 5 +- .../pkg/test/test-reconciler-codegen.sh | 0 .../pkg/test/upgrade/shell/fail-example.sh | 0 vendor/knative.dev/pkg/webhook/OWNERS | 7 + .../conversion/reconciler.go | 4 - .../reconciler-test/pkg/feature/feature.go | 9 -- vendor/knative.dev/serving/test/e2e-common.sh | 0 .../test/e2e-external-domain-tls-tests.sh | 0 .../serving/test/e2e-networking-library.sh | 0 vendor/knative.dev/serving/test/e2e-tests.sh | 0 .../serving/test/e2e-upgrade-tests.sh | 0 .../serving/test/presubmit-tests.sh | 0 .../serving/test/upload-test-images.sh | 0 vendor/modules.txt | 6 +- vendor/sigs.k8s.io/json/OWNERS | 6 + vendor/sigs.k8s.io/yaml/OWNERS | 23 +++ vendor/sigs.k8s.io/yaml/goyaml.v2/OWNERS | 24 +++ 147 files changed, 1494 insertions(+), 303 deletions(-) mode change 100755 => 100644 vendor/github.com/IBM/sarama/entrypoint.sh mode change 100755 => 100644 vendor/github.com/cespare/xxhash/v2/testall.sh mode change 100755 => 100644 vendor/github.com/emicklei/go-restful/v3/bench_test.sh mode change 100755 => 100644 vendor/github.com/emicklei/go-restful/v3/coverage.sh create mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/v2/internal/httprule/BUILD.bazel create mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/v2/runtime/BUILD.bazel create mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/v2/utilities/BUILD.bazel mode change 100755 => 100644 vendor/github.com/json-iterator/go/build.sh mode change 100755 => 100644 vendor/github.com/json-iterator/go/test.sh mode change 100755 => 100644 vendor/github.com/klauspost/compress/gen.sh mode change 100755 => 100644 vendor/github.com/modern-go/concurrent/test.sh mode change 100755 => 100644 vendor/github.com/openshift/api/route/v1/test-route-validation.sh mode change 100755 => 100644 vendor/github.com/pelletier/go-toml/v2/ci.sh mode change 100755 => 100644 vendor/github.com/rcrowley/go-metrics/validate.sh mode change 100755 => 100644 vendor/github.com/rickb777/plural/build+test.sh create mode 100644 vendor/github.com/spf13/pflag/.editorconfig create mode 100644 vendor/github.com/spf13/pflag/.golangci.yaml create mode 100644 vendor/github.com/spf13/pflag/bool_func.go create mode 100644 vendor/github.com/spf13/pflag/errors.go create mode 100644 vendor/github.com/spf13/pflag/func.go create mode 100644 vendor/github.com/spf13/pflag/text.go create mode 100644 vendor/github.com/spf13/pflag/time.go mode change 100755 => 100644 vendor/go.uber.org/zap/checklicense.sh mode change 100755 => 100644 vendor/golang.org/x/sys/plan9/mkall.sh mode change 100755 => 100644 vendor/golang.org/x/sys/plan9/mkerrors.sh mode change 100755 => 100644 vendor/golang.org/x/sys/plan9/mksysnum_plan9.sh mode change 100755 => 100644 vendor/golang.org/x/sys/unix/mkall.sh mode change 100755 => 100644 vendor/golang.org/x/sys/unix/mkerrors.sh create mode 100644 vendor/k8s.io/apimachinery/pkg/api/errors/OWNERS create mode 100644 vendor/k8s.io/apimachinery/pkg/api/meta/OWNERS create mode 100644 vendor/k8s.io/apimachinery/pkg/api/resource/OWNERS create mode 100644 vendor/k8s.io/apimachinery/pkg/api/validation/OWNERS create mode 100644 vendor/k8s.io/apimachinery/pkg/apis/meta/v1/OWNERS create mode 100644 vendor/k8s.io/apimachinery/pkg/util/mergepatch/OWNERS create mode 100644 vendor/k8s.io/apimachinery/pkg/util/strategicpatch/OWNERS create mode 100644 vendor/k8s.io/apimachinery/pkg/util/validation/OWNERS create mode 100644 vendor/k8s.io/apimachinery/third_party/forked/golang/json/OWNERS create mode 100644 vendor/k8s.io/client-go/openapi/OWNERS create mode 100644 vendor/k8s.io/client-go/pkg/apis/clientauthentication/OWNERS create mode 100644 vendor/k8s.io/client-go/rest/OWNERS create mode 100644 vendor/k8s.io/client-go/tools/auth/OWNERS create mode 100644 vendor/k8s.io/client-go/tools/cache/OWNERS create mode 100644 vendor/k8s.io/client-go/tools/leaderelection/OWNERS create mode 100644 vendor/k8s.io/client-go/tools/metrics/OWNERS create mode 100644 vendor/k8s.io/client-go/tools/record/OWNERS create mode 100644 vendor/k8s.io/client-go/transport/OWNERS create mode 100644 vendor/k8s.io/client-go/util/cert/OWNERS create mode 100644 vendor/k8s.io/client-go/util/keyutil/OWNERS create mode 100644 vendor/k8s.io/client-go/util/retry/OWNERS create mode 100644 vendor/k8s.io/code-generator/OWNERS create mode 100644 vendor/k8s.io/code-generator/cmd/client-gen/OWNERS create mode 100644 vendor/k8s.io/code-generator/cmd/go-to-protobuf/OWNERS mode change 100755 => 100644 vendor/k8s.io/code-generator/generate-groups.sh mode change 100755 => 100644 vendor/k8s.io/code-generator/generate-internal-groups.sh mode change 100755 => 100644 vendor/k8s.io/code-generator/kube_codegen.sh create mode 100644 vendor/k8s.io/klog/v2/OWNERS create mode 100644 vendor/k8s.io/kube-openapi/pkg/generators/rules/OWNERS create mode 100644 vendor/k8s.io/kube-openapi/pkg/util/proto/OWNERS create mode 100644 vendor/k8s.io/utils/pointer/OWNERS create mode 100644 vendor/k8s.io/utils/ptr/OWNERS create mode 100644 vendor/knative.dev/eventing/test/OWNERS mode change 100755 => 100644 vendor/knative.dev/eventing/test/e2e-common.sh mode change 100755 => 100644 vendor/knative.dev/eventing/test/e2e-conformance-tests.sh mode change 100755 => 100644 vendor/knative.dev/eventing/test/e2e-rekt-tests.sh mode change 100755 => 100644 vendor/knative.dev/eventing/test/e2e-tests.sh mode change 100755 => 100644 vendor/knative.dev/eventing/test/e2e-upgrade-tests.sh mode change 100755 => 100644 vendor/knative.dev/eventing/test/microbenchmarks-compare.sh mode change 100755 => 100644 vendor/knative.dev/eventing/test/microbenchmarks-run.sh mode change 100755 => 100644 vendor/knative.dev/eventing/test/presubmit-tests.sh mode change 100755 => 100644 vendor/knative.dev/eventing/test/upload-test-images.sh create mode 100644 vendor/knative.dev/hack/OWNERS create mode 100644 vendor/knative.dev/hack/OWNERS_ALIASES mode change 100755 => 100644 vendor/knative.dev/hack/codegen-library.sh mode change 100755 => 100644 vendor/knative.dev/hack/e2e-tests.sh mode change 100755 => 100644 vendor/knative.dev/hack/infra-library.sh mode change 100755 => 100644 vendor/knative.dev/hack/library.sh mode change 100755 => 100644 vendor/knative.dev/hack/microbenchmarks.sh mode change 100755 => 100644 vendor/knative.dev/hack/performance-tests.sh mode change 100755 => 100644 vendor/knative.dev/hack/presubmit-tests.sh mode change 100755 => 100644 vendor/knative.dev/hack/release.sh mode change 100755 => 100644 vendor/knative.dev/hack/shellcheck-presubmit.sh delete mode 100644 vendor/knative.dev/operator/pkg/reconciler/knativeeventing/eventing_backstage_plugin.go create mode 100644 vendor/knative.dev/pkg/apis/OWNERS create mode 100644 vendor/knative.dev/pkg/apis/duck/OWNERS create mode 100644 vendor/knative.dev/pkg/controller/OWNERS mode change 100755 => 100644 vendor/knative.dev/pkg/hack/format-code.sh mode change 100755 => 100644 vendor/knative.dev/pkg/hack/generate-knative.sh mode change 100755 => 100644 vendor/knative.dev/pkg/hack/update-codegen.sh mode change 100755 => 100644 vendor/knative.dev/pkg/hack/update-deps.sh mode change 100755 => 100644 vendor/knative.dev/pkg/hack/verify-codegen.sh create mode 100644 vendor/knative.dev/pkg/reconciler/OWNERS create mode 100644 vendor/knative.dev/pkg/resolver/OWNERS create mode 100644 vendor/knative.dev/pkg/test/OWNERS mode change 100755 => 100644 vendor/knative.dev/pkg/test/presubmit-tests.sh delete mode 100644 vendor/knative.dev/pkg/test/spoof/openshift_checks.go mode change 100755 => 100644 vendor/knative.dev/pkg/test/test-reconciler-codegen.sh mode change 100755 => 100644 vendor/knative.dev/pkg/test/upgrade/shell/fail-example.sh create mode 100644 vendor/knative.dev/pkg/webhook/OWNERS mode change 100755 => 100644 vendor/knative.dev/serving/test/e2e-common.sh mode change 100755 => 100644 vendor/knative.dev/serving/test/e2e-external-domain-tls-tests.sh mode change 100755 => 100644 vendor/knative.dev/serving/test/e2e-networking-library.sh mode change 100755 => 100644 vendor/knative.dev/serving/test/e2e-tests.sh mode change 100755 => 100644 vendor/knative.dev/serving/test/e2e-upgrade-tests.sh mode change 100755 => 100644 vendor/knative.dev/serving/test/presubmit-tests.sh mode change 100755 => 100644 vendor/knative.dev/serving/test/upload-test-images.sh create mode 100644 vendor/sigs.k8s.io/json/OWNERS create mode 100644 vendor/sigs.k8s.io/yaml/OWNERS create mode 100644 vendor/sigs.k8s.io/yaml/goyaml.v2/OWNERS diff --git a/go.mod b/go.mod index b231c534dd..b9805506f4 100644 --- a/go.mod +++ b/go.mod @@ -17,9 +17,9 @@ require ( github.com/prometheus-operator/prometheus-operator/pkg/client v0.76.2 github.com/prometheus/client_golang v1.20.5 github.com/prometheus/common v0.60.1 - github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace + github.com/spf13/pflag v1.0.10 github.com/stretchr/testify v1.9.0 - go.uber.org/zap v1.27.0 + go.uber.org/zap v1.27.1 golang.org/x/sync v0.10.0 google.golang.org/grpc v1.67.1 k8s.io/api v0.31.0 @@ -165,7 +165,7 @@ require ( ) require ( - github.com/go-logr/logr v1.4.2 + github.com/go-logr/logr v1.4.3 go.uber.org/atomic v1.11.0 // indirect k8s.io/apiextensions-apiserver v0.31.0 knative.dev/reconciler-test v0.0.0-20250411085513-cfed924c2716 diff --git a/go.sum b/go.sum index be5aa571b1..82a78e7c3d 100644 --- a/go.sum +++ b/go.sum @@ -973,8 +973,9 @@ github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbV github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= -github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= +github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ= github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg= @@ -1549,8 +1550,8 @@ github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb6 github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace h1:9PNP1jnUjRhfmGMlkXHjYPishpcw4jpSt/V/xYY3FMA= -github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= +github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= @@ -1674,8 +1675,8 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= -go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= -go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc= +go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/vendor/github.com/IBM/sarama/entrypoint.sh b/vendor/github.com/IBM/sarama/entrypoint.sh old mode 100755 new mode 100644 diff --git a/vendor/github.com/cespare/xxhash/v2/testall.sh b/vendor/github.com/cespare/xxhash/v2/testall.sh old mode 100755 new mode 100644 diff --git a/vendor/github.com/emicklei/go-restful/v3/bench_test.sh b/vendor/github.com/emicklei/go-restful/v3/bench_test.sh old mode 100755 new mode 100644 diff --git a/vendor/github.com/emicklei/go-restful/v3/coverage.sh b/vendor/github.com/emicklei/go-restful/v3/coverage.sh old mode 100755 new mode 100644 diff --git a/vendor/github.com/go-logr/logr/.golangci.yaml b/vendor/github.com/go-logr/logr/.golangci.yaml index 0cffafa7bf..0ed62c1a18 100644 --- a/vendor/github.com/go-logr/logr/.golangci.yaml +++ b/vendor/github.com/go-logr/logr/.golangci.yaml @@ -1,26 +1,28 @@ +version: "2" + run: timeout: 1m tests: true linters: - disable-all: true - enable: + default: none + enable: # please keep this alphabetized + - asasalint - asciicheck + - copyloopvar + - dupl - errcheck - forcetypeassert + - goconst - gocritic - - gofmt - - goimports - - gosimple - govet - ineffassign - misspell + - musttag - revive - staticcheck - - typecheck - unused issues: - exclude-use-default: false max-issues-per-linter: 0 max-same-issues: 10 diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/internal/httprule/BUILD.bazel b/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/internal/httprule/BUILD.bazel new file mode 100644 index 0000000000..b8fbb2b77c --- /dev/null +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/internal/httprule/BUILD.bazel @@ -0,0 +1,35 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") + +package(default_visibility = ["//visibility:public"]) + +go_library( + name = "httprule", + srcs = [ + "compile.go", + "parse.go", + "types.go", + ], + importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/internal/httprule", + deps = ["//utilities"], +) + +go_test( + name = "httprule_test", + size = "small", + srcs = [ + "compile_test.go", + "parse_test.go", + "types_test.go", + ], + embed = [":httprule"], + deps = [ + "//utilities", + "@org_golang_google_grpc//grpclog", + ], +) + +alias( + name = "go_default_library", + actual = ":httprule", + visibility = ["//:__subpackages__"], +) diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/runtime/BUILD.bazel b/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/runtime/BUILD.bazel new file mode 100644 index 0000000000..a65d88eb86 --- /dev/null +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/runtime/BUILD.bazel @@ -0,0 +1,97 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") + +package(default_visibility = ["//visibility:public"]) + +go_library( + name = "runtime", + srcs = [ + "context.go", + "convert.go", + "doc.go", + "errors.go", + "fieldmask.go", + "handler.go", + "marshal_httpbodyproto.go", + "marshal_json.go", + "marshal_jsonpb.go", + "marshal_proto.go", + "marshaler.go", + "marshaler_registry.go", + "mux.go", + "pattern.go", + "proto2_convert.go", + "query.go", + ], + importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/runtime", + deps = [ + "//internal/httprule", + "//utilities", + "@org_golang_google_genproto_googleapis_api//httpbody", + "@org_golang_google_grpc//codes", + "@org_golang_google_grpc//grpclog", + "@org_golang_google_grpc//health/grpc_health_v1", + "@org_golang_google_grpc//metadata", + "@org_golang_google_grpc//status", + "@org_golang_google_protobuf//encoding/protojson", + "@org_golang_google_protobuf//proto", + "@org_golang_google_protobuf//reflect/protoreflect", + "@org_golang_google_protobuf//reflect/protoregistry", + "@org_golang_google_protobuf//types/known/durationpb", + "@org_golang_google_protobuf//types/known/fieldmaskpb", + "@org_golang_google_protobuf//types/known/structpb", + "@org_golang_google_protobuf//types/known/timestamppb", + "@org_golang_google_protobuf//types/known/wrapperspb", + ], +) + +go_test( + name = "runtime_test", + size = "small", + srcs = [ + "context_test.go", + "convert_test.go", + "errors_test.go", + "fieldmask_test.go", + "handler_test.go", + "marshal_httpbodyproto_test.go", + "marshal_json_test.go", + "marshal_jsonpb_test.go", + "marshal_proto_test.go", + "marshaler_registry_test.go", + "mux_internal_test.go", + "mux_test.go", + "pattern_test.go", + "query_fuzz_test.go", + "query_test.go", + ], + embed = [":runtime"], + deps = [ + "//runtime/internal/examplepb", + "//utilities", + "@com_github_google_go_cmp//cmp", + "@com_github_google_go_cmp//cmp/cmpopts", + "@org_golang_google_genproto_googleapis_api//httpbody", + "@org_golang_google_genproto_googleapis_rpc//errdetails", + "@org_golang_google_genproto_googleapis_rpc//status", + "@org_golang_google_grpc//:grpc", + "@org_golang_google_grpc//codes", + "@org_golang_google_grpc//health/grpc_health_v1", + "@org_golang_google_grpc//metadata", + "@org_golang_google_grpc//status", + "@org_golang_google_protobuf//encoding/protojson", + "@org_golang_google_protobuf//proto", + "@org_golang_google_protobuf//testing/protocmp", + "@org_golang_google_protobuf//types/known/durationpb", + "@org_golang_google_protobuf//types/known/emptypb", + "@org_golang_google_protobuf//types/known/fieldmaskpb", + "@org_golang_google_protobuf//types/known/structpb", + "@org_golang_google_protobuf//types/known/timestamppb", + "@org_golang_google_protobuf//types/known/wrapperspb", + ], +) + +alias( + name = "go_default_library", + actual = ":runtime", + visibility = ["//visibility:public"], +) diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/utilities/BUILD.bazel b/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/utilities/BUILD.bazel new file mode 100644 index 0000000000..b894094657 --- /dev/null +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/utilities/BUILD.bazel @@ -0,0 +1,31 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") + +package(default_visibility = ["//visibility:public"]) + +go_library( + name = "utilities", + srcs = [ + "doc.go", + "pattern.go", + "readerfactory.go", + "string_array_flag.go", + "trie.go", + ], + importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/utilities", +) + +go_test( + name = "utilities_test", + size = "small", + srcs = [ + "string_array_flag_test.go", + "trie_test.go", + ], + deps = [":utilities"], +) + +alias( + name = "go_default_library", + actual = ":utilities", + visibility = ["//visibility:public"], +) diff --git a/vendor/github.com/json-iterator/go/build.sh b/vendor/github.com/json-iterator/go/build.sh old mode 100755 new mode 100644 diff --git a/vendor/github.com/json-iterator/go/test.sh b/vendor/github.com/json-iterator/go/test.sh old mode 100755 new mode 100644 diff --git a/vendor/github.com/klauspost/compress/gen.sh b/vendor/github.com/klauspost/compress/gen.sh old mode 100755 new mode 100644 diff --git a/vendor/github.com/manifestival/manifestival/manifestival.go b/vendor/github.com/manifestival/manifestival/manifestival.go index 892433fb61..b8d07b8bc2 100644 --- a/vendor/github.com/manifestival/manifestival/manifestival.go +++ b/vendor/github.com/manifestival/manifestival/manifestival.go @@ -133,7 +133,7 @@ func (m Manifest) apply(spec *unstructured.Unstructured, opts ...ApplyOption) er annotate(current, v1.LastAppliedConfigAnnotation, lastApplied(current)) return m.Client.Create(current, opts...) } else { - diff, err := patch.New(unsetStatus(current), unsetStatus(spec)) + diff, err := patch.New(current, spec) if err != nil { return err } @@ -156,14 +156,6 @@ func (m Manifest) apply(spec *unstructured.Unstructured, opts ...ApplyOption) er } } -func unsetStatus(spec *unstructured.Unstructured) *unstructured.Unstructured { - spec = spec.DeepCopy() - if _, ok := spec.Object["status"]; ok { - spec.Object["status"] = nil - } - return spec -} - // update a single resource func (m Manifest) update(live, spec *unstructured.Unstructured, opts ...ApplyOption) error { m.logResource("Updating", live) diff --git a/vendor/github.com/modern-go/concurrent/test.sh b/vendor/github.com/modern-go/concurrent/test.sh old mode 100755 new mode 100644 diff --git a/vendor/github.com/openshift/api/route/v1/test-route-validation.sh b/vendor/github.com/openshift/api/route/v1/test-route-validation.sh old mode 100755 new mode 100644 diff --git a/vendor/github.com/pelletier/go-toml/v2/ci.sh b/vendor/github.com/pelletier/go-toml/v2/ci.sh old mode 100755 new mode 100644 diff --git a/vendor/github.com/rcrowley/go-metrics/validate.sh b/vendor/github.com/rcrowley/go-metrics/validate.sh old mode 100755 new mode 100644 diff --git a/vendor/github.com/rickb777/plural/build+test.sh b/vendor/github.com/rickb777/plural/build+test.sh old mode 100755 new mode 100644 diff --git a/vendor/github.com/spf13/pflag/.editorconfig b/vendor/github.com/spf13/pflag/.editorconfig new file mode 100644 index 0000000000..4492e9f9fe --- /dev/null +++ b/vendor/github.com/spf13/pflag/.editorconfig @@ -0,0 +1,12 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +indent_size = 4 +indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true + +[*.go] +indent_style = tab diff --git a/vendor/github.com/spf13/pflag/.golangci.yaml b/vendor/github.com/spf13/pflag/.golangci.yaml new file mode 100644 index 0000000000..b274f24845 --- /dev/null +++ b/vendor/github.com/spf13/pflag/.golangci.yaml @@ -0,0 +1,4 @@ +linters: + disable-all: true + enable: + - nolintlint diff --git a/vendor/github.com/spf13/pflag/README.md b/vendor/github.com/spf13/pflag/README.md index 7eacc5bdbe..388c4e5ead 100644 --- a/vendor/github.com/spf13/pflag/README.md +++ b/vendor/github.com/spf13/pflag/README.md @@ -284,6 +284,33 @@ func main() { } ``` +### Using pflag with go test +`pflag` does not parse the shorthand versions of go test's built-in flags (i.e., those starting with `-test.`). +For more context, see issues [#63](https://github.com/spf13/pflag/issues/63) and [#238](https://github.com/spf13/pflag/issues/238) for more details. + +For example, if you use pflag in your `TestMain` function and call `pflag.Parse()` after defining your custom flags, running a test like this: +```bash +go test /your/tests -run ^YourTest -v --your-test-pflags +``` +will result in the `-v` flag being ignored. This happens because of the way pflag handles flag parsing, skipping over go test's built-in shorthand flags. +To work around this, you can use the `ParseSkippedFlags` function, which ensures that go test's flags are parsed separately using the standard flag package. + +**Example**: You want to parse go test flags that are otherwise ignore by `pflag.Parse()` +```go +import ( + goflag "flag" + flag "github.com/spf13/pflag" +) + +var ip *int = flag.Int("flagname", 1234, "help message for flagname") + +func main() { + flag.CommandLine.AddGoFlagSet(goflag.CommandLine) + flag.ParseSkippedFlags(os.Args[1:], goflag.CommandLine) + flag.Parse() +} +``` + ## More info You can see the full reference documentation of the pflag package diff --git a/vendor/github.com/spf13/pflag/bool_func.go b/vendor/github.com/spf13/pflag/bool_func.go new file mode 100644 index 0000000000..83d77afa89 --- /dev/null +++ b/vendor/github.com/spf13/pflag/bool_func.go @@ -0,0 +1,40 @@ +package pflag + +// -- func Value +type boolfuncValue func(string) error + +func (f boolfuncValue) Set(s string) error { return f(s) } + +func (f boolfuncValue) Type() string { return "boolfunc" } + +func (f boolfuncValue) String() string { return "" } // same behavior as stdlib 'flag' package + +func (f boolfuncValue) IsBoolFlag() bool { return true } + +// BoolFunc defines a func flag with specified name, callback function and usage string. +// +// The callback function will be called every time "--{name}" (or any form that matches the flag) is parsed +// on the command line. +func (f *FlagSet) BoolFunc(name string, usage string, fn func(string) error) { + f.BoolFuncP(name, "", usage, fn) +} + +// BoolFuncP is like BoolFunc, but accepts a shorthand letter that can be used after a single dash. +func (f *FlagSet) BoolFuncP(name, shorthand string, usage string, fn func(string) error) { + var val Value = boolfuncValue(fn) + flag := f.VarPF(val, name, shorthand, usage) + flag.NoOptDefVal = "true" +} + +// BoolFunc defines a func flag with specified name, callback function and usage string. +// +// The callback function will be called every time "--{name}" (or any form that matches the flag) is parsed +// on the command line. +func BoolFunc(name string, usage string, fn func(string) error) { + CommandLine.BoolFuncP(name, "", usage, fn) +} + +// BoolFuncP is like BoolFunc, but accepts a shorthand letter that can be used after a single dash. +func BoolFuncP(name, shorthand string, usage string, fn func(string) error) { + CommandLine.BoolFuncP(name, shorthand, usage, fn) +} diff --git a/vendor/github.com/spf13/pflag/count.go b/vendor/github.com/spf13/pflag/count.go index a0b2679f71..d49c0143c1 100644 --- a/vendor/github.com/spf13/pflag/count.go +++ b/vendor/github.com/spf13/pflag/count.go @@ -85,7 +85,7 @@ func (f *FlagSet) CountP(name, shorthand string, usage string) *int { // Count defines a count flag with specified name, default value, and usage string. // The return value is the address of an int variable that stores the value of the flag. -// A count flag will add 1 to its value evey time it is found on the command line +// A count flag will add 1 to its value every time it is found on the command line func Count(name string, usage string) *int { return CommandLine.CountP(name, "", usage) } diff --git a/vendor/github.com/spf13/pflag/errors.go b/vendor/github.com/spf13/pflag/errors.go new file mode 100644 index 0000000000..ff11b66bef --- /dev/null +++ b/vendor/github.com/spf13/pflag/errors.go @@ -0,0 +1,149 @@ +package pflag + +import "fmt" + +// notExistErrorMessageType specifies which flavor of "flag does not exist" +// is printed by NotExistError. This allows the related errors to be grouped +// under a single NotExistError struct without making a breaking change to +// the error message text. +type notExistErrorMessageType int + +const ( + flagNotExistMessage notExistErrorMessageType = iota + flagNotDefinedMessage + flagNoSuchFlagMessage + flagUnknownFlagMessage + flagUnknownShorthandFlagMessage +) + +// NotExistError is the error returned when trying to access a flag that +// does not exist in the FlagSet. +type NotExistError struct { + name string + specifiedShorthands string + messageType notExistErrorMessageType +} + +// Error implements error. +func (e *NotExistError) Error() string { + switch e.messageType { + case flagNotExistMessage: + return fmt.Sprintf("flag %q does not exist", e.name) + + case flagNotDefinedMessage: + return fmt.Sprintf("flag accessed but not defined: %s", e.name) + + case flagNoSuchFlagMessage: + return fmt.Sprintf("no such flag -%v", e.name) + + case flagUnknownFlagMessage: + return fmt.Sprintf("unknown flag: --%s", e.name) + + case flagUnknownShorthandFlagMessage: + c := rune(e.name[0]) + return fmt.Sprintf("unknown shorthand flag: %q in -%s", c, e.specifiedShorthands) + } + + panic(fmt.Errorf("unknown flagNotExistErrorMessageType: %v", e.messageType)) +} + +// GetSpecifiedName returns the name of the flag (without dashes) as it +// appeared in the parsed arguments. +func (e *NotExistError) GetSpecifiedName() string { + return e.name +} + +// GetSpecifiedShortnames returns the group of shorthand arguments +// (without dashes) that the flag appeared within. If the flag was not in a +// shorthand group, this will return an empty string. +func (e *NotExistError) GetSpecifiedShortnames() string { + return e.specifiedShorthands +} + +// ValueRequiredError is the error returned when a flag needs an argument but +// no argument was provided. +type ValueRequiredError struct { + flag *Flag + specifiedName string + specifiedShorthands string +} + +// Error implements error. +func (e *ValueRequiredError) Error() string { + if len(e.specifiedShorthands) > 0 { + c := rune(e.specifiedName[0]) + return fmt.Sprintf("flag needs an argument: %q in -%s", c, e.specifiedShorthands) + } + + return fmt.Sprintf("flag needs an argument: --%s", e.specifiedName) +} + +// GetFlag returns the flag for which the error occurred. +func (e *ValueRequiredError) GetFlag() *Flag { + return e.flag +} + +// GetSpecifiedName returns the name of the flag (without dashes) as it +// appeared in the parsed arguments. +func (e *ValueRequiredError) GetSpecifiedName() string { + return e.specifiedName +} + +// GetSpecifiedShortnames returns the group of shorthand arguments +// (without dashes) that the flag appeared within. If the flag was not in a +// shorthand group, this will return an empty string. +func (e *ValueRequiredError) GetSpecifiedShortnames() string { + return e.specifiedShorthands +} + +// InvalidValueError is the error returned when an invalid value is used +// for a flag. +type InvalidValueError struct { + flag *Flag + value string + cause error +} + +// Error implements error. +func (e *InvalidValueError) Error() string { + flag := e.flag + var flagName string + if flag.Shorthand != "" && flag.ShorthandDeprecated == "" { + flagName = fmt.Sprintf("-%s, --%s", flag.Shorthand, flag.Name) + } else { + flagName = fmt.Sprintf("--%s", flag.Name) + } + return fmt.Sprintf("invalid argument %q for %q flag: %v", e.value, flagName, e.cause) +} + +// Unwrap implements errors.Unwrap. +func (e *InvalidValueError) Unwrap() error { + return e.cause +} + +// GetFlag returns the flag for which the error occurred. +func (e *InvalidValueError) GetFlag() *Flag { + return e.flag +} + +// GetValue returns the invalid value that was provided. +func (e *InvalidValueError) GetValue() string { + return e.value +} + +// InvalidSyntaxError is the error returned when a bad flag name is passed on +// the command line. +type InvalidSyntaxError struct { + specifiedFlag string +} + +// Error implements error. +func (e *InvalidSyntaxError) Error() string { + return fmt.Sprintf("bad flag syntax: %s", e.specifiedFlag) +} + +// GetSpecifiedName returns the exact flag (with dashes) as it +// appeared in the parsed arguments. +func (e *InvalidSyntaxError) GetSpecifiedFlag() string { + return e.specifiedFlag +} diff --git a/vendor/github.com/spf13/pflag/flag.go b/vendor/github.com/spf13/pflag/flag.go index 7c058de374..2fd3c57597 100644 --- a/vendor/github.com/spf13/pflag/flag.go +++ b/vendor/github.com/spf13/pflag/flag.go @@ -27,23 +27,32 @@ unaffected. Define flags using flag.String(), Bool(), Int(), etc. This declares an integer flag, -flagname, stored in the pointer ip, with type *int. + var ip = flag.Int("flagname", 1234, "help message for flagname") + If you like, you can bind the flag to a variable using the Var() functions. + var flagvar int func init() { flag.IntVar(&flagvar, "flagname", 1234, "help message for flagname") } + Or you can create custom flags that satisfy the Value interface (with pointer receivers) and couple them to flag parsing by + flag.Var(&flagVal, "name", "help message for flagname") + For such flags, the default value is just the initial value of the variable. After all flags are defined, call + flag.Parse() + to parse the command line into the defined flags. Flags may then be used directly. If you're using the flags themselves, they are all pointers; if you bind to variables, they're values. + fmt.Println("ip has value ", *ip) fmt.Println("flagvar has value ", flagvar) @@ -54,22 +63,26 @@ The arguments are indexed from 0 through flag.NArg()-1. The pflag package also defines some new functions that are not in flag, that give one-letter shorthands for flags. You can use these by appending 'P' to the name of any function that defines a flag. + var ip = flag.IntP("flagname", "f", 1234, "help message") var flagvar bool func init() { flag.BoolVarP(&flagvar, "boolname", "b", true, "help message") } flag.VarP(&flagval, "varname", "v", "help message") + Shorthand letters can be used with single dashes on the command line. Boolean shorthand flags can be combined with other shorthand flags. Command line flag syntax: + --flag // boolean flags only --flag=x Unlike the flag package, a single dash before an option means something different than a double dash. Single dashes signify a series of shorthand letters for flags. All but the last shorthand letter must be boolean flags. + // boolean flags -f -abc @@ -124,12 +137,17 @@ const ( PanicOnError ) -// ParseErrorsWhitelist defines the parsing errors that can be ignored -type ParseErrorsWhitelist struct { +// ParseErrorsAllowlist defines the parsing errors that can be ignored +type ParseErrorsAllowlist struct { // UnknownFlags will ignore unknown flags errors and continue parsing rest of the flags UnknownFlags bool } +// ParseErrorsWhitelist defines the parsing errors that can be ignored. +// +// Deprecated: use [ParseErrorsAllowlist] instead. This type will be removed in a future release. +type ParseErrorsWhitelist = ParseErrorsAllowlist + // NormalizedName is a flag name that has been normalized according to rules // for the FlagSet (e.g. making '-' and '_' equivalent). type NormalizedName string @@ -145,8 +163,13 @@ type FlagSet struct { // help/usage messages. SortFlags bool - // ParseErrorsWhitelist is used to configure a whitelist of errors - ParseErrorsWhitelist ParseErrorsWhitelist + // ParseErrorsAllowlist is used to configure an allowlist of errors + ParseErrorsAllowlist ParseErrorsAllowlist + + // ParseErrorsAllowlist is used to configure an allowlist of errors. + // + // Deprecated: use [FlagSet.ParseErrorsAllowlist] instead. This field will be removed in a future release. + ParseErrorsWhitelist ParseErrorsAllowlist name string parsed bool @@ -381,7 +404,7 @@ func (f *FlagSet) lookup(name NormalizedName) *Flag { func (f *FlagSet) getFlagType(name string, ftype string, convFunc func(sval string) (interface{}, error)) (interface{}, error) { flag := f.Lookup(name) if flag == nil { - err := fmt.Errorf("flag accessed but not defined: %s", name) + err := &NotExistError{name: name, messageType: flagNotDefinedMessage} return nil, err } @@ -411,7 +434,7 @@ func (f *FlagSet) ArgsLenAtDash() int { func (f *FlagSet) MarkDeprecated(name string, usageMessage string) error { flag := f.Lookup(name) if flag == nil { - return fmt.Errorf("flag %q does not exist", name) + return &NotExistError{name: name, messageType: flagNotExistMessage} } if usageMessage == "" { return fmt.Errorf("deprecated message for flag %q must be set", name) @@ -427,7 +450,7 @@ func (f *FlagSet) MarkDeprecated(name string, usageMessage string) error { func (f *FlagSet) MarkShorthandDeprecated(name string, usageMessage string) error { flag := f.Lookup(name) if flag == nil { - return fmt.Errorf("flag %q does not exist", name) + return &NotExistError{name: name, messageType: flagNotExistMessage} } if usageMessage == "" { return fmt.Errorf("deprecated message for flag %q must be set", name) @@ -441,7 +464,7 @@ func (f *FlagSet) MarkShorthandDeprecated(name string, usageMessage string) erro func (f *FlagSet) MarkHidden(name string) error { flag := f.Lookup(name) if flag == nil { - return fmt.Errorf("flag %q does not exist", name) + return &NotExistError{name: name, messageType: flagNotExistMessage} } flag.Hidden = true return nil @@ -464,18 +487,16 @@ func (f *FlagSet) Set(name, value string) error { normalName := f.normalizeFlagName(name) flag, ok := f.formal[normalName] if !ok { - return fmt.Errorf("no such flag -%v", name) + return &NotExistError{name: name, messageType: flagNoSuchFlagMessage} } err := flag.Value.Set(value) if err != nil { - var flagName string - if flag.Shorthand != "" && flag.ShorthandDeprecated == "" { - flagName = fmt.Sprintf("-%s, --%s", flag.Shorthand, flag.Name) - } else { - flagName = fmt.Sprintf("--%s", flag.Name) + return &InvalidValueError{ + flag: flag, + value: value, + cause: err, } - return fmt.Errorf("invalid argument %q for %q flag: %v", value, flagName, err) } if !flag.Changed { @@ -501,7 +522,7 @@ func (f *FlagSet) SetAnnotation(name, key string, values []string) error { normalName := f.normalizeFlagName(name) flag, ok := f.formal[normalName] if !ok { - return fmt.Errorf("no such flag -%v", name) + return &NotExistError{name: name, messageType: flagNoSuchFlagMessage} } if flag.Annotations == nil { flag.Annotations = map[string][]string{} @@ -538,7 +559,7 @@ func (f *FlagSet) PrintDefaults() { func (f *Flag) defaultIsZeroValue() bool { switch f.Value.(type) { case boolFlag: - return f.DefValue == "false" + return f.DefValue == "false" || f.DefValue == "" case *durationValue: // Beginning in Go 1.7, duration zero values are "0s" return f.DefValue == "0" || f.DefValue == "0s" @@ -551,7 +572,7 @@ func (f *Flag) defaultIsZeroValue() bool { case *intSliceValue, *stringSliceValue, *stringArrayValue: return f.DefValue == "[]" default: - switch f.Value.String() { + switch f.DefValue { case "false": return true case "": @@ -588,8 +609,10 @@ func UnquoteUsage(flag *Flag) (name string, usage string) { name = flag.Value.Type() switch name { - case "bool": + case "bool", "boolfunc": name = "" + case "func": + name = "value" case "float64": name = "float" case "int64": @@ -707,7 +730,7 @@ func (f *FlagSet) FlagUsagesWrapped(cols int) string { switch flag.Value.Type() { case "string": line += fmt.Sprintf("[=\"%s\"]", flag.NoOptDefVal) - case "bool": + case "bool", "boolfunc": if flag.NoOptDefVal != "true" { line += fmt.Sprintf("[=%s]", flag.NoOptDefVal) } @@ -911,12 +934,10 @@ func VarP(value Value, name, shorthand, usage string) { CommandLine.VarP(value, name, shorthand, usage) } -// failf prints to standard error a formatted error and usage message and +// fail prints an error message and usage message to standard error and // returns the error. -func (f *FlagSet) failf(format string, a ...interface{}) error { - err := fmt.Errorf(format, a...) +func (f *FlagSet) fail(err error) error { if f.errorHandling != ContinueOnError { - fmt.Fprintln(f.Output(), err) f.usage() } return err @@ -934,9 +955,9 @@ func (f *FlagSet) usage() { } } -//--unknown (args will be empty) -//--unknown --next-flag ... (args will be --next-flag ...) -//--unknown arg ... (args will be arg ...) +// --unknown (args will be empty) +// --unknown --next-flag ... (args will be --next-flag ...) +// --unknown arg ... (args will be arg ...) func stripUnknownFlagValue(args []string) []string { if len(args) == 0 { //--unknown @@ -960,7 +981,7 @@ func (f *FlagSet) parseLongArg(s string, args []string, fn parseFunc) (a []strin a = args name := s[2:] if len(name) == 0 || name[0] == '-' || name[0] == '=' { - err = f.failf("bad flag syntax: %s", s) + err = f.fail(&InvalidSyntaxError{specifiedFlag: s}) return } @@ -974,6 +995,8 @@ func (f *FlagSet) parseLongArg(s string, args []string, fn parseFunc) (a []strin f.usage() return a, ErrHelp case f.ParseErrorsWhitelist.UnknownFlags: + fallthrough + case f.ParseErrorsAllowlist.UnknownFlags: // --unknown=unknownval arg ... // we do not want to lose arg in this case if len(split) >= 2 { @@ -982,7 +1005,7 @@ func (f *FlagSet) parseLongArg(s string, args []string, fn parseFunc) (a []strin return stripUnknownFlagValue(a), nil default: - err = f.failf("unknown flag: --%s", name) + err = f.fail(&NotExistError{name: name, messageType: flagUnknownFlagMessage}) return } } @@ -1000,13 +1023,16 @@ func (f *FlagSet) parseLongArg(s string, args []string, fn parseFunc) (a []strin a = a[1:] } else { // '--flag' (arg was required) - err = f.failf("flag needs an argument: %s", s) + err = f.fail(&ValueRequiredError{ + flag: flag, + specifiedName: name, + }) return } err = fn(flag, value) if err != nil { - f.failf(err.Error()) + f.fail(err) } return } @@ -1014,7 +1040,7 @@ func (f *FlagSet) parseLongArg(s string, args []string, fn parseFunc) (a []strin func (f *FlagSet) parseSingleShortArg(shorthands string, args []string, fn parseFunc) (outShorts string, outArgs []string, err error) { outArgs = args - if strings.HasPrefix(shorthands, "test.") { + if isGotestShorthandFlag(shorthands) { return } @@ -1029,6 +1055,8 @@ func (f *FlagSet) parseSingleShortArg(shorthands string, args []string, fn parse err = ErrHelp return case f.ParseErrorsWhitelist.UnknownFlags: + fallthrough + case f.ParseErrorsAllowlist.UnknownFlags: // '-f=arg arg ...' // we do not want to lose arg in this case if len(shorthands) > 2 && shorthands[1] == '=' { @@ -1039,7 +1067,11 @@ func (f *FlagSet) parseSingleShortArg(shorthands string, args []string, fn parse outArgs = stripUnknownFlagValue(outArgs) return default: - err = f.failf("unknown shorthand flag: %q in -%s", c, shorthands) + err = f.fail(&NotExistError{ + name: string(c), + specifiedShorthands: shorthands, + messageType: flagUnknownShorthandFlagMessage, + }) return } } @@ -1062,7 +1094,11 @@ func (f *FlagSet) parseSingleShortArg(shorthands string, args []string, fn parse outArgs = args[1:] } else { // '-f' (arg was required) - err = f.failf("flag needs an argument: %q in -%s", c, shorthands) + err = f.fail(&ValueRequiredError{ + flag: flag, + specifiedName: string(c), + specifiedShorthands: shorthands, + }) return } @@ -1072,7 +1108,7 @@ func (f *FlagSet) parseSingleShortArg(shorthands string, args []string, fn parse err = fn(flag, value) if err != nil { - f.failf(err.Error()) + f.fail(err) } return } @@ -1135,12 +1171,12 @@ func (f *FlagSet) Parse(arguments []string) error { } f.parsed = true - if len(arguments) < 0 { + f.args = make([]string, 0, len(arguments)) + + if len(arguments) == 0 { return nil } - f.args = make([]string, 0, len(arguments)) - set := func(flag *Flag, value string) error { return f.Set(flag.Name, value) } @@ -1151,7 +1187,10 @@ func (f *FlagSet) Parse(arguments []string) error { case ContinueOnError: return err case ExitOnError: - fmt.Println(err) + if err == ErrHelp { + os.Exit(0) + } + fmt.Fprintln(f.Output(), err) os.Exit(2) case PanicOnError: panic(err) @@ -1177,6 +1216,10 @@ func (f *FlagSet) ParseAll(arguments []string, fn func(flag *Flag, value string) case ContinueOnError: return err case ExitOnError: + if err == ErrHelp { + os.Exit(0) + } + fmt.Fprintln(f.Output(), err) os.Exit(2) case PanicOnError: panic(err) diff --git a/vendor/github.com/spf13/pflag/func.go b/vendor/github.com/spf13/pflag/func.go new file mode 100644 index 0000000000..9f4d88f271 --- /dev/null +++ b/vendor/github.com/spf13/pflag/func.go @@ -0,0 +1,37 @@ +package pflag + +// -- func Value +type funcValue func(string) error + +func (f funcValue) Set(s string) error { return f(s) } + +func (f funcValue) Type() string { return "func" } + +func (f funcValue) String() string { return "" } // same behavior as stdlib 'flag' package + +// Func defines a func flag with specified name, callback function and usage string. +// +// The callback function will be called every time "--{name}={value}" (or equivalent) is +// parsed on the command line, with "{value}" as an argument. +func (f *FlagSet) Func(name string, usage string, fn func(string) error) { + f.FuncP(name, "", usage, fn) +} + +// FuncP is like Func, but accepts a shorthand letter that can be used after a single dash. +func (f *FlagSet) FuncP(name string, shorthand string, usage string, fn func(string) error) { + var val Value = funcValue(fn) + f.VarP(val, name, shorthand, usage) +} + +// Func defines a func flag with specified name, callback function and usage string. +// +// The callback function will be called every time "--{name}={value}" (or equivalent) is +// parsed on the command line, with "{value}" as an argument. +func Func(name string, usage string, fn func(string) error) { + CommandLine.FuncP(name, "", usage, fn) +} + +// FuncP is like Func, but accepts a shorthand letter that can be used after a single dash. +func FuncP(name, shorthand string, usage string, fn func(string) error) { + CommandLine.FuncP(name, shorthand, usage, fn) +} diff --git a/vendor/github.com/spf13/pflag/golangflag.go b/vendor/github.com/spf13/pflag/golangflag.go index d3dd72b7fe..e62eab5381 100644 --- a/vendor/github.com/spf13/pflag/golangflag.go +++ b/vendor/github.com/spf13/pflag/golangflag.go @@ -8,8 +8,18 @@ import ( goflag "flag" "reflect" "strings" + "time" ) +// go test flags prefixes +func isGotestFlag(flag string) bool { + return strings.HasPrefix(flag, "-test.") +} + +func isGotestShorthandFlag(flag string) bool { + return strings.HasPrefix(flag, "test.") +} + // flagValueWrapper implements pflag.Value around a flag.Value. The main // difference here is the addition of the Type method that returns a string // name of the type. As this is generally unknown, we approximate that with @@ -103,3 +113,49 @@ func (f *FlagSet) AddGoFlagSet(newSet *goflag.FlagSet) { } f.addedGoFlagSets = append(f.addedGoFlagSets, newSet) } + +// CopyToGoFlagSet will add all current flags to the given Go flag set. +// Deprecation remarks get copied into the usage description. +// Whenever possible, a flag gets added for which Go flags shows +// a proper type in the help message. +func (f *FlagSet) CopyToGoFlagSet(newSet *goflag.FlagSet) { + f.VisitAll(func(flag *Flag) { + usage := flag.Usage + if flag.Deprecated != "" { + usage += " (DEPRECATED: " + flag.Deprecated + ")" + } + + switch value := flag.Value.(type) { + case *stringValue: + newSet.StringVar((*string)(value), flag.Name, flag.DefValue, usage) + case *intValue: + newSet.IntVar((*int)(value), flag.Name, *(*int)(value), usage) + case *int64Value: + newSet.Int64Var((*int64)(value), flag.Name, *(*int64)(value), usage) + case *uintValue: + newSet.UintVar((*uint)(value), flag.Name, *(*uint)(value), usage) + case *uint64Value: + newSet.Uint64Var((*uint64)(value), flag.Name, *(*uint64)(value), usage) + case *durationValue: + newSet.DurationVar((*time.Duration)(value), flag.Name, *(*time.Duration)(value), usage) + case *float64Value: + newSet.Float64Var((*float64)(value), flag.Name, *(*float64)(value), usage) + default: + newSet.Var(flag.Value, flag.Name, usage) + } + }) +} + +// ParseSkippedFlags explicitly Parses go test flags (i.e. the one starting with '-test.') with goflag.Parse(), +// since by default those are skipped by pflag.Parse(). +// Typical usage example: `ParseGoTestFlags(os.Args[1:], goflag.CommandLine)` +func ParseSkippedFlags(osArgs []string, goFlagSet *goflag.FlagSet) error { + var skippedFlags []string + for _, f := range osArgs { + if isGotestFlag(f) { + skippedFlags = append(skippedFlags, f) + } + } + return goFlagSet.Parse(skippedFlags) +} + diff --git a/vendor/github.com/spf13/pflag/ipnet_slice.go b/vendor/github.com/spf13/pflag/ipnet_slice.go index 6b541aa879..c6e89da18d 100644 --- a/vendor/github.com/spf13/pflag/ipnet_slice.go +++ b/vendor/github.com/spf13/pflag/ipnet_slice.go @@ -73,7 +73,7 @@ func (s *ipNetSliceValue) String() string { func ipNetSliceConv(val string) (interface{}, error) { val = strings.Trim(val, "[]") - // Emtpy string would cause a slice with one (empty) entry + // Empty string would cause a slice with one (empty) entry if len(val) == 0 { return []net.IPNet{}, nil } diff --git a/vendor/github.com/spf13/pflag/string_to_string.go b/vendor/github.com/spf13/pflag/string_to_string.go index 890a01afc0..1d1e3bf91a 100644 --- a/vendor/github.com/spf13/pflag/string_to_string.go +++ b/vendor/github.com/spf13/pflag/string_to_string.go @@ -4,6 +4,7 @@ import ( "bytes" "encoding/csv" "fmt" + "sort" "strings" ) @@ -62,8 +63,15 @@ func (s *stringToStringValue) Type() string { } func (s *stringToStringValue) String() string { + keys := make([]string, 0, len(*s.value)) + for k := range *s.value { + keys = append(keys, k) + } + sort.Strings(keys) + records := make([]string, 0, len(*s.value)>>1) - for k, v := range *s.value { + for _, k := range keys { + v := (*s.value)[k] records = append(records, k+"="+v) } diff --git a/vendor/github.com/spf13/pflag/text.go b/vendor/github.com/spf13/pflag/text.go new file mode 100644 index 0000000000..886d5a3d80 --- /dev/null +++ b/vendor/github.com/spf13/pflag/text.go @@ -0,0 +1,81 @@ +package pflag + +import ( + "encoding" + "fmt" + "reflect" +) + +// following is copied from go 1.23.4 flag.go +type textValue struct{ p encoding.TextUnmarshaler } + +func newTextValue(val encoding.TextMarshaler, p encoding.TextUnmarshaler) textValue { + ptrVal := reflect.ValueOf(p) + if ptrVal.Kind() != reflect.Ptr { + panic("variable value type must be a pointer") + } + defVal := reflect.ValueOf(val) + if defVal.Kind() == reflect.Ptr { + defVal = defVal.Elem() + } + if defVal.Type() != ptrVal.Type().Elem() { + panic(fmt.Sprintf("default type does not match variable type: %v != %v", defVal.Type(), ptrVal.Type().Elem())) + } + ptrVal.Elem().Set(defVal) + return textValue{p} +} + +func (v textValue) Set(s string) error { + return v.p.UnmarshalText([]byte(s)) +} + +func (v textValue) Get() interface{} { + return v.p +} + +func (v textValue) String() string { + if m, ok := v.p.(encoding.TextMarshaler); ok { + if b, err := m.MarshalText(); err == nil { + return string(b) + } + } + return "" +} + +//end of copy + +func (v textValue) Type() string { + return reflect.ValueOf(v.p).Type().Name() +} + +// GetText set out, which implements encoding.UnmarshalText, to the value of a flag with given name +func (f *FlagSet) GetText(name string, out encoding.TextUnmarshaler) error { + flag := f.Lookup(name) + if flag == nil { + return fmt.Errorf("flag accessed but not defined: %s", name) + } + if flag.Value.Type() != reflect.TypeOf(out).Name() { + return fmt.Errorf("trying to get %s value of flag of type %s", reflect.TypeOf(out).Name(), flag.Value.Type()) + } + return out.UnmarshalText([]byte(flag.Value.String())) +} + +// TextVar defines a flag with a specified name, default value, and usage string. The argument p must be a pointer to a variable that will hold the value of the flag, and p must implement encoding.TextUnmarshaler. If the flag is used, the flag value will be passed to p's UnmarshalText method. The type of the default value must be the same as the type of p. +func (f *FlagSet) TextVar(p encoding.TextUnmarshaler, name string, value encoding.TextMarshaler, usage string) { + f.VarP(newTextValue(value, p), name, "", usage) +} + +// TextVarP is like TextVar, but accepts a shorthand letter that can be used after a single dash. +func (f *FlagSet) TextVarP(p encoding.TextUnmarshaler, name, shorthand string, value encoding.TextMarshaler, usage string) { + f.VarP(newTextValue(value, p), name, shorthand, usage) +} + +// TextVar defines a flag with a specified name, default value, and usage string. The argument p must be a pointer to a variable that will hold the value of the flag, and p must implement encoding.TextUnmarshaler. If the flag is used, the flag value will be passed to p's UnmarshalText method. The type of the default value must be the same as the type of p. +func TextVar(p encoding.TextUnmarshaler, name string, value encoding.TextMarshaler, usage string) { + CommandLine.VarP(newTextValue(value, p), name, "", usage) +} + +// TextVarP is like TextVar, but accepts a shorthand letter that can be used after a single dash. +func TextVarP(p encoding.TextUnmarshaler, name, shorthand string, value encoding.TextMarshaler, usage string) { + CommandLine.VarP(newTextValue(value, p), name, shorthand, usage) +} diff --git a/vendor/github.com/spf13/pflag/time.go b/vendor/github.com/spf13/pflag/time.go new file mode 100644 index 0000000000..3dee424791 --- /dev/null +++ b/vendor/github.com/spf13/pflag/time.go @@ -0,0 +1,124 @@ +package pflag + +import ( + "fmt" + "strings" + "time" +) + +// TimeValue adapts time.Time for use as a flag. +type timeValue struct { + *time.Time + formats []string +} + +func newTimeValue(val time.Time, p *time.Time, formats []string) *timeValue { + *p = val + return &timeValue{ + Time: p, + formats: formats, + } +} + +// Set time.Time value from string based on accepted formats. +func (d *timeValue) Set(s string) error { + s = strings.TrimSpace(s) + for _, f := range d.formats { + v, err := time.Parse(f, s) + if err != nil { + continue + } + *d.Time = v + return nil + } + + formatsString := "" + for i, f := range d.formats { + if i > 0 { + formatsString += ", " + } + formatsString += fmt.Sprintf("`%s`", f) + } + + return fmt.Errorf("invalid time format `%s` must be one of: %s", s, formatsString) +} + +// Type name for time.Time flags. +func (d *timeValue) Type() string { + return "time" +} + +func (d *timeValue) String() string { + if d.Time.IsZero() { + return "" + } else { + return d.Time.Format(time.RFC3339Nano) + } +} + +// GetTime return the time value of a flag with the given name +func (f *FlagSet) GetTime(name string) (time.Time, error) { + flag := f.Lookup(name) + if flag == nil { + err := fmt.Errorf("flag accessed but not defined: %s", name) + return time.Time{}, err + } + + if flag.Value.Type() != "time" { + err := fmt.Errorf("trying to get %s value of flag of type %s", "time", flag.Value.Type()) + return time.Time{}, err + } + + val, ok := flag.Value.(*timeValue) + if !ok { + return time.Time{}, fmt.Errorf("value %s is not a time", flag.Value) + } + + return *val.Time, nil +} + +// TimeVar defines a time.Time flag with specified name, default value, and usage string. +// The argument p points to a time.Time variable in which to store the value of the flag. +func (f *FlagSet) TimeVar(p *time.Time, name string, value time.Time, formats []string, usage string) { + f.TimeVarP(p, name, "", value, formats, usage) +} + +// TimeVarP is like TimeVar, but accepts a shorthand letter that can be used after a single dash. +func (f *FlagSet) TimeVarP(p *time.Time, name, shorthand string, value time.Time, formats []string, usage string) { + f.VarP(newTimeValue(value, p, formats), name, shorthand, usage) +} + +// TimeVar defines a time.Time flag with specified name, default value, and usage string. +// The argument p points to a time.Time variable in which to store the value of the flag. +func TimeVar(p *time.Time, name string, value time.Time, formats []string, usage string) { + CommandLine.TimeVarP(p, name, "", value, formats, usage) +} + +// TimeVarP is like TimeVar, but accepts a shorthand letter that can be used after a single dash. +func TimeVarP(p *time.Time, name, shorthand string, value time.Time, formats []string, usage string) { + CommandLine.VarP(newTimeValue(value, p, formats), name, shorthand, usage) +} + +// Time defines a time.Time flag with specified name, default value, and usage string. +// The return value is the address of a time.Time variable that stores the value of the flag. +func (f *FlagSet) Time(name string, value time.Time, formats []string, usage string) *time.Time { + return f.TimeP(name, "", value, formats, usage) +} + +// TimeP is like Time, but accepts a shorthand letter that can be used after a single dash. +func (f *FlagSet) TimeP(name, shorthand string, value time.Time, formats []string, usage string) *time.Time { + p := new(time.Time) + f.TimeVarP(p, name, shorthand, value, formats, usage) + return p +} + +// Time defines a time.Time flag with specified name, default value, and usage string. +// The return value is the address of a time.Time variable that stores the value of the flag. +func Time(name string, value time.Time, formats []string, usage string) *time.Time { + return CommandLine.TimeP(name, "", value, formats, usage) +} + +// TimeP is like Time, but accepts a shorthand letter that can be used after a single dash. +func TimeP(name, shorthand string, value time.Time, formats []string, usage string) *time.Time { + return CommandLine.TimeP(name, shorthand, value, formats, usage) +} diff --git a/vendor/go.uber.org/zap/.golangci.yml b/vendor/go.uber.org/zap/.golangci.yml index 2346df1351..74faaa71d8 100644 --- a/vendor/go.uber.org/zap/.golangci.yml +++ b/vendor/go.uber.org/zap/.golangci.yml @@ -25,7 +25,7 @@ linters-settings: govet: # These govet checks are disabled by default, but they're useful. enable: - - niliness + - nilness - reflectvaluecompare - sortslice - unusedwrite diff --git a/vendor/go.uber.org/zap/CHANGELOG.md b/vendor/go.uber.org/zap/CHANGELOG.md index 6d6cd5f4d7..86e7e6f982 100644 --- a/vendor/go.uber.org/zap/CHANGELOG.md +++ b/vendor/go.uber.org/zap/CHANGELOG.md @@ -3,6 +3,16 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 1.27.1 (19 Nov 2025) +Enhancements: +* [#1501][]: prevent `Object` from panicking on nils +* [#1511][]: Fix a race condition in `WithLazy`. + +Thanks to @rabbbit, @alshopov, @jquirke, @arukiidou for their contributions to this release. + +[#1501]: https://github.com/uber-go/zap/pull/1501 +[#1511]: https://github.com/uber-go/zap/pull/1511 + ## 1.27.0 (20 Feb 2024) Enhancements: * [#1378][]: Add `WithLazy` method for `SugaredLogger`. diff --git a/vendor/go.uber.org/zap/CODE_OF_CONDUCT.md b/vendor/go.uber.org/zap/CODE_OF_CONDUCT.md index e327d9aa5c..bc988b72ed 100644 --- a/vendor/go.uber.org/zap/CODE_OF_CONDUCT.md +++ b/vendor/go.uber.org/zap/CODE_OF_CONDUCT.md @@ -71,5 +71,5 @@ This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]. -[homepage]: http://contributor-covenant.org -[version]: http://contributor-covenant.org/version/1/4/ +[homepage]: https://contributor-covenant.org +[version]: https://contributor-covenant.org/version/1/4/ diff --git a/vendor/go.uber.org/zap/LICENSE b/vendor/go.uber.org/zap/LICENSE index 6652bed45f..3883b9a7ea 100644 --- a/vendor/go.uber.org/zap/LICENSE +++ b/vendor/go.uber.org/zap/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2016-2017 Uber Technologies, Inc. +Copyright (c) 2016-2024 Uber Technologies, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/go.uber.org/zap/Makefile b/vendor/go.uber.org/zap/Makefile index eb1cee53bd..f9db385b34 100644 --- a/vendor/go.uber.org/zap/Makefile +++ b/vendor/go.uber.org/zap/Makefile @@ -24,7 +24,7 @@ golangci-lint: @$(foreach mod,$(MODULE_DIRS), \ (cd $(mod) && \ echo "[lint] golangci-lint: $(mod)" && \ - golangci-lint run --path-prefix $(mod)) &&) true + golangci-lint run --path-prefix $(mod) ./...) &&) true .PHONY: tidy tidy: diff --git a/vendor/go.uber.org/zap/checklicense.sh b/vendor/go.uber.org/zap/checklicense.sh old mode 100755 new mode 100644 diff --git a/vendor/go.uber.org/zap/field.go b/vendor/go.uber.org/zap/field.go index 6743930b82..1884afabcd 100644 --- a/vendor/go.uber.org/zap/field.go +++ b/vendor/go.uber.org/zap/field.go @@ -398,6 +398,9 @@ func Durationp(key string, val *time.Duration) Field { // struct-like user-defined types to the logging context. The struct's // MarshalLogObject method is called lazily. func Object(key string, val zapcore.ObjectMarshaler) Field { + if val == nil { + return nilField(key) + } return Field{Key: key, Type: zapcore.ObjectMarshalerType, Interface: val} } @@ -431,6 +434,13 @@ func (d dictObject) MarshalLogObject(enc zapcore.ObjectEncoder) error { return nil } +// DictObject constructs a [zapcore.ObjectMarshaler] with the given list of fields. +// The resulting object marshaler can be used as input to [Object], [Objects], or +// any other functions that expect an object marshaler. +func DictObject(val ...Field) zapcore.ObjectMarshaler { + return dictObject(val) +} + // We discovered an issue where zap.Any can cause a performance degradation // when used in new goroutines. // diff --git a/vendor/go.uber.org/zap/http_handler.go b/vendor/go.uber.org/zap/http_handler.go index 2be8f65150..1cae2c164b 100644 --- a/vendor/go.uber.org/zap/http_handler.go +++ b/vendor/go.uber.org/zap/http_handler.go @@ -71,7 +71,7 @@ import ( func (lvl AtomicLevel) ServeHTTP(w http.ResponseWriter, r *http.Request) { if err := lvl.serveHTTP(w, r); err != nil { w.WriteHeader(http.StatusInternalServerError) - fmt.Fprintf(w, "internal error: %v", err) + _, _ = fmt.Fprintf(w, "internal error: %v", err) } } diff --git a/vendor/go.uber.org/zap/logger.go b/vendor/go.uber.org/zap/logger.go index c4d3003239..2d0ef141bc 100644 --- a/vendor/go.uber.org/zap/logger.go +++ b/vendor/go.uber.org/zap/logger.go @@ -381,7 +381,11 @@ func (log *Logger) check(lvl zapcore.Level, msg string) *zapcore.CheckedEntry { if stack.Count() == 0 { if log.addCaller { - fmt.Fprintf(log.errorOutput, "%v Logger.check error: failed to get caller\n", ent.Time.UTC()) + _, _ = fmt.Fprintf( + log.errorOutput, + "%v Logger.check error: failed to get caller\n", + ent.Time.UTC(), + ) _ = log.errorOutput.Sync() } return ce diff --git a/vendor/go.uber.org/zap/options.go b/vendor/go.uber.org/zap/options.go index 43d357ac90..04a3c1e635 100644 --- a/vendor/go.uber.org/zap/options.go +++ b/vendor/go.uber.org/zap/options.go @@ -125,7 +125,11 @@ func IncreaseLevel(lvl zapcore.LevelEnabler) Option { return optionFunc(func(log *Logger) { core, err := zapcore.NewIncreaseLevelCore(log.core, lvl) if err != nil { - fmt.Fprintf(log.errorOutput, "failed to IncreaseLevel: %v\n", err) + _, _ = fmt.Fprintf( + log.errorOutput, + "failed to IncreaseLevel: %v\n", + err, + ) } else { log.core = core } diff --git a/vendor/go.uber.org/zap/sink.go b/vendor/go.uber.org/zap/sink.go index 499772a00d..92202280f1 100644 --- a/vendor/go.uber.org/zap/sink.go +++ b/vendor/go.uber.org/zap/sink.go @@ -71,7 +71,7 @@ func newSinkRegistry() *sinkRegistry { return sr } -// RegisterScheme registers the given factory for the specific scheme. +// RegisterSink registers the given factory for the specific scheme. func (sr *sinkRegistry) RegisterSink(scheme string, factory func(*url.URL) (Sink, error)) error { sr.mu.Lock() defer sr.mu.Unlock() diff --git a/vendor/go.uber.org/zap/zapcore/buffered_write_syncer.go b/vendor/go.uber.org/zap/zapcore/buffered_write_syncer.go index a40e93b3ec..4b426a5648 100644 --- a/vendor/go.uber.org/zap/zapcore/buffered_write_syncer.go +++ b/vendor/go.uber.org/zap/zapcore/buffered_write_syncer.go @@ -188,32 +188,33 @@ func (s *BufferedWriteSyncer) flushLoop() { // Stop closes the buffer, cleans up background goroutines, and flushes // remaining unwritten data. func (s *BufferedWriteSyncer) Stop() (err error) { - var stopped bool - // Critical section. - func() { + stopped := func() bool { s.mu.Lock() defer s.mu.Unlock() if !s.initialized { - return + return false } - stopped = s.stopped - if stopped { - return + if s.stopped { + return false } s.stopped = true s.ticker.Stop() close(s.stop) // tell flushLoop to stop - <-s.done // and wait until it has + return true }() - // Don't call Sync on consecutive Stops. + // Not initialized, or already stopped, no need for any cleanup. if !stopped { - err = s.Sync() + return } - return err + // Wait for flushLoop to end outside of the lock, as it may need the lock to complete. + // See https://github.com/uber-go/zap/issues/1428 for details. + <-s.done + + return s.Sync() } diff --git a/vendor/go.uber.org/zap/zapcore/console_encoder.go b/vendor/go.uber.org/zap/zapcore/console_encoder.go index cc2b4e07b9..98eea5154d 100644 --- a/vendor/go.uber.org/zap/zapcore/console_encoder.go +++ b/vendor/go.uber.org/zap/zapcore/console_encoder.go @@ -105,7 +105,7 @@ func (c consoleEncoder) EncodeEntry(ent Entry, fields []Field) (*buffer.Buffer, if i > 0 { line.AppendString(c.ConsoleSeparator) } - fmt.Fprint(line, arr.elems[i]) + _, _ = fmt.Fprint(line, arr.elems[i]) } putSliceEncoder(arr) diff --git a/vendor/go.uber.org/zap/zapcore/entry.go b/vendor/go.uber.org/zap/zapcore/entry.go index 459a5d7ce3..841752f2ed 100644 --- a/vendor/go.uber.org/zap/zapcore/entry.go +++ b/vendor/go.uber.org/zap/zapcore/entry.go @@ -241,7 +241,12 @@ func (ce *CheckedEntry) Write(fields ...Field) { // If the entry is dirty, log an internal error; because the // CheckedEntry is being used after it was returned to the pool, // the message may be an amalgamation from multiple call sites. - fmt.Fprintf(ce.ErrorOutput, "%v Unsafe CheckedEntry re-use near Entry %+v.\n", ce.Time, ce.Entry) + _, _ = fmt.Fprintf( + ce.ErrorOutput, + "%v Unsafe CheckedEntry re-use near Entry %+v.\n", + ce.Time, + ce.Entry, + ) _ = ce.ErrorOutput.Sync() // ignore error } return @@ -253,7 +258,12 @@ func (ce *CheckedEntry) Write(fields ...Field) { err = multierr.Append(err, ce.cores[i].Write(ce.Entry, fields)) } if err != nil && ce.ErrorOutput != nil { - fmt.Fprintf(ce.ErrorOutput, "%v write error: %v\n", ce.Time, err) + _, _ = fmt.Fprintf( + ce.ErrorOutput, + "%v write error: %v\n", + ce.Time, + err, + ) _ = ce.ErrorOutput.Sync() // ignore error } diff --git a/vendor/go.uber.org/zap/zapcore/lazy_with.go b/vendor/go.uber.org/zap/zapcore/lazy_with.go index 05288d6a88..500809de08 100644 --- a/vendor/go.uber.org/zap/zapcore/lazy_with.go +++ b/vendor/go.uber.org/zap/zapcore/lazy_with.go @@ -23,7 +23,8 @@ package zapcore import "sync" type lazyWithCore struct { - Core + core Core + originalCore Core sync.Once fields []Field } @@ -32,23 +33,45 @@ type lazyWithCore struct { // the logger is written to (or is further chained in a lon-lazy manner). func NewLazyWith(core Core, fields []Field) Core { return &lazyWithCore{ - Core: core, - fields: fields, + core: nil, // core is allocated once `initOnce` is called. + originalCore: core, + fields: fields, } } func (d *lazyWithCore) initOnce() { d.Once.Do(func() { - d.Core = d.Core.With(d.fields) + d.core = d.originalCore.With(d.fields) }) } func (d *lazyWithCore) With(fields []Field) Core { d.initOnce() - return d.Core.With(fields) + return d.core.With(fields) } func (d *lazyWithCore) Check(e Entry, ce *CheckedEntry) *CheckedEntry { + // This is safe because `lazyWithCore` doesn't change the level. + // So we can delagate the level check, any not `initOnce` + // just for the check. + if !d.originalCore.Enabled(e.Level) { + return ce + } + d.initOnce() + return d.core.Check(e, ce) +} + +func (d *lazyWithCore) Enabled(level Level) bool { + // Like above, this is safe because `lazyWithCore` doesn't change the level. + return d.originalCore.Enabled(level) +} + +func (d *lazyWithCore) Write(e Entry, fields []Field) error { + d.initOnce() + return d.core.Write(e, fields) +} + +func (d *lazyWithCore) Sync() error { d.initOnce() - return d.Core.Check(e, ce) + return d.core.Sync() } diff --git a/vendor/go.uber.org/zap/zapcore/level.go b/vendor/go.uber.org/zap/zapcore/level.go index e01a241316..f3e166d67b 100644 --- a/vendor/go.uber.org/zap/zapcore/level.go +++ b/vendor/go.uber.org/zap/zapcore/level.go @@ -179,19 +179,19 @@ func (l *Level) UnmarshalText(text []byte) error { func (l *Level) unmarshalText(text []byte) bool { switch string(text) { - case "debug", "DEBUG": + case "debug": *l = DebugLevel - case "info", "INFO", "": // make the zero value useful + case "info", "": // make the zero value useful *l = InfoLevel - case "warn", "WARN": + case "warn", "warning": *l = WarnLevel - case "error", "ERROR": + case "error": *l = ErrorLevel - case "dpanic", "DPANIC": + case "dpanic": *l = DPanicLevel - case "panic", "PANIC": + case "panic": *l = PanicLevel - case "fatal", "FATAL": + case "fatal": *l = FatalLevel default: return false diff --git a/vendor/golang.org/x/sys/plan9/mkall.sh b/vendor/golang.org/x/sys/plan9/mkall.sh old mode 100755 new mode 100644 diff --git a/vendor/golang.org/x/sys/plan9/mkerrors.sh b/vendor/golang.org/x/sys/plan9/mkerrors.sh old mode 100755 new mode 100644 diff --git a/vendor/golang.org/x/sys/plan9/mksysnum_plan9.sh b/vendor/golang.org/x/sys/plan9/mksysnum_plan9.sh old mode 100755 new mode 100644 diff --git a/vendor/golang.org/x/sys/unix/mkall.sh b/vendor/golang.org/x/sys/unix/mkall.sh old mode 100755 new mode 100644 diff --git a/vendor/golang.org/x/sys/unix/mkerrors.sh b/vendor/golang.org/x/sys/unix/mkerrors.sh old mode 100755 new mode 100644 diff --git a/vendor/k8s.io/apimachinery/pkg/api/errors/OWNERS b/vendor/k8s.io/apimachinery/pkg/api/errors/OWNERS new file mode 100644 index 0000000000..1a9f5e7706 --- /dev/null +++ b/vendor/k8s.io/apimachinery/pkg/api/errors/OWNERS @@ -0,0 +1,16 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +reviewers: + - thockin + - smarterclayton + - wojtek-t + - deads2k + - derekwaynecarr + - caesarxuchao + - mikedanese + - liggitt + - saad-ali + - janetkuo + - tallclair + - dims + - cjcullen diff --git a/vendor/k8s.io/apimachinery/pkg/api/meta/OWNERS b/vendor/k8s.io/apimachinery/pkg/api/meta/OWNERS new file mode 100644 index 0000000000..1e1330fff2 --- /dev/null +++ b/vendor/k8s.io/apimachinery/pkg/api/meta/OWNERS @@ -0,0 +1,14 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +reviewers: + - thockin + - smarterclayton + - wojtek-t + - deads2k + - derekwaynecarr + - caesarxuchao + - mikedanese + - liggitt + - janetkuo + - ncdc + - dims diff --git a/vendor/k8s.io/apimachinery/pkg/api/resource/OWNERS b/vendor/k8s.io/apimachinery/pkg/api/resource/OWNERS new file mode 100644 index 0000000000..063fd285da --- /dev/null +++ b/vendor/k8s.io/apimachinery/pkg/api/resource/OWNERS @@ -0,0 +1,10 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +reviewers: + - thockin + - smarterclayton + - wojtek-t + - derekwaynecarr + - mikedanese + - saad-ali + - janetkuo diff --git a/vendor/k8s.io/apimachinery/pkg/api/validation/OWNERS b/vendor/k8s.io/apimachinery/pkg/api/validation/OWNERS new file mode 100644 index 0000000000..4023732476 --- /dev/null +++ b/vendor/k8s.io/apimachinery/pkg/api/validation/OWNERS @@ -0,0 +1,11 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +# Disable inheritance as this is an api owners file +options: + no_parent_owners: true +approvers: + - api-approvers +reviewers: + - api-reviewers +labels: + - kind/api-change diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/OWNERS b/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/OWNERS new file mode 100644 index 0000000000..e7e5c152d0 --- /dev/null +++ b/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/OWNERS @@ -0,0 +1,16 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +reviewers: + - thockin + - smarterclayton + - wojtek-t + - deads2k + - caesarxuchao + - liggitt + - sttts + - luxas + - janetkuo + - justinsb + - ncdc + - soltysh + - dims diff --git a/vendor/k8s.io/apimachinery/pkg/util/mergepatch/OWNERS b/vendor/k8s.io/apimachinery/pkg/util/mergepatch/OWNERS new file mode 100644 index 0000000000..349bc69d65 --- /dev/null +++ b/vendor/k8s.io/apimachinery/pkg/util/mergepatch/OWNERS @@ -0,0 +1,6 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +approvers: + - pwittrock +reviewers: + - apelisse diff --git a/vendor/k8s.io/apimachinery/pkg/util/strategicpatch/OWNERS b/vendor/k8s.io/apimachinery/pkg/util/strategicpatch/OWNERS new file mode 100644 index 0000000000..73244449f2 --- /dev/null +++ b/vendor/k8s.io/apimachinery/pkg/util/strategicpatch/OWNERS @@ -0,0 +1,9 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +approvers: + - apelisse + - pwittrock +reviewers: + - apelisse +emeritus_approvers: + - mengqiy diff --git a/vendor/k8s.io/apimachinery/pkg/util/validation/OWNERS b/vendor/k8s.io/apimachinery/pkg/util/validation/OWNERS new file mode 100644 index 0000000000..4023732476 --- /dev/null +++ b/vendor/k8s.io/apimachinery/pkg/util/validation/OWNERS @@ -0,0 +1,11 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +# Disable inheritance as this is an api owners file +options: + no_parent_owners: true +approvers: + - api-approvers +reviewers: + - api-reviewers +labels: + - kind/api-change diff --git a/vendor/k8s.io/apimachinery/third_party/forked/golang/json/OWNERS b/vendor/k8s.io/apimachinery/third_party/forked/golang/json/OWNERS new file mode 100644 index 0000000000..349bc69d65 --- /dev/null +++ b/vendor/k8s.io/apimachinery/third_party/forked/golang/json/OWNERS @@ -0,0 +1,6 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +approvers: + - pwittrock +reviewers: + - apelisse diff --git a/vendor/k8s.io/client-go/openapi/OWNERS b/vendor/k8s.io/client-go/openapi/OWNERS new file mode 100644 index 0000000000..e610094242 --- /dev/null +++ b/vendor/k8s.io/client-go/openapi/OWNERS @@ -0,0 +1,4 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +approvers: + - apelisse diff --git a/vendor/k8s.io/client-go/pkg/apis/clientauthentication/OWNERS b/vendor/k8s.io/client-go/pkg/apis/clientauthentication/OWNERS new file mode 100644 index 0000000000..4dfbb98aec --- /dev/null +++ b/vendor/k8s.io/client-go/pkg/apis/clientauthentication/OWNERS @@ -0,0 +1,8 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +# approval on api packages bubbles to api-approvers +reviewers: + - sig-auth-authenticators-approvers + - sig-auth-authenticators-reviewers +labels: + - sig/auth diff --git a/vendor/k8s.io/client-go/rest/OWNERS b/vendor/k8s.io/client-go/rest/OWNERS new file mode 100644 index 0000000000..7b23294c45 --- /dev/null +++ b/vendor/k8s.io/client-go/rest/OWNERS @@ -0,0 +1,14 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +reviewers: + - thockin + - smarterclayton + - caesarxuchao + - wojtek-t + - deads2k + - liggitt + - sttts + - luxas + - dims + - cjcullen + - lojies diff --git a/vendor/k8s.io/client-go/tools/auth/OWNERS b/vendor/k8s.io/client-go/tools/auth/OWNERS new file mode 100644 index 0000000000..c4ea6463df --- /dev/null +++ b/vendor/k8s.io/client-go/tools/auth/OWNERS @@ -0,0 +1,8 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +approvers: + - sig-auth-authenticators-approvers +reviewers: + - sig-auth-authenticators-reviewers +labels: + - sig/auth diff --git a/vendor/k8s.io/client-go/tools/cache/OWNERS b/vendor/k8s.io/client-go/tools/cache/OWNERS new file mode 100644 index 0000000000..921ac2fa02 --- /dev/null +++ b/vendor/k8s.io/client-go/tools/cache/OWNERS @@ -0,0 +1,28 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +approvers: + - thockin + - smarterclayton + - wojtek-t + - deads2k + - caesarxuchao + - liggitt + - ncdc +reviewers: + - thockin + - smarterclayton + - wojtek-t + - deads2k + - derekwaynecarr + - caesarxuchao + - mikedanese + - liggitt + - janetkuo + - justinsb + - soltysh + - jsafrane + - dims + - ingvagabund + - ncdc +emeritus_approvers: + - lavalamp diff --git a/vendor/k8s.io/client-go/tools/leaderelection/OWNERS b/vendor/k8s.io/client-go/tools/leaderelection/OWNERS new file mode 100644 index 0000000000..908bdacdfe --- /dev/null +++ b/vendor/k8s.io/client-go/tools/leaderelection/OWNERS @@ -0,0 +1,11 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +approvers: + - mikedanese +reviewers: + - wojtek-t + - deads2k + - mikedanese + - ingvagabund +emeritus_approvers: + - timothysc diff --git a/vendor/k8s.io/client-go/tools/metrics/OWNERS b/vendor/k8s.io/client-go/tools/metrics/OWNERS new file mode 100644 index 0000000000..2c9488a5fb --- /dev/null +++ b/vendor/k8s.io/client-go/tools/metrics/OWNERS @@ -0,0 +1,5 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +reviewers: + - wojtek-t + - jayunit100 diff --git a/vendor/k8s.io/client-go/tools/record/OWNERS b/vendor/k8s.io/client-go/tools/record/OWNERS new file mode 100644 index 0000000000..8105c4fe08 --- /dev/null +++ b/vendor/k8s.io/client-go/tools/record/OWNERS @@ -0,0 +1,6 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +reviewers: + - sig-instrumentation-reviewers +approvers: + - sig-instrumentation-approvers diff --git a/vendor/k8s.io/client-go/transport/OWNERS b/vendor/k8s.io/client-go/transport/OWNERS new file mode 100644 index 0000000000..34adee5ec5 --- /dev/null +++ b/vendor/k8s.io/client-go/transport/OWNERS @@ -0,0 +1,8 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +reviewers: + - smarterclayton + - wojtek-t + - deads2k + - liggitt + - caesarxuchao diff --git a/vendor/k8s.io/client-go/util/cert/OWNERS b/vendor/k8s.io/client-go/util/cert/OWNERS new file mode 100644 index 0000000000..3c3b94c58c --- /dev/null +++ b/vendor/k8s.io/client-go/util/cert/OWNERS @@ -0,0 +1,8 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +approvers: + - sig-auth-certificates-approvers +reviewers: + - sig-auth-certificates-reviewers +labels: + - sig/auth diff --git a/vendor/k8s.io/client-go/util/keyutil/OWNERS b/vendor/k8s.io/client-go/util/keyutil/OWNERS new file mode 100644 index 0000000000..e6d229d5db --- /dev/null +++ b/vendor/k8s.io/client-go/util/keyutil/OWNERS @@ -0,0 +1,6 @@ +approvers: + - sig-auth-certificates-approvers +reviewers: + - sig-auth-certificates-reviewers +labels: + - sig/auth diff --git a/vendor/k8s.io/client-go/util/retry/OWNERS b/vendor/k8s.io/client-go/util/retry/OWNERS new file mode 100644 index 0000000000..75736b5aac --- /dev/null +++ b/vendor/k8s.io/client-go/util/retry/OWNERS @@ -0,0 +1,4 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +reviewers: + - caesarxuchao diff --git a/vendor/k8s.io/code-generator/OWNERS b/vendor/k8s.io/code-generator/OWNERS new file mode 100644 index 0000000000..3b87391c29 --- /dev/null +++ b/vendor/k8s.io/code-generator/OWNERS @@ -0,0 +1,15 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +approvers: + - deads2k + - wojtek-t + - sttts +reviewers: + - deads2k + - wojtek-t + - sttts +labels: + - sig/api-machinery + - area/code-generation +emeritus_approvers: + - lavalamp diff --git a/vendor/k8s.io/code-generator/cmd/client-gen/OWNERS b/vendor/k8s.io/code-generator/cmd/client-gen/OWNERS new file mode 100644 index 0000000000..967eb2a7bb --- /dev/null +++ b/vendor/k8s.io/code-generator/cmd/client-gen/OWNERS @@ -0,0 +1,11 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +approvers: + - wojtek-t + - caesarxuchao +reviewers: + - wojtek-t + - caesarxuchao + - jpbetz +emeritus_approvers: + - lavalamp diff --git a/vendor/k8s.io/code-generator/cmd/go-to-protobuf/OWNERS b/vendor/k8s.io/code-generator/cmd/go-to-protobuf/OWNERS new file mode 100644 index 0000000000..af7e2ec4c7 --- /dev/null +++ b/vendor/k8s.io/code-generator/cmd/go-to-protobuf/OWNERS @@ -0,0 +1,6 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +approvers: + - smarterclayton +reviewers: + - smarterclayton diff --git a/vendor/k8s.io/code-generator/generate-groups.sh b/vendor/k8s.io/code-generator/generate-groups.sh old mode 100755 new mode 100644 diff --git a/vendor/k8s.io/code-generator/generate-internal-groups.sh b/vendor/k8s.io/code-generator/generate-internal-groups.sh old mode 100755 new mode 100644 diff --git a/vendor/k8s.io/code-generator/kube_codegen.sh b/vendor/k8s.io/code-generator/kube_codegen.sh old mode 100755 new mode 100644 diff --git a/vendor/k8s.io/klog/v2/OWNERS b/vendor/k8s.io/klog/v2/OWNERS new file mode 100644 index 0000000000..7500475a64 --- /dev/null +++ b/vendor/k8s.io/klog/v2/OWNERS @@ -0,0 +1,16 @@ +# See the OWNERS docs at https://go.k8s.io/owners +reviewers: + - harshanarayana + - mengjiao-liu + - pohly +approvers: + - dims + - pohly + - thockin +emeritus_approvers: + - brancz + - justinsb + - lavalamp + - piosz + - serathius + - tallclair diff --git a/vendor/k8s.io/kube-openapi/pkg/generators/rules/OWNERS b/vendor/k8s.io/kube-openapi/pkg/generators/rules/OWNERS new file mode 100644 index 0000000000..235bc545b8 --- /dev/null +++ b/vendor/k8s.io/kube-openapi/pkg/generators/rules/OWNERS @@ -0,0 +1,4 @@ +reviewers: +- roycaihw +approvers: +- roycaihw diff --git a/vendor/k8s.io/kube-openapi/pkg/util/proto/OWNERS b/vendor/k8s.io/kube-openapi/pkg/util/proto/OWNERS new file mode 100644 index 0000000000..9621a6a3a4 --- /dev/null +++ b/vendor/k8s.io/kube-openapi/pkg/util/proto/OWNERS @@ -0,0 +1,2 @@ +approvers: +- apelisse diff --git a/vendor/k8s.io/utils/pointer/OWNERS b/vendor/k8s.io/utils/pointer/OWNERS new file mode 100644 index 0000000000..0d6392752a --- /dev/null +++ b/vendor/k8s.io/utils/pointer/OWNERS @@ -0,0 +1,10 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +approvers: +- apelisse +- stewart-yu +- thockin +reviewers: +- apelisse +- stewart-yu +- thockin diff --git a/vendor/k8s.io/utils/ptr/OWNERS b/vendor/k8s.io/utils/ptr/OWNERS new file mode 100644 index 0000000000..0d6392752a --- /dev/null +++ b/vendor/k8s.io/utils/ptr/OWNERS @@ -0,0 +1,10 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +approvers: +- apelisse +- stewart-yu +- thockin +reviewers: +- apelisse +- stewart-yu +- thockin diff --git a/vendor/knative.dev/eventing/test/OWNERS b/vendor/knative.dev/eventing/test/OWNERS new file mode 100644 index 0000000000..65aa9e7b11 --- /dev/null +++ b/vendor/knative.dev/eventing/test/OWNERS @@ -0,0 +1,10 @@ +# The OWNERS file is used by prow to automatically merge approved PRs. + +approvers: +- productivity-writers + +reviewers: +- productivity-reviewers + +labels: +- area/test-and-release diff --git a/vendor/knative.dev/eventing/test/e2e-common.sh b/vendor/knative.dev/eventing/test/e2e-common.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/eventing/test/e2e-conformance-tests.sh b/vendor/knative.dev/eventing/test/e2e-conformance-tests.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/eventing/test/e2e-rekt-tests.sh b/vendor/knative.dev/eventing/test/e2e-rekt-tests.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/eventing/test/e2e-tests.sh b/vendor/knative.dev/eventing/test/e2e-tests.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/eventing/test/e2e-upgrade-tests.sh b/vendor/knative.dev/eventing/test/e2e-upgrade-tests.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/eventing/test/lib/recordevents/resources.go b/vendor/knative.dev/eventing/test/lib/recordevents/resources.go index c10915dfdf..c02661fd78 100644 --- a/vendor/knative.dev/eventing/test/lib/recordevents/resources.go +++ b/vendor/knative.dev/eventing/test/lib/recordevents/resources.go @@ -86,10 +86,6 @@ func recordEventsPod(imageName string, name string, serviceAccountName string, r ObjectMeta: metav1.ObjectMeta{ Name: name, Labels: map[string]string{"e2etest": string(uuid.NewUUID())}, - Annotations: map[string]string{ - "sidecar.istio.io/inject": "true", - "sidecar.istio.io/rewriteAppHTTPProbers": "true", - }, }, Spec: corev1.PodSpec{ Containers: []corev1.Container{{ diff --git a/vendor/knative.dev/eventing/test/microbenchmarks-compare.sh b/vendor/knative.dev/eventing/test/microbenchmarks-compare.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/eventing/test/microbenchmarks-run.sh b/vendor/knative.dev/eventing/test/microbenchmarks-run.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/eventing/test/presubmit-tests.sh b/vendor/knative.dev/eventing/test/presubmit-tests.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/eventing/test/upload-test-images.sh b/vendor/knative.dev/eventing/test/upload-test-images.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/hack/OWNERS b/vendor/knative.dev/hack/OWNERS new file mode 100644 index 0000000000..4d20bf8cff --- /dev/null +++ b/vendor/knative.dev/hack/OWNERS @@ -0,0 +1,8 @@ +approvers: + - technical-oversight-committee + - productivity-writers + - knative-release-leads + +reviewers: + - productivity-writers + - productivity-reviewers diff --git a/vendor/knative.dev/hack/OWNERS_ALIASES b/vendor/knative.dev/hack/OWNERS_ALIASES new file mode 100644 index 0000000000..3cd6aae205 --- /dev/null +++ b/vendor/knative.dev/hack/OWNERS_ALIASES @@ -0,0 +1,143 @@ +# This file is auto-generated from peribolos. +# Do not modify this file, instead modify peribolos/knative.yaml + +aliases: + client-reviewers: + - itsmurugappan + client-wg-leads: + - dsimansk + - rhuss + client-writers: + - dsimansk + - rhuss + - vyasgun + docs-reviewers: + - nainaz + - retocode + - skonto + docs-writers: + - csantanapr + - retocode + - skonto + eventing-reviewers: + - Leo6Leo + - aslom + - cali0707 + - creydr + eventing-wg-leads: + - pierDipi + eventing-writers: + - Leo6Leo + - aliok + - cali0707 + - creydr + - lionelvillard + - matzew + - pierDipi + func-reviewers: + - jrangelramos + - nainaz + func-writers: + - gauron99 + - jrangelramos + - lance + - lkingland + - matejvasek + - matzew + - salaboy + functions-wg-leads: + - lkingland + - salaboy + knative-admin: + - aliok + - cardil + - davidhadas + - dprotaso + - dsimansk + - evankanderson + - knative-automation + - knative-prow-releaser-robot + - knative-prow-robot + - knative-prow-updater-robot + - knative-test-reporter-robot + - nainaz + - psschwei + - retocode + - salaboy + - skonto + - upodroid + knative-release-leads: + - dsimansk + - retocode + - skonto + knative-robots: + - knative-automation + - knative-prow-releaser-robot + - knative-prow-robot + - knative-prow-updater-robot + - knative-test-reporter-robot + operations-reviewers: + - aliok + - houshengbo + - matzew + operations-wg-leads: + - houshengbo + operations-writers: + - aliok + - houshengbo + - matzew + productivity-leads: + - cardil + - upodroid + productivity-reviewers: + - evankanderson + - mgencur + productivity-wg-leads: + - cardil + - upodroid + productivity-writers: + - cardil + - upodroid + security-wg-leads: + - davidhadas + - evankanderson + security-writers: + - davidhadas + - evankanderson + serving-approvers: + - ReToCode + - skonto + serving-reviewers: + - izabelacg + - retocode + - skonto + serving-triage: + - izabelacg + - retocode + - skonto + serving-wg-leads: + - dprotaso + serving-writers: + - ReToCode + - dprotaso + - skonto + steering-committee: + - aliok + - evankanderson + - nainaz + - salaboy + technical-oversight-committee: + - davidhadas + - dprotaso + - dsimansk + - psschwei + ux-wg-leads: + - cali0707 + - leo6leo + - mmejia02 + - zainabhusain227 + ux-writers: + - cali0707 + - leo6leo + - mmejia02 + - zainabhusain227 diff --git a/vendor/knative.dev/hack/codegen-library.sh b/vendor/knative.dev/hack/codegen-library.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/hack/e2e-tests.sh b/vendor/knative.dev/hack/e2e-tests.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/hack/infra-library.sh b/vendor/knative.dev/hack/infra-library.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/hack/library.sh b/vendor/knative.dev/hack/library.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/hack/microbenchmarks.sh b/vendor/knative.dev/hack/microbenchmarks.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/hack/performance-tests.sh b/vendor/knative.dev/hack/performance-tests.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/hack/presubmit-tests.sh b/vendor/knative.dev/hack/presubmit-tests.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/hack/release.sh b/vendor/knative.dev/hack/release.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/hack/shellcheck-presubmit.sh b/vendor/knative.dev/hack/shellcheck-presubmit.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/operator/pkg/apis/operator/v1beta1/knativeeventing_lifecycle.go b/vendor/knative.dev/operator/pkg/apis/operator/v1beta1/knativeeventing_lifecycle.go index 0dc8acd171..daac20f306 100644 --- a/vendor/knative.dev/operator/pkg/apis/operator/v1beta1/knativeeventing_lifecycle.go +++ b/vendor/knative.dev/operator/pkg/apis/operator/v1beta1/knativeeventing_lifecycle.go @@ -17,7 +17,6 @@ limitations under the License. package v1beta1 import ( - "os" "strings" "k8s.io/apimachinery/pkg/runtime/schema" @@ -133,7 +132,7 @@ func (es *KnativeEventingStatus) GetVersion() string { // SetVersion sets the currently installed version of the component. func (es *KnativeEventingStatus) SetVersion(version string) { - es.Version = os.Getenv("KNATIVE_EVENTING_VERSION") + es.Version = version } // GetManifests gets the url links of the manifests. diff --git a/vendor/knative.dev/operator/pkg/apis/operator/v1beta1/knativeserving_lifecycle.go b/vendor/knative.dev/operator/pkg/apis/operator/v1beta1/knativeserving_lifecycle.go index eb064a50e9..e59ab4c8dc 100644 --- a/vendor/knative.dev/operator/pkg/apis/operator/v1beta1/knativeserving_lifecycle.go +++ b/vendor/knative.dev/operator/pkg/apis/operator/v1beta1/knativeserving_lifecycle.go @@ -17,7 +17,6 @@ limitations under the License. package v1beta1 import ( - "os" "strings" "knative.dev/operator/pkg/apis/operator" @@ -133,7 +132,7 @@ func (is *KnativeServingStatus) GetVersion() string { // SetVersion sets the currently installed version of the component. func (is *KnativeServingStatus) SetVersion(version string) { - is.Version = os.Getenv("KNATIVE_SERVING_VERSION") + is.Version = version } // GetManifests gets the url links of the manifests. diff --git a/vendor/knative.dev/operator/pkg/reconciler/common/job.go b/vendor/knative.dev/operator/pkg/reconciler/common/job.go index 7542e92c34..240d33f866 100644 --- a/vendor/knative.dev/operator/pkg/reconciler/common/job.go +++ b/vendor/knative.dev/operator/pkg/reconciler/common/job.go @@ -40,7 +40,7 @@ func JobTransform(obj base.KComponent) mf.Transformer { component := "serving" if _, ok := obj.(*v1beta1.KnativeEventing); ok { - component = "" + component = "eventing" } if job.GetName() == "" { job.SetName(fmt.Sprintf("%s%s-%s", job.GetGenerateName(), component, TargetVersion(obj))) diff --git a/vendor/knative.dev/operator/pkg/reconciler/common/releases.go b/vendor/knative.dev/operator/pkg/reconciler/common/releases.go index ab42cb4535..2e190d2886 100644 --- a/vendor/knative.dev/operator/pkg/reconciler/common/releases.go +++ b/vendor/knative.dev/operator/pkg/reconciler/common/releases.go @@ -195,20 +195,18 @@ func getManifestWithVersionValidation(manifestsPath string, instance base.KCompo return manifests, nil } - // We support only one version, there is no need to check manifest consistency and it is actually a pain to experiment - // with future releases. - // - //targetVersion := SanitizeSemver(version) - //key := getVersionKey(instance) - //for _, u := range manifests.Resources() { - // // Check the labels of the resources one by one to see if the version matches the target version in terms of - // // major.minor. - // manifestVersion := u.GetLabels()[key] - // if manifestVersion != "" && semver.MajorMinor(targetVersion) != semver.MajorMinor(manifestVersion) { - // return mf.Manifest{}, fmt.Errorf("the version of the manifests %s of the component %s does not match the target "+ - // "version of the operator CR %s", manifestVersion, u.GetName(), targetVersion) - // } - //} + targetVersion := SanitizeSemver(version) + key := "app.kubernetes.io/version" + for _, u := range manifests.Resources() { + // Check the labels of the resources one by one to see if the version matches the target version in terms of + // major.minor. + manifestVersion := u.GetLabels()[key] + manifestVersionSan := SanitizeSemver(u.GetLabels()[key]) + if manifestVersion != "" && semver.MajorMinor(targetVersion) != semver.MajorMinor(manifestVersionSan) { + return mf.Manifest{}, fmt.Errorf("the version of the manifests %s of the component %s does not match the target "+ + "version of the operator CR %s", manifestVersionSan, u.GetName(), targetVersion) + } + } return manifests, nil } diff --git a/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/controller.go b/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/controller.go index 24227dd988..bc1340ebff 100644 --- a/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/controller.go +++ b/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/controller.go @@ -22,9 +22,6 @@ import ( "go.uber.org/zap" "k8s.io/client-go/tools/cache" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - namespaceinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/namespace" - "knative.dev/operator/pkg/apis/operator/v1beta1" operatorclient "knative.dev/operator/pkg/client/injection/client" knativeEventinginformer "knative.dev/operator/pkg/client/injection/informers/operator/v1beta1/knativeeventing" @@ -82,23 +79,6 @@ func NewExtendedController(generator common.ExtensionGenerator) injection.Contro knativeEventingInformer.Informer().AddEventHandler(controller.HandleAll(impl.Enqueue)) - namespaceinformer.Get(ctx).Informer().AddEventHandler(cache.FilteringResourceEventHandler{ - FilterFunc: func(obj interface{}) bool { - ns, ok := obj.(metav1.Object) - if !ok { - return false - } - v, ok := ns.GetLabels()["kubernetes.io/metadata.name"] - if !ok { - return false - } - return v == "knative-eventing" - }, - Handler: controller.HandleAll(func(i interface{}) { - impl.GlobalResync(knativeEventingInformer.Informer()) - }), - }) - deploymentInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{ FilterFunc: controller.FilterControllerGVK(v1beta1.SchemeGroupVersion.WithKind("KnativeEventing")), Handler: controller.HandleAll(impl.EnqueueControllerOf), diff --git a/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/eventing_backstage_plugin.go b/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/eventing_backstage_plugin.go deleted file mode 100644 index e23d375d67..0000000000 --- a/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/eventing_backstage_plugin.go +++ /dev/null @@ -1,79 +0,0 @@ -/* -Copyright 2023 The Knative Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package knativeeventing - -import ( - "context" - "fmt" - - mf "github.com/manifestival/manifestival" - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/meta" - "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "knative.dev/eventing/pkg/apis/feature" - - "knative.dev/operator/pkg/apis/operator/base" - "knative.dev/operator/pkg/apis/operator/v1beta1" -) - -var ( - backstageResourcesPred = byLabel("app.kubernetes.io/component", "eventmesh-backend") -) - -const ( - backstageBackendFeatureFlag = "backstage-backend" -) - -func (r *Reconciler) handleBackstageResources(ctx context.Context, manifests *mf.Manifest, comp base.KComponent) error { - instance := comp.(*v1beta1.KnativeEventing) - - if isBackstageEnabled(instance) { - return nil - } - - // Delete Backstage resources (if present) - toBeDeleted := manifests.Filter(backstageResourcesPred) - if err := toBeDeleted.Delete(mf.IgnoreNotFound(true)); err != nil && !meta.IsNoMatchError(err) { - return fmt.Errorf("failed to delete backstage resources: %v", err) - } - - // Filter out Backstage resources from the final list of manifests - *manifests = manifests.Filter(mf.Not(backstageResourcesPred)) - - return nil -} - -func byLabel(key, value string) mf.Predicate { - return func(u *unstructured.Unstructured) bool { - v, ok := u.GetLabels()[key] - return ok && v == value - } -} - -func isBackstageEnabled(instance *v1beta1.KnativeEventing) bool { - cmData, ok := getFeaturesConfig(instance) - if !ok { - return false - } - - f, err := feature.NewFlagsConfigFromConfigMap(&corev1.ConfigMap{Data: cmData}) - if err != nil { - return false - } - - return f.IsEnabled(backstageBackendFeatureFlag) -} diff --git a/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/knativeeventing.go b/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/knativeeventing.go index 59bd74dd12..cdecea40a7 100644 --- a/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/knativeeventing.go +++ b/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/knativeeventing.go @@ -124,6 +124,10 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, ke *v1beta1.KnativeEvent logger.Infow("Reconciling KnativeEventing", "status", ke.Status) + if err := common.IsVersionValidMigrationEligible(ke); err != nil { + ke.Status.MarkVersionMigrationNotEligible(err.Error()) + return nil + } ke.Status.MarkVersionMigrationEligible() if err := r.extension.Reconcile(ctx, ke); err != nil { @@ -134,13 +138,8 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, ke *v1beta1.KnativeEvent source.AppendTargetSources, common.AppendAdditionalManifests, r.appendExtensionManifests, - func(ctx context.Context, manifest *mf.Manifest, component base.KComponent) error { - *manifest = manifest.Filter(mf.Not(mf.All(mf.ByKind("Namespace"), mf.ByName("knative-eventing")))) - return nil - }, r.transform, r.handleTLSResources, - r.handleBackstageResources, manifests.Install, common.CheckDeployments, common.InstallWebhookConfigs, diff --git a/vendor/knative.dev/operator/pkg/reconciler/knativeserving/knativeserving.go b/vendor/knative.dev/operator/pkg/reconciler/knativeserving/knativeserving.go index d760dfb678..6810585b52 100644 --- a/vendor/knative.dev/operator/pkg/reconciler/knativeserving/knativeserving.go +++ b/vendor/knative.dev/operator/pkg/reconciler/knativeserving/knativeserving.go @@ -19,15 +19,14 @@ package knativeserving import ( "context" "fmt" - "os" + mf "github.com/manifestival/manifestival" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" "knative.dev/pkg/logging" pkgreconciler "knative.dev/pkg/reconciler" - mf "github.com/manifestival/manifestival" - "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" + "knative.dev/operator/pkg/apis/operator/base" "knative.dev/operator/pkg/apis/operator/v1beta1" clientset "knative.dev/operator/pkg/client/clientset/versioned" @@ -91,12 +90,6 @@ func (r *Reconciler) FinalizeKind(ctx context.Context, original *v1beta1.Knative if manifest == nil { return nil } - // we need this to apply the correct namespace to the resources otherwise it defaults to knative-serving - *manifest, err = manifest.Transform(overrideKourierNamespace(original)) - if err != nil { - logger.Error("Unable to apply kourier namespace transform", err) - return nil - } if err := common.Uninstall(manifest); err != nil { logger.Error("Failed to finalize platform resources", err) @@ -104,20 +97,6 @@ func (r *Reconciler) FinalizeKind(ctx context.Context, original *v1beta1.Knative return nil } -func overrideKourierNamespace(ks base.KComponent) mf.Transformer { - if ns, required := os.LookupEnv("REQUIRED_SERVING_INGRESS_NAMESPACE"); required { - nsInjector := mf.InjectNamespace(ns) - return func(u *unstructured.Unstructured) error { - provider := u.GetLabels()["networking.knative.dev/ingress-provider"] - if provider != "kourier" { - return nil - } - return nsInjector(u) - } - } - return nil -} - // ReconcileKind compares the actual state with the desired, and attempts to // converge the two. func (r *Reconciler) ReconcileKind(ctx context.Context, ks *v1beta1.KnativeServing) pkgreconciler.Event { @@ -127,6 +106,10 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, ks *v1beta1.KnativeServi logger.Infow("Reconciling KnativeServing", "status", ks.Status) + if err := common.IsVersionValidMigrationEligible(ks); err != nil { + ks.Status.MarkVersionMigrationNotEligible(err.Error()) + return nil + } ks.Status.MarkVersionMigrationEligible() if err := r.extension.Reconcile(ctx, ks); err != nil { @@ -138,10 +121,6 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, ks *v1beta1.KnativeServi security.AppendTargetSecurity, common.AppendAdditionalManifests, r.appendExtensionManifests, - func(ctx context.Context, manifest *mf.Manifest, component base.KComponent) error { - *manifest = manifest.Filter(mf.Not(mf.All(mf.ByKind("Namespace"), mf.ByName("kourier-system")))) - return nil - }, r.transform, manifests.Install, common.CheckDeployments, diff --git a/vendor/knative.dev/pkg/apis/OWNERS b/vendor/knative.dev/pkg/apis/OWNERS new file mode 100644 index 0000000000..13014203fc --- /dev/null +++ b/vendor/knative.dev/pkg/apis/OWNERS @@ -0,0 +1,15 @@ +# The OWNERS file is used by prow to automatically merge approved PRs. + +approvers: +- technical-oversight-committee +- serving-wg-leads +- eventing-wg-leads + +reviewers: +- serving-writers +- eventing-writers +- eventing-reviewers +- serving-reviewers + +options: + no_parent_owners: true diff --git a/vendor/knative.dev/pkg/apis/duck/OWNERS b/vendor/knative.dev/pkg/apis/duck/OWNERS new file mode 100644 index 0000000000..af1eb05dac --- /dev/null +++ b/vendor/knative.dev/pkg/apis/duck/OWNERS @@ -0,0 +1,8 @@ +# The OWNERS file is used by prow to automatically merge approved PRs. + +approvers: +- eventing-wg-leads + +reviewers: +- eventing-reviewers +- eventing-writers diff --git a/vendor/knative.dev/pkg/controller/OWNERS b/vendor/knative.dev/pkg/controller/OWNERS new file mode 100644 index 0000000000..64660c9e35 --- /dev/null +++ b/vendor/knative.dev/pkg/controller/OWNERS @@ -0,0 +1,7 @@ +# The OWNERS file is used by prow to automatically merge approved PRs. + +approvers: +- serving-writers + +reviewers: +- serving-reviewers diff --git a/vendor/knative.dev/pkg/environment/client_config.go b/vendor/knative.dev/pkg/environment/client_config.go index b4c52ceb85..9f1883d236 100644 --- a/vendor/knative.dev/pkg/environment/client_config.go +++ b/vendor/knative.dev/pkg/environment/client_config.go @@ -44,10 +44,8 @@ func (c *ClientConfig) InitFlags(fs *flag.FlagSet) { fs.StringVar(&c.ServerURL, "server", "", "The address of the Kubernetes API server. Overrides any value in kubeconfig. Only required if out-of-cluster.") - if fs.Lookup("kubeconfig") == nil { - fs.StringVar(&c.Kubeconfig, "kubeconfig", os.Getenv("KUBECONFIG"), - "Path to a kubeconfig. Only required if out-of-cluster.") - } + fs.StringVar(&c.Kubeconfig, "kubeconfig", os.Getenv("KUBECONFIG"), + "Path to a kubeconfig. Only required if out-of-cluster.") fs.IntVar(&c.Burst, "kube-api-burst", int(envVarOrDefault("KUBE_API_BURST", 0)), "Maximum burst for throttle.") diff --git a/vendor/knative.dev/pkg/hack/format-code.sh b/vendor/knative.dev/pkg/hack/format-code.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/pkg/hack/generate-knative.sh b/vendor/knative.dev/pkg/hack/generate-knative.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/pkg/hack/update-codegen.sh b/vendor/knative.dev/pkg/hack/update-codegen.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/pkg/hack/update-deps.sh b/vendor/knative.dev/pkg/hack/update-deps.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/pkg/hack/verify-codegen.sh b/vendor/knative.dev/pkg/hack/verify-codegen.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/pkg/reconciler/OWNERS b/vendor/knative.dev/pkg/reconciler/OWNERS new file mode 100644 index 0000000000..136197a303 --- /dev/null +++ b/vendor/knative.dev/pkg/reconciler/OWNERS @@ -0,0 +1,7 @@ +# The OWNERS file is used by prow to automatically merge approved PRs. + +approvers: +- serving-writers + +reviewers: +- serving-writers diff --git a/vendor/knative.dev/pkg/resolver/OWNERS b/vendor/knative.dev/pkg/resolver/OWNERS new file mode 100644 index 0000000000..b5e9581f4e --- /dev/null +++ b/vendor/knative.dev/pkg/resolver/OWNERS @@ -0,0 +1,8 @@ +# The OWNERS file is used by prow to automatically merge approved PRs. + +approvers: +- eventing-writers + +reviewers: +- eventing-reviewers + diff --git a/vendor/knative.dev/pkg/test/OWNERS b/vendor/knative.dev/pkg/test/OWNERS new file mode 100644 index 0000000000..65aa9e7b11 --- /dev/null +++ b/vendor/knative.dev/pkg/test/OWNERS @@ -0,0 +1,10 @@ +# The OWNERS file is used by prow to automatically merge approved PRs. + +approvers: +- productivity-writers + +reviewers: +- productivity-reviewers + +labels: +- area/test-and-release diff --git a/vendor/knative.dev/pkg/test/helpers/name.go b/vendor/knative.dev/pkg/test/helpers/name.go index 8af880d311..18a93f2518 100644 --- a/vendor/knative.dev/pkg/test/helpers/name.go +++ b/vendor/knative.dev/pkg/test/helpers/name.go @@ -27,7 +27,7 @@ import ( const ( letterBytes = "abcdefghijklmnopqrstuvwxyz" randSuffixLen = 8 - nameLengthLimit = 40 + nameLengthLimit = 50 sep = '-' sepS = "-" testNamePrefix = "Test" diff --git a/vendor/knative.dev/pkg/test/presubmit-tests.sh b/vendor/knative.dev/pkg/test/presubmit-tests.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/pkg/test/spoof/openshift_checks.go b/vendor/knative.dev/pkg/test/spoof/openshift_checks.go deleted file mode 100644 index f7ba08f828..0000000000 --- a/vendor/knative.dev/pkg/test/spoof/openshift_checks.go +++ /dev/null @@ -1,22 +0,0 @@ -package spoof - -import ( - "fmt" - "net/http" - "strings" -) - -// isUnknownAuthority checks if the error contains "certificate signed by unknown authority". -// This error happens when OpenShift Route starts/changes to use passthrough mode. It takes a little bit time to be synced. -func isUnknownAuthority(err error) bool { - return err != nil && strings.Contains(err.Error(), "certificate signed by unknown authority") -} - -// RetryingRouteInconsistency retries common requests seen when creating a new route -// - 503 to account for Openshift route inconsistency (https://jira.coreos.com/browse/SRVKS-157) -func RouteInconsistencyRetryChecker(resp *Response) (bool, error) { - if resp.StatusCode == http.StatusServiceUnavailable { - return true, fmt.Errorf("retrying route inconsistency request: %s", resp) - } - return false, nil -} diff --git a/vendor/knative.dev/pkg/test/spoof/spoof.go b/vendor/knative.dev/pkg/test/spoof/spoof.go index 2c7c5a8a68..ac1c23e7dc 100644 --- a/vendor/knative.dev/pkg/test/spoof/spoof.go +++ b/vendor/knative.dev/pkg/test/spoof/spoof.go @@ -164,7 +164,7 @@ func (sc *SpoofingClient) Do(req *http.Request, errorRetryCheckers ...interface{ // If no retry checkers are specified `DefaultErrorRetryChecker` will be used. func (sc *SpoofingClient) Poll(req *http.Request, inState ResponseChecker, checkers ...interface{}) (*Response, error) { if len(checkers) == 0 { - checkers = []interface{}{ErrorRetryChecker(DefaultErrorRetryChecker), ResponseRetryChecker(DefaultResponseRetryChecker), ResponseRetryChecker(RouteInconsistencyRetryChecker)} + checkers = []interface{}{ErrorRetryChecker(DefaultErrorRetryChecker), ResponseRetryChecker(DefaultResponseRetryChecker)} } var resp *Response @@ -252,9 +252,6 @@ func DefaultErrorRetryChecker(err error) (bool, error) { if isNoRouteToHostError(err) { return true, fmt.Errorf("retrying for 'no route to host' error: %w", err) } - if isUnknownAuthority(err) { - return true, fmt.Errorf("retrying for certificate signed by unknown authority: %w", err) - } return false, err } diff --git a/vendor/knative.dev/pkg/test/test-reconciler-codegen.sh b/vendor/knative.dev/pkg/test/test-reconciler-codegen.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/pkg/test/upgrade/shell/fail-example.sh b/vendor/knative.dev/pkg/test/upgrade/shell/fail-example.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/pkg/webhook/OWNERS b/vendor/knative.dev/pkg/webhook/OWNERS new file mode 100644 index 0000000000..64660c9e35 --- /dev/null +++ b/vendor/knative.dev/pkg/webhook/OWNERS @@ -0,0 +1,7 @@ +# The OWNERS file is used by prow to automatically merge approved PRs. + +approvers: +- serving-writers + +reviewers: +- serving-reviewers diff --git a/vendor/knative.dev/pkg/webhook/resourcesemantics/conversion/reconciler.go b/vendor/knative.dev/pkg/webhook/resourcesemantics/conversion/reconciler.go index 49568b28a7..f23b055872 100644 --- a/vendor/knative.dev/pkg/webhook/resourcesemantics/conversion/reconciler.go +++ b/vendor/knative.dev/pkg/webhook/resourcesemantics/conversion/reconciler.go @@ -19,7 +19,6 @@ package conversion import ( "context" "fmt" - "os" "go.uber.org/zap" apixv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" @@ -78,9 +77,6 @@ func (r *reconciler) Reconcile(ctx context.Context, key string) error { return err } - if os.Getenv("USE_OLM_TLS") != "" { // olm will do the crd update - return nil - } cacert, ok := secret.Data[certresources.CACert] if !ok { return fmt.Errorf("secret %q is missing %q key", r.secretName, certresources.CACert) diff --git a/vendor/knative.dev/reconciler-test/pkg/feature/feature.go b/vendor/knative.dev/reconciler-test/pkg/feature/feature.go index d59ae5e761..7a7d410423 100644 --- a/vendor/knative.dev/reconciler-test/pkg/feature/feature.go +++ b/vendor/knative.dev/reconciler-test/pkg/feature/feature.go @@ -252,15 +252,6 @@ func DeleteResources(ctx context.Context, t T, refs []corev1.ObjectReference) er return false, fmt.Errorf("failed to get resource %+v %s/%s: %w", resource, ref.Namespace, ref.Name, err) } - // Repeat deleting service accounts. - // Workaround for https://issues.redhat.com/browse/OCPBUGS-35731 - if resource.Resource == "serviceaccounts" { - err = dc.Resource(resource).Namespace(ref.Namespace).Delete(ctx, ref.Name, metav1.DeleteOptions{}) - if err != nil && !apierrors.IsNotFound(err) { - t.Logf("Warning, failed to delete %s/%s of GVR: %+v: %v", ref.Namespace, ref.Name, resource, err) - } - } - lastResource = ref t.Logf("Resource %+v %s/%s still present", resource, ref.Namespace, ref.Name) return false, nil diff --git a/vendor/knative.dev/serving/test/e2e-common.sh b/vendor/knative.dev/serving/test/e2e-common.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/serving/test/e2e-external-domain-tls-tests.sh b/vendor/knative.dev/serving/test/e2e-external-domain-tls-tests.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/serving/test/e2e-networking-library.sh b/vendor/knative.dev/serving/test/e2e-networking-library.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/serving/test/e2e-tests.sh b/vendor/knative.dev/serving/test/e2e-tests.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/serving/test/e2e-upgrade-tests.sh b/vendor/knative.dev/serving/test/e2e-upgrade-tests.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/serving/test/presubmit-tests.sh b/vendor/knative.dev/serving/test/presubmit-tests.sh old mode 100755 new mode 100644 diff --git a/vendor/knative.dev/serving/test/upload-test-images.sh b/vendor/knative.dev/serving/test/upload-test-images.sh old mode 100755 new mode 100644 diff --git a/vendor/modules.txt b/vendor/modules.txt index 1e4e4c9776..f8d3b6a631 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -109,7 +109,7 @@ github.com/go-kit/log/level # github.com/go-logfmt/logfmt v0.5.1 ## explicit; go 1.17 github.com/go-logfmt/logfmt -# github.com/go-logr/logr v1.4.2 +# github.com/go-logr/logr v1.4.3 ## explicit; go 1.18 github.com/go-logr/logr github.com/go-logr/logr/slogr @@ -478,7 +478,7 @@ github.com/rs/dnscache # github.com/sirupsen/logrus v1.9.3 ## explicit; go 1.13 github.com/sirupsen/logrus -# github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace +# github.com/spf13/pflag v1.0.10 ## explicit; go 1.12 github.com/spf13/pflag # github.com/stretchr/testify v1.9.0 @@ -545,7 +545,7 @@ go.uber.org/automaxprocs/maxprocs # go.uber.org/multierr v1.11.0 ## explicit; go 1.19 go.uber.org/multierr -# go.uber.org/zap v1.27.0 +# go.uber.org/zap v1.27.1 ## explicit; go 1.19 go.uber.org/zap go.uber.org/zap/buffer diff --git a/vendor/sigs.k8s.io/json/OWNERS b/vendor/sigs.k8s.io/json/OWNERS new file mode 100644 index 0000000000..0fadafbddb --- /dev/null +++ b/vendor/sigs.k8s.io/json/OWNERS @@ -0,0 +1,6 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +approvers: + - deads2k + - lavalamp + - liggitt diff --git a/vendor/sigs.k8s.io/yaml/OWNERS b/vendor/sigs.k8s.io/yaml/OWNERS new file mode 100644 index 0000000000..003a149e15 --- /dev/null +++ b/vendor/sigs.k8s.io/yaml/OWNERS @@ -0,0 +1,23 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +approvers: +- dims +- jpbetz +- smarterclayton +- deads2k +- sttts +- liggitt +reviewers: +- dims +- thockin +- jpbetz +- smarterclayton +- wojtek-t +- deads2k +- derekwaynecarr +- mikedanese +- liggitt +- sttts +- tallclair +labels: +- sig/api-machinery diff --git a/vendor/sigs.k8s.io/yaml/goyaml.v2/OWNERS b/vendor/sigs.k8s.io/yaml/goyaml.v2/OWNERS new file mode 100644 index 0000000000..73be0a3a9b --- /dev/null +++ b/vendor/sigs.k8s.io/yaml/goyaml.v2/OWNERS @@ -0,0 +1,24 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +approvers: +- dims +- jpbetz +- smarterclayton +- deads2k +- sttts +- liggitt +- natasha41575 +- knverey +reviewers: +- dims +- thockin +- jpbetz +- smarterclayton +- deads2k +- derekwaynecarr +- mikedanese +- liggitt +- sttts +- tallclair +labels: +- sig/api-machinery From 9b5ba16e59dd5934aabd8b2f9e506a2f67ea435f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 21 Mar 2026 13:08:02 +0000 Subject: [PATCH 2/2] Run make generated-files --- knative-operator/Dockerfile | 11 +- must-gather/Dockerfile | 9 +- .../serverless-operator-index/Dockerfile | 2 +- ...erless-operator.clusterserviceversion.yaml | 264 +++++++++--------- openshift-knative-operator/Dockerfile | 11 +- rpms.lock.yaml | 144 +++++----- serving/ingress/Dockerfile | 11 +- serving/metadata-webhook/Dockerfile | 7 +- test/images-rekt.yaml | 4 +- vendor/github.com/IBM/sarama/entrypoint.sh | 0 .../github.com/cespare/xxhash/v2/testall.sh | 0 .../emicklei/go-restful/v3/bench_test.sh | 0 .../emicklei/go-restful/v3/coverage.sh | 0 .../v2/internal/httprule/BUILD.bazel | 35 --- .../grpc-gateway/v2/runtime/BUILD.bazel | 97 ------- .../grpc-gateway/v2/utilities/BUILD.bazel | 31 -- vendor/github.com/json-iterator/go/build.sh | 0 vendor/github.com/json-iterator/go/test.sh | 0 vendor/github.com/klauspost/compress/gen.sh | 0 .../manifestival/manifestival/manifestival.go | 10 +- .../github.com/modern-go/concurrent/test.sh | 0 .../api/route/v1/test-route-validation.sh | 0 vendor/github.com/pelletier/go-toml/v2/ci.sh | 0 .../rcrowley/go-metrics/validate.sh | 0 .../github.com/rickb777/plural/build+test.sh | 0 vendor/go.uber.org/zap/checklicense.sh | 0 vendor/golang.org/x/sys/plan9/mkall.sh | 0 vendor/golang.org/x/sys/plan9/mkerrors.sh | 0 .../golang.org/x/sys/plan9/mksysnum_plan9.sh | 0 vendor/golang.org/x/sys/unix/mkall.sh | 0 vendor/golang.org/x/sys/unix/mkerrors.sh | 0 .../k8s.io/apimachinery/pkg/api/errors/OWNERS | 16 -- .../k8s.io/apimachinery/pkg/api/meta/OWNERS | 14 - .../apimachinery/pkg/api/resource/OWNERS | 10 - .../apimachinery/pkg/api/validation/OWNERS | 11 - .../apimachinery/pkg/apis/meta/v1/OWNERS | 16 -- .../apimachinery/pkg/util/mergepatch/OWNERS | 6 - .../pkg/util/strategicpatch/OWNERS | 9 - .../apimachinery/pkg/util/validation/OWNERS | 11 - .../third_party/forked/golang/json/OWNERS | 6 - vendor/k8s.io/client-go/openapi/OWNERS | 4 - .../pkg/apis/clientauthentication/OWNERS | 8 - vendor/k8s.io/client-go/rest/OWNERS | 14 - vendor/k8s.io/client-go/tools/auth/OWNERS | 8 - vendor/k8s.io/client-go/tools/cache/OWNERS | 28 -- .../client-go/tools/leaderelection/OWNERS | 11 - vendor/k8s.io/client-go/tools/metrics/OWNERS | 5 - vendor/k8s.io/client-go/tools/record/OWNERS | 6 - vendor/k8s.io/client-go/transport/OWNERS | 8 - vendor/k8s.io/client-go/util/cert/OWNERS | 8 - vendor/k8s.io/client-go/util/keyutil/OWNERS | 6 - vendor/k8s.io/client-go/util/retry/OWNERS | 4 - vendor/k8s.io/code-generator/OWNERS | 15 - .../code-generator/cmd/client-gen/OWNERS | 11 - .../code-generator/cmd/go-to-protobuf/OWNERS | 6 - .../k8s.io/code-generator/generate-groups.sh | 0 .../generate-internal-groups.sh | 0 vendor/k8s.io/code-generator/kube_codegen.sh | 0 vendor/k8s.io/klog/v2/OWNERS | 16 -- .../kube-openapi/pkg/generators/rules/OWNERS | 4 - .../k8s.io/kube-openapi/pkg/util/proto/OWNERS | 2 - vendor/k8s.io/utils/pointer/OWNERS | 10 - vendor/k8s.io/utils/ptr/OWNERS | 10 - vendor/knative.dev/eventing/test/OWNERS | 10 - .../knative.dev/eventing/test/e2e-common.sh | 0 .../eventing/test/e2e-conformance-tests.sh | 0 .../eventing/test/e2e-rekt-tests.sh | 0 vendor/knative.dev/eventing/test/e2e-tests.sh | 0 .../eventing/test/e2e-upgrade-tests.sh | 0 .../test/lib/recordevents/resources.go | 4 + .../eventing/test/microbenchmarks-compare.sh | 0 .../eventing/test/microbenchmarks-run.sh | 0 .../eventing/test/presubmit-tests.sh | 0 .../eventing/test/upload-test-images.sh | 0 vendor/knative.dev/hack/OWNERS | 8 - vendor/knative.dev/hack/OWNERS_ALIASES | 143 ---------- vendor/knative.dev/hack/codegen-library.sh | 0 vendor/knative.dev/hack/e2e-tests.sh | 0 vendor/knative.dev/hack/infra-library.sh | 0 vendor/knative.dev/hack/library.sh | 0 vendor/knative.dev/hack/microbenchmarks.sh | 0 vendor/knative.dev/hack/performance-tests.sh | 0 vendor/knative.dev/hack/presubmit-tests.sh | 0 vendor/knative.dev/hack/release.sh | 0 .../knative.dev/hack/shellcheck-presubmit.sh | 0 .../v1beta1/knativeeventing_lifecycle.go | 3 +- .../v1beta1/knativeserving_lifecycle.go | 3 +- .../operator/pkg/reconciler/common/job.go | 2 +- .../pkg/reconciler/common/releases.go | 26 +- .../reconciler/knativeeventing/controller.go | 20 ++ .../eventing_backstage_plugin.go | 79 ++++++ .../knativeeventing/knativeeventing.go | 9 +- .../knativeserving/knativeserving.go | 33 ++- vendor/knative.dev/pkg/apis/OWNERS | 15 - vendor/knative.dev/pkg/apis/duck/OWNERS | 8 - vendor/knative.dev/pkg/controller/OWNERS | 7 - .../pkg/environment/client_config.go | 6 +- vendor/knative.dev/pkg/hack/format-code.sh | 0 .../knative.dev/pkg/hack/generate-knative.sh | 0 vendor/knative.dev/pkg/hack/update-codegen.sh | 0 vendor/knative.dev/pkg/hack/update-deps.sh | 0 vendor/knative.dev/pkg/hack/verify-codegen.sh | 0 vendor/knative.dev/pkg/reconciler/OWNERS | 7 - vendor/knative.dev/pkg/resolver/OWNERS | 8 - vendor/knative.dev/pkg/test/OWNERS | 10 - vendor/knative.dev/pkg/test/helpers/name.go | 2 +- .../knative.dev/pkg/test/presubmit-tests.sh | 0 .../pkg/test/spoof/openshift_checks.go | 22 ++ vendor/knative.dev/pkg/test/spoof/spoof.go | 5 +- .../pkg/test/test-reconciler-codegen.sh | 0 .../pkg/test/upgrade/shell/fail-example.sh | 0 vendor/knative.dev/pkg/webhook/OWNERS | 7 - .../conversion/reconciler.go | 4 + .../reconciler-test/pkg/feature/feature.go | 9 + vendor/knative.dev/serving/test/e2e-common.sh | 0 .../test/e2e-external-domain-tls-tests.sh | 0 .../serving/test/e2e-networking-library.sh | 0 vendor/knative.dev/serving/test/e2e-tests.sh | 0 .../serving/test/e2e-upgrade-tests.sh | 0 .../serving/test/presubmit-tests.sh | 0 .../serving/test/upload-test-images.sh | 0 vendor/sigs.k8s.io/json/OWNERS | 6 - vendor/sigs.k8s.io/yaml/OWNERS | 23 -- vendor/sigs.k8s.io/yaml/goyaml.v2/OWNERS | 24 -- 124 files changed, 446 insertions(+), 976 deletions(-) mode change 100644 => 100755 vendor/github.com/IBM/sarama/entrypoint.sh mode change 100644 => 100755 vendor/github.com/cespare/xxhash/v2/testall.sh mode change 100644 => 100755 vendor/github.com/emicklei/go-restful/v3/bench_test.sh mode change 100644 => 100755 vendor/github.com/emicklei/go-restful/v3/coverage.sh delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/v2/internal/httprule/BUILD.bazel delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/v2/runtime/BUILD.bazel delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/v2/utilities/BUILD.bazel mode change 100644 => 100755 vendor/github.com/json-iterator/go/build.sh mode change 100644 => 100755 vendor/github.com/json-iterator/go/test.sh mode change 100644 => 100755 vendor/github.com/klauspost/compress/gen.sh mode change 100644 => 100755 vendor/github.com/modern-go/concurrent/test.sh mode change 100644 => 100755 vendor/github.com/openshift/api/route/v1/test-route-validation.sh mode change 100644 => 100755 vendor/github.com/pelletier/go-toml/v2/ci.sh mode change 100644 => 100755 vendor/github.com/rcrowley/go-metrics/validate.sh mode change 100644 => 100755 vendor/github.com/rickb777/plural/build+test.sh mode change 100644 => 100755 vendor/go.uber.org/zap/checklicense.sh mode change 100644 => 100755 vendor/golang.org/x/sys/plan9/mkall.sh mode change 100644 => 100755 vendor/golang.org/x/sys/plan9/mkerrors.sh mode change 100644 => 100755 vendor/golang.org/x/sys/plan9/mksysnum_plan9.sh mode change 100644 => 100755 vendor/golang.org/x/sys/unix/mkall.sh mode change 100644 => 100755 vendor/golang.org/x/sys/unix/mkerrors.sh delete mode 100644 vendor/k8s.io/apimachinery/pkg/api/errors/OWNERS delete mode 100644 vendor/k8s.io/apimachinery/pkg/api/meta/OWNERS delete mode 100644 vendor/k8s.io/apimachinery/pkg/api/resource/OWNERS delete mode 100644 vendor/k8s.io/apimachinery/pkg/api/validation/OWNERS delete mode 100644 vendor/k8s.io/apimachinery/pkg/apis/meta/v1/OWNERS delete mode 100644 vendor/k8s.io/apimachinery/pkg/util/mergepatch/OWNERS delete mode 100644 vendor/k8s.io/apimachinery/pkg/util/strategicpatch/OWNERS delete mode 100644 vendor/k8s.io/apimachinery/pkg/util/validation/OWNERS delete mode 100644 vendor/k8s.io/apimachinery/third_party/forked/golang/json/OWNERS delete mode 100644 vendor/k8s.io/client-go/openapi/OWNERS delete mode 100644 vendor/k8s.io/client-go/pkg/apis/clientauthentication/OWNERS delete mode 100644 vendor/k8s.io/client-go/rest/OWNERS delete mode 100644 vendor/k8s.io/client-go/tools/auth/OWNERS delete mode 100644 vendor/k8s.io/client-go/tools/cache/OWNERS delete mode 100644 vendor/k8s.io/client-go/tools/leaderelection/OWNERS delete mode 100644 vendor/k8s.io/client-go/tools/metrics/OWNERS delete mode 100644 vendor/k8s.io/client-go/tools/record/OWNERS delete mode 100644 vendor/k8s.io/client-go/transport/OWNERS delete mode 100644 vendor/k8s.io/client-go/util/cert/OWNERS delete mode 100644 vendor/k8s.io/client-go/util/keyutil/OWNERS delete mode 100644 vendor/k8s.io/client-go/util/retry/OWNERS delete mode 100644 vendor/k8s.io/code-generator/OWNERS delete mode 100644 vendor/k8s.io/code-generator/cmd/client-gen/OWNERS delete mode 100644 vendor/k8s.io/code-generator/cmd/go-to-protobuf/OWNERS mode change 100644 => 100755 vendor/k8s.io/code-generator/generate-groups.sh mode change 100644 => 100755 vendor/k8s.io/code-generator/generate-internal-groups.sh mode change 100644 => 100755 vendor/k8s.io/code-generator/kube_codegen.sh delete mode 100644 vendor/k8s.io/klog/v2/OWNERS delete mode 100644 vendor/k8s.io/kube-openapi/pkg/generators/rules/OWNERS delete mode 100644 vendor/k8s.io/kube-openapi/pkg/util/proto/OWNERS delete mode 100644 vendor/k8s.io/utils/pointer/OWNERS delete mode 100644 vendor/k8s.io/utils/ptr/OWNERS delete mode 100644 vendor/knative.dev/eventing/test/OWNERS mode change 100644 => 100755 vendor/knative.dev/eventing/test/e2e-common.sh mode change 100644 => 100755 vendor/knative.dev/eventing/test/e2e-conformance-tests.sh mode change 100644 => 100755 vendor/knative.dev/eventing/test/e2e-rekt-tests.sh mode change 100644 => 100755 vendor/knative.dev/eventing/test/e2e-tests.sh mode change 100644 => 100755 vendor/knative.dev/eventing/test/e2e-upgrade-tests.sh mode change 100644 => 100755 vendor/knative.dev/eventing/test/microbenchmarks-compare.sh mode change 100644 => 100755 vendor/knative.dev/eventing/test/microbenchmarks-run.sh mode change 100644 => 100755 vendor/knative.dev/eventing/test/presubmit-tests.sh mode change 100644 => 100755 vendor/knative.dev/eventing/test/upload-test-images.sh delete mode 100644 vendor/knative.dev/hack/OWNERS delete mode 100644 vendor/knative.dev/hack/OWNERS_ALIASES mode change 100644 => 100755 vendor/knative.dev/hack/codegen-library.sh mode change 100644 => 100755 vendor/knative.dev/hack/e2e-tests.sh mode change 100644 => 100755 vendor/knative.dev/hack/infra-library.sh mode change 100644 => 100755 vendor/knative.dev/hack/library.sh mode change 100644 => 100755 vendor/knative.dev/hack/microbenchmarks.sh mode change 100644 => 100755 vendor/knative.dev/hack/performance-tests.sh mode change 100644 => 100755 vendor/knative.dev/hack/presubmit-tests.sh mode change 100644 => 100755 vendor/knative.dev/hack/release.sh mode change 100644 => 100755 vendor/knative.dev/hack/shellcheck-presubmit.sh create mode 100644 vendor/knative.dev/operator/pkg/reconciler/knativeeventing/eventing_backstage_plugin.go delete mode 100644 vendor/knative.dev/pkg/apis/OWNERS delete mode 100644 vendor/knative.dev/pkg/apis/duck/OWNERS delete mode 100644 vendor/knative.dev/pkg/controller/OWNERS mode change 100644 => 100755 vendor/knative.dev/pkg/hack/format-code.sh mode change 100644 => 100755 vendor/knative.dev/pkg/hack/generate-knative.sh mode change 100644 => 100755 vendor/knative.dev/pkg/hack/update-codegen.sh mode change 100644 => 100755 vendor/knative.dev/pkg/hack/update-deps.sh mode change 100644 => 100755 vendor/knative.dev/pkg/hack/verify-codegen.sh delete mode 100644 vendor/knative.dev/pkg/reconciler/OWNERS delete mode 100644 vendor/knative.dev/pkg/resolver/OWNERS delete mode 100644 vendor/knative.dev/pkg/test/OWNERS mode change 100644 => 100755 vendor/knative.dev/pkg/test/presubmit-tests.sh create mode 100644 vendor/knative.dev/pkg/test/spoof/openshift_checks.go mode change 100644 => 100755 vendor/knative.dev/pkg/test/test-reconciler-codegen.sh mode change 100644 => 100755 vendor/knative.dev/pkg/test/upgrade/shell/fail-example.sh delete mode 100644 vendor/knative.dev/pkg/webhook/OWNERS mode change 100644 => 100755 vendor/knative.dev/serving/test/e2e-common.sh mode change 100644 => 100755 vendor/knative.dev/serving/test/e2e-external-domain-tls-tests.sh mode change 100644 => 100755 vendor/knative.dev/serving/test/e2e-networking-library.sh mode change 100644 => 100755 vendor/knative.dev/serving/test/e2e-tests.sh mode change 100644 => 100755 vendor/knative.dev/serving/test/e2e-upgrade-tests.sh mode change 100644 => 100755 vendor/knative.dev/serving/test/presubmit-tests.sh mode change 100644 => 100755 vendor/knative.dev/serving/test/upload-test-images.sh delete mode 100644 vendor/sigs.k8s.io/json/OWNERS delete mode 100644 vendor/sigs.k8s.io/yaml/OWNERS delete mode 100644 vendor/sigs.k8s.io/yaml/goyaml.v2/OWNERS diff --git a/knative-operator/Dockerfile b/knative-operator/Dockerfile index 605b5f5900..81c0fe3bf2 100755 --- a/knative-operator/Dockerfile +++ b/knative-operator/Dockerfile @@ -24,14 +24,17 @@ COPY knative-operator/deploy /deploy USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-knative-operator-rhel8-container" \ - name="openshift-serverless-1/knative-operator-rhel8" \ + com.redhat.component="openshift-serverless-1-serverless-kn-operator-rhel8-container" \ + name="openshift-serverless-1/serverless-kn-operator-rhel8" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Knative Operator" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Knative Operator" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Knative Operator" \ io.k8s.description="Red Hat OpenShift Serverless Knative Operator" \ - io.openshift.tags="knative-operator" - + io.openshift.tags="knative-operator" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/usr/bin/knative-operator"] diff --git a/must-gather/Dockerfile b/must-gather/Dockerfile index e8a2c667a7..4dca5f0823 100755 --- a/must-gather/Dockerfile +++ b/must-gather/Dockerfile @@ -22,14 +22,17 @@ RUN mkdir -p $LOGS_DIR && \ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-must-gather-rhel8-container" \ - name="openshift-serverless-1/svls-must-gather-rhel8" \ + com.redhat.component="openshift-serverless-1-serverless-must-gather-rhel8-container" \ + name="openshift-serverless-1/serverless-must-gather-rhel8" \ version=1.36.1 \ summary="Red Hat OpenShift Serverless 1 Must Gather" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Must Gather" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Must Gather" \ io.k8s.description="Red Hat OpenShift Serverless Must Gather" \ - io.openshift.tags="must-gather" + io.openshift.tags="must-gather" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" ENTRYPOINT /usr/bin/gather diff --git a/olm-catalog/serverless-operator-index/Dockerfile b/olm-catalog/serverless-operator-index/Dockerfile index 6c6d9a099a..3048abb518 100644 --- a/olm-catalog/serverless-operator-index/Dockerfile +++ b/olm-catalog/serverless-operator-index/Dockerfile @@ -14,7 +14,7 @@ RUN /bin/opm init serverless-operator --default-channel=stable --output yaml >> RUN /bin/opm render --skip-tls-verify -o yaml \ registry.ci.openshift.org/knative/release-1.35.0:serverless-bundle \ registry.ci.openshift.org/knative/release-1.36.0:serverless-bundle \ - quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/serverless-bundle@sha256:01d632b69b4a4112426afc4184c72eae6d8816974088e5980c9c808f0782b85c >> /configs/index.yaml + quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/serverless-bundle@sha256:9a99fb134aaf434c8074f2b72322216d5cc34539ff8d94f2c7dfdbadd130220c >> /configs/index.yaml # The base image is expected to contain # /bin/opm (with a serve subcommand) and /bin/grpc_health_probe diff --git a/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml b/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml index da45ef93ea..65344ae500 100644 --- a/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml +++ b/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml @@ -78,7 +78,7 @@ metadata: repository: https://github.com/openshift-knative/serverless-operator support: Red Hat olm.skipRange: '>=1.36.0 <1.36.1' - operators.openshift.io/must-gather-image: registry.redhat.io/openshift-serverless-1/serverless-must-gather-rhel8@sha256:36e589adaf5ff2856f5aada90b3a2be893d9ff89f92b1b2c42ee59523c9c9c8e + operators.openshift.io/must-gather-image: registry.redhat.io/openshift-serverless-1/serverless-must-gather-rhel8@sha256:27914944deaa04f0ce51ceed709416dd10f6092472d72a87d33184bdfabaa719 labels: operatorframework.io/arch.amd64: supported operatorframework.io/arch.ppc64le: supported @@ -836,7 +836,7 @@ spec: serviceAccountName: knative-operator containers: - name: knative-operator - image: registry.redhat.io/openshift-serverless-1/serverless-openshift-kn-rhel8-operator@sha256:78fee4c596f2848487ca704da3fa1074e3c9c99b3f96f66833aeba63836d7b93 + image: registry.redhat.io/openshift-serverless-1/serverless-openshift-kn-rhel8-operator@sha256:d1738da32aa90f3f6e2bf0976656795bee0e5389a8e02024e253502b741bfe97 readinessProbe: periodSeconds: 1 httpGet: @@ -889,79 +889,79 @@ spec: - name: KUBERNETES_MIN_VERSION value: "v1.0.0" - name: "IMAGE_queue-proxy" - value: "registry.redhat.io/openshift-serverless-1/kn-serving-queue-rhel8@sha256:074ebfc4494581611647ba90049655a470ca43743610a27be77db66a8633bac6" + value: "registry.redhat.io/openshift-serverless-1/kn-serving-queue-rhel8@sha256:420b6d1e0d9308c934a39c73f04919db254bb3f526260aae69c76990d7522428" - name: "IMAGE_activator" - value: "registry.redhat.io/openshift-serverless-1/kn-serving-activator-rhel8@sha256:5352e4eb4e426a41521276decadf204b6d23b4762a298e4d3dc73969e3eddc68" + value: "registry.redhat.io/openshift-serverless-1/kn-serving-activator-rhel8@sha256:43d59039f1dfd6269bad7e7ed23d5fd7f4b1a29563dd45da81ac7bc7bd510201" - name: "IMAGE_autoscaler" - value: "registry.redhat.io/openshift-serverless-1/kn-serving-autoscaler-rhel8@sha256:ed60e889a677fb139f2eb4bd9ab4fda6ecc39fd050ca2b6cc1c19717e428535a" + value: "registry.redhat.io/openshift-serverless-1/kn-serving-autoscaler-rhel8@sha256:ce0dd701515146b2aeeedad395459fbc6a3fbc7ce4301ceaab31e8f9cd0649c4" - name: "IMAGE_autoscaler-hpa" - value: "registry.redhat.io/openshift-serverless-1/kn-serving-autoscaler-hpa-rhel8@sha256:596a7272d6de714d7dbc6e00e9e50a2872846c269547465252d953172ef0b009" + value: "registry.redhat.io/openshift-serverless-1/kn-serving-autoscaler-hpa-rhel8@sha256:4025f9d509e2e35d3f3c523f64b78116212b93cb50ddd5dc2b41e9aa792387dc" - name: "IMAGE_controller__controller" - value: "registry.redhat.io/openshift-serverless-1/kn-serving-controller-rhel8@sha256:187fb9d64b53c55a029ffce3c0f9e7c3304683fa8a0e832cfb7134e8a3d0c237" + value: "registry.redhat.io/openshift-serverless-1/kn-serving-controller-rhel8@sha256:92f06d97f49a82670077d75104f5f2e83f2ad1ec8f7227621b76b522909d533e" - name: "IMAGE_webhook__webhook" - value: "registry.redhat.io/openshift-serverless-1/kn-serving-webhook-rhel8@sha256:4344716eb2940c6a3fa9a278250f936602bb1549fece6037912837719c178b24" + value: "registry.redhat.io/openshift-serverless-1/kn-serving-webhook-rhel8@sha256:6dcaffd4a8f74a0b301a4daf50ae544c7cbb0ded2e7fcf97b680960dfa962244" - name: "IMAGE_storage-version-migration-serving-__migrate" - value: "registry.redhat.io/openshift-serverless-1/kn-serving-storage-version-migration-rhel8@sha256:f3d87a7fa5b5f2818effcac3304bd56eddcdb0db97a18ac0f35a06fc7e223e7d" + value: "registry.redhat.io/openshift-serverless-1/kn-serving-storage-version-migration-rhel8@sha256:7ec90839789fdef45427e562f79ee3e09577ffb326dee37359dd5083afe6deb6" - name: "IMAGE_kourier-gateway" value: "registry.redhat.io/openshift-service-mesh/proxyv2-rhel8@sha256:1c19cf86fd05940ef3d0d6e79e6f371db993153f70baedb9107bbe73f236dc24" - name: "IMAGE_net-kourier-controller__controller" - value: "registry.redhat.io/openshift-serverless-1/net-kourier-kourier-rhel8@sha256:3b04e9d8cd4b5e43a07ece838d10478723a6c6529350f010550b4a0d1d0950d1" + value: "registry.redhat.io/openshift-serverless-1/net-kourier-kourier-rhel8@sha256:c3b985152cd7c78231353341550562f52b22eaddf900be0bf32e856e2197b7aa" - name: "IMAGE_net-istio-controller__controller" - value: "registry.redhat.io/openshift-serverless-1/net-istio-controller-rhel8@sha256:dcfe5fbc57b9f8520adbff368c8bf29eb491c9c26d1a1737a1722cffea83eb1b" + value: "registry.redhat.io/openshift-serverless-1/net-istio-controller-rhel8@sha256:5722162d04cc1835071dbaed6199de3e07bad933ad4f3198c95a6734d7b0d316" - name: "IMAGE_net-istio-webhook__webhook" - value: "registry.redhat.io/openshift-serverless-1/net-istio-webhook-rhel8@sha256:a6f565d73375e827d830dca85838f4c4cb7f08b0c078acb0c0d567b25f0d256a" + value: "registry.redhat.io/openshift-serverless-1/net-istio-webhook-rhel8@sha256:56a0c73e906f6d017e913adfa4f994aa9cf013bf048987db0502e571e1e5f2ac" - name: "IMAGE_eventing-controller__eventing-controller" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-controller-rhel8@sha256:259e5dab50d36cdbfc117a42325128c4e16f34c048ba64b36d4a89132ddb4c1a" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-controller-rhel8@sha256:c40b42ee81eb7e8644cb8c38882f738e612d40ed4392bf1b2f95813d3f7a5142" - name: "IMAGE_eventing-istio-controller__eventing-istio-controller" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-istio-controller-rhel8@sha256:c39cb88afaddc295d93a3774b8a20d001b82392df540fb502ee02316d82460a9" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-istio-controller-rhel8@sha256:c5be2ed5d9ec6a5a1785e974b56daaea320fe6d640892622f7bf989b67ceaba7" - name: "IMAGE_eventing-webhook__eventing-webhook" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-webhook-rhel8@sha256:429d5d9568cca31fbe83c663276a300286af4cdbf3d35685afdbe5f6f2f8c6e0" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-webhook-rhel8@sha256:1e55e0e9371810adde3fedf77d2e529849fa781d78af80ee2239de9c41898b04" - name: "IMAGE_storage-version-migration-eventing-__migrate" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel8@sha256:a1834b620f875681388f0ae224dd0771773a8b61b1d8e5214a942f232854b87b" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel8@sha256:fb71bdc9d4bdc3581ac9696b9ec2f5c527641368d531e3c7473e23eac742bdfa" - name: "IMAGE_mt-broker-controller__mt-broker-controller" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-mtchannel-broker-rhel8@sha256:bf82b37ab8fd29c7a7cd846008a16d14b4cfdc1c09df4f731d71be3957e90123" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-mtchannel-broker-rhel8@sha256:78a384c9edba1b83c7b75a617017ef9f91ad6d3781907552326665a7fb376f64" - name: "IMAGE_mt-broker-filter__filter" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-filter-rhel8@sha256:77e4689b2ce7a713e905553e0e42b8e128045f40cb6c6d4ee082f126cbc46b00" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-filter-rhel8@sha256:36cb0cc98d9027e36a3e3ee6315002e853158fc553c3fee1595e26f7f067b167" - name: "IMAGE_mt-broker-ingress__ingress" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-ingress-rhel8@sha256:c7c2e738e0d9da1d2d1993f68938e72c4709b1f28a54fa92224ef6a0e456b0aa" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-ingress-rhel8@sha256:b35b5e81fc2570f46730b8fd5beb03c9fea85bd03540118a38b6e9f598422d33" - name: "IMAGE_imc-controller__controller" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-controller-rhel8@sha256:4aeb68a22f63300e54391ec6b4cda8c4e665d904b5dcdd3c40155040525742a0" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-controller-rhel8@sha256:4dbc862631f3725b2cfe42460084618aa5a6179e9c02bb881989216e62c1dcfe" - name: "IMAGE_imc-dispatcher__dispatcher" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-dispatcher-rhel8@sha256:52ba6b1252b6f3d41e2a0b3b880cb768010ab9dd925ac34596f6adaedcbbe07c" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-dispatcher-rhel8@sha256:b78ece8e86863984111e22bef75c420e714528f38581d524473f7f5ab33e9ecc" - name: "IMAGE_pingsource-mt-adapter__dispatcher" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-mtping-rhel8@sha256:631eb3a8dd9d83ceafa7d8a4da4b1e2d4f2740e6017c766828dcc7575cf1322f" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-mtping-rhel8@sha256:cb02f6c1bf76eb23a6de75af11ce47f4279532b8d6cefc11301f054d5764a7f6" - name: "IMAGE_job-sink__job-sink" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-jobsink-rhel8@sha256:f2d112ba9fdfccea988589b99b463c8a7157475f7a3f03678e8999e65b678cc3" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-jobsink-rhel8@sha256:588b363b038f2d7a2e36c2723218fe5f5ea5837b67467b9494c97399d5c8285e" - name: "IMAGE_APISERVER_RA_IMAGE" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-apiserver-receive-adapter-rhel8@sha256:6210a946f373b9c36c9b31293debe6fed090008b8234c0ba17d37fa81646172e" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-apiserver-receive-adapter-rhel8@sha256:1fe91343e549a200fb94c6350259f187a27b3cea5b6930ffbdf25306653ba367" - name: "IMAGE_DISPATCHER_IMAGE" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-dispatcher-rhel8@sha256:52ba6b1252b6f3d41e2a0b3b880cb768010ab9dd925ac34596f6adaedcbbe07c" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-dispatcher-rhel8@sha256:b78ece8e86863984111e22bef75c420e714528f38581d524473f7f5ab33e9ecc" - name: "IMAGE_EVENT_TRANSFORM_JSONATA_IMAGE" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-transform-jsonata-rhel8@sha256:3af4c48030263eb5769e5f36a6dd13fd390d8566efaab37532f39e1df1c95c67" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-transform-jsonata-rhel8@sha256:b3b6a1be8ff737575ebeb1737778945a9116b56675ae7006fdccdfe934dd42b3" - name: "IMAGE_INTEGRATION_SOURCE_TIMER_IMAGE" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-timer-source-rhel8@sha256:8fed5ef9a1f39a55077bb5026c8854d0ee7fc8d8ff5da277ce9c1bfc2ab2474b" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-timer-source-rhel8@sha256:7d91fb0841e34c37c870f0b521c60672904a46232443c44d5b3b99af74d49794" - name: "IMAGE_INTEGRATION_SOURCE_AWS_S3_IMAGE" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-s3-source-rhel8@sha256:27e74287774cda208f667bc2a386debe6b6255e8991abfb37c959c8525f2af53" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-s3-source-rhel8@sha256:4420e49d3283fb978e853661c1017b4cc82a7ce0f75c5fbe95953a12983ceb2c" - name: "IMAGE_INTEGRATION_SOURCE_AWS_SQS_IMAGE" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-sqs-source-rhel8@sha256:88323da16360981f27b8e4686fbbb64053e4e0e3c79c65d695edb317b334e1e0" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-sqs-source-rhel8@sha256:f799bbb0f96daec8104860848b80a23eebff7d001a496e97faa18a66ed8b272d" - name: "IMAGE_INTEGRATION_SOURCE_AWS_DDB_STREAMS_IMAGE" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-ddb-streams-source-rhel8@sha256:a903480159ebf1d8652eeaa702d9885fb76bb106c02d75cec5c82c31d77d6410" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-ddb-streams-source-rhel8@sha256:c4377c376500dee43c29c13a0b654dc0e131236b2275d4deb5159488c75cc531" - name: "IMAGE_INTEGRATION_SINK_LOG_IMAGE" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-log-sink-rhel8@sha256:30b8045ef5f925a36c58941386f1899bec125d005a08aeeeba5edd49b0859149" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-log-sink-rhel8@sha256:c4eea4f2496ed98e6a534d2b94fe53c09f5a84726e0092884db5cf7a0a028e49" - name: "IMAGE_INTEGRATION_SINK_AWS_S3_IMAGE" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-s3-sink-rhel8@sha256:d9b944e64391a996104afbe8a21f66316a948e9fb7b91734e861847285be59c7" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-s3-sink-rhel8@sha256:e8ea36f766b8f155edab3da39ed592a0f417c9633f08056f993627adad322915" - name: "IMAGE_INTEGRATION_SINK_AWS_SQS_IMAGE" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-sqs-sink-rhel8@sha256:afa634e029bcf79a972f49372498d44b45bcfbdb6eb28ecaf4f0b0b2a0a1824b" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-sqs-sink-rhel8@sha256:6220faeb259b2b935bca18a9cedf9419adbde4f830c8916ec9fe9c4aa23ae1f1" - name: "IMAGE_INTEGRATION_SINK_AWS_SNS_IMAGE" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-sns-sink-rhel8@sha256:51b5e18e8d4c1ca81d7c5ddfea6352a3887f757acfcc53bd2f8bd3b01337ed42" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-sns-sink-rhel8@sha256:669863acf165bb2aebee5fb3306d6e9804078f236212d58c0b2c12c09b93d67f" - name: "IMAGE_eventmesh-backend__controller" - value: "registry.redhat.io/openshift-serverless-1/kn-backstage-plugins-eventmesh-rhel8@sha256:e3ae1cc6012f19631c012a07b113fb015977d2ee4f9faab3207fbc2464c25aa7" + value: "registry.redhat.io/openshift-serverless-1/kn-backstage-plugins-eventmesh-rhel8@sha256:20a9e06dcea91790168a77fb44c12ee2f41ad63971d08a670b88a084432b0f06" - name: "IMAGE_KUBE_RBAC_PROXY" value: "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:ed89e221d7a0a1dd82f2fa75e9e70bff3dddcb8979594396590bd3a15673a152" - name: "IMAGE_KN_PLUGIN_EVENT_SENDER" value: "registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel8@sha256:0c2cdf917bbad1f5bca8a2a2ef12a96cfcd0c77c190cc35687eb57169b54ab6f" - name: "IMAGE_KN_CLIENT" - value: "registry.redhat.io/openshift-serverless-1/kn-client-kn-rhel8@sha256:ee6533b71cf280877c9d7489dfd821c9209c6802bed7fa3fdb4f8f00fbeacb09" + value: "registry.redhat.io/openshift-serverless-1/kn-client-kn-rhel8@sha256:d1c7690a9f4398cf6cd557b0adb6687121bbc8d5a4060911559f9cb4a8e2178c" - name: "IMAGE_KN_PLUGIN_FUNC_UTIL" value: "registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8@sha256:82e69a1890042f5636ac7bb645b1aaeaba0a4894851eccc1fa1c63296918e31a" - name: "IMAGE_KN_PLUGIN_FUNC_TEKTON_BUILDAH" @@ -1003,7 +1003,7 @@ spec: serviceAccountName: knative-openshift initContainers: - name: cli-artifacts - image: registry.redhat.io/openshift-serverless-1/kn-client-cli-artifacts-rhel8@sha256:3fe326ad9a00b112fc888ffd345c8d5042f0a22cf32ea575931192c39ce1fece + image: registry.redhat.io/openshift-serverless-1/kn-client-cli-artifacts-rhel8@sha256:5b0312167c831f59d9856056d67af51f5b26b2ec631513e5796655fa74807fac imagePullPolicy: Always command: ["sh", "-c", "rm -rf /cli-artifacts/* && cp /usr/share/kn/**/* /cli-artifacts && chmod 444 /cli-artifacts/*"] volumeMounts: @@ -1017,7 +1017,7 @@ spec: - ALL containers: - name: knative-openshift - image: registry.redhat.io/openshift-serverless-1/serverless-kn-operator-rhel8@sha256:d6f338e08fa937c8a4ccfec692424de4acded565f7ca3971ea507dffeb351503 + image: registry.redhat.io/openshift-serverless-1/serverless-kn-operator-rhel8@sha256:00166d6d9e401e2162c808f235b1dc36a643deffbd842269fdbe70330d614679 imagePullPolicy: Always readinessProbe: httpGet: @@ -1079,79 +1079,79 @@ spec: - name: KUBERNETES_MIN_VERSION value: "v1.0.0" - name: "IMAGE_queue-proxy" - value: "registry.redhat.io/openshift-serverless-1/kn-serving-queue-rhel8@sha256:074ebfc4494581611647ba90049655a470ca43743610a27be77db66a8633bac6" + value: "registry.redhat.io/openshift-serverless-1/kn-serving-queue-rhel8@sha256:420b6d1e0d9308c934a39c73f04919db254bb3f526260aae69c76990d7522428" - name: "IMAGE_activator" - value: "registry.redhat.io/openshift-serverless-1/kn-serving-activator-rhel8@sha256:5352e4eb4e426a41521276decadf204b6d23b4762a298e4d3dc73969e3eddc68" + value: "registry.redhat.io/openshift-serverless-1/kn-serving-activator-rhel8@sha256:43d59039f1dfd6269bad7e7ed23d5fd7f4b1a29563dd45da81ac7bc7bd510201" - name: "IMAGE_autoscaler" - value: "registry.redhat.io/openshift-serverless-1/kn-serving-autoscaler-rhel8@sha256:ed60e889a677fb139f2eb4bd9ab4fda6ecc39fd050ca2b6cc1c19717e428535a" + value: "registry.redhat.io/openshift-serverless-1/kn-serving-autoscaler-rhel8@sha256:ce0dd701515146b2aeeedad395459fbc6a3fbc7ce4301ceaab31e8f9cd0649c4" - name: "IMAGE_autoscaler-hpa" - value: "registry.redhat.io/openshift-serverless-1/kn-serving-autoscaler-hpa-rhel8@sha256:596a7272d6de714d7dbc6e00e9e50a2872846c269547465252d953172ef0b009" + value: "registry.redhat.io/openshift-serverless-1/kn-serving-autoscaler-hpa-rhel8@sha256:4025f9d509e2e35d3f3c523f64b78116212b93cb50ddd5dc2b41e9aa792387dc" - name: "IMAGE_controller__controller" - value: "registry.redhat.io/openshift-serverless-1/kn-serving-controller-rhel8@sha256:187fb9d64b53c55a029ffce3c0f9e7c3304683fa8a0e832cfb7134e8a3d0c237" + value: "registry.redhat.io/openshift-serverless-1/kn-serving-controller-rhel8@sha256:92f06d97f49a82670077d75104f5f2e83f2ad1ec8f7227621b76b522909d533e" - name: "IMAGE_webhook__webhook" - value: "registry.redhat.io/openshift-serverless-1/kn-serving-webhook-rhel8@sha256:4344716eb2940c6a3fa9a278250f936602bb1549fece6037912837719c178b24" + value: "registry.redhat.io/openshift-serverless-1/kn-serving-webhook-rhel8@sha256:6dcaffd4a8f74a0b301a4daf50ae544c7cbb0ded2e7fcf97b680960dfa962244" - name: "IMAGE_storage-version-migration-serving-__migrate" - value: "registry.redhat.io/openshift-serverless-1/kn-serving-storage-version-migration-rhel8@sha256:f3d87a7fa5b5f2818effcac3304bd56eddcdb0db97a18ac0f35a06fc7e223e7d" + value: "registry.redhat.io/openshift-serverless-1/kn-serving-storage-version-migration-rhel8@sha256:7ec90839789fdef45427e562f79ee3e09577ffb326dee37359dd5083afe6deb6" - name: "IMAGE_kourier-gateway" value: "registry.redhat.io/openshift-service-mesh/proxyv2-rhel8@sha256:1c19cf86fd05940ef3d0d6e79e6f371db993153f70baedb9107bbe73f236dc24" - name: "IMAGE_net-kourier-controller__controller" - value: "registry.redhat.io/openshift-serverless-1/net-kourier-kourier-rhel8@sha256:3b04e9d8cd4b5e43a07ece838d10478723a6c6529350f010550b4a0d1d0950d1" + value: "registry.redhat.io/openshift-serverless-1/net-kourier-kourier-rhel8@sha256:c3b985152cd7c78231353341550562f52b22eaddf900be0bf32e856e2197b7aa" - name: "IMAGE_net-istio-controller__controller" - value: "registry.redhat.io/openshift-serverless-1/net-istio-controller-rhel8@sha256:dcfe5fbc57b9f8520adbff368c8bf29eb491c9c26d1a1737a1722cffea83eb1b" + value: "registry.redhat.io/openshift-serverless-1/net-istio-controller-rhel8@sha256:5722162d04cc1835071dbaed6199de3e07bad933ad4f3198c95a6734d7b0d316" - name: "IMAGE_net-istio-webhook__webhook" - value: "registry.redhat.io/openshift-serverless-1/net-istio-webhook-rhel8@sha256:a6f565d73375e827d830dca85838f4c4cb7f08b0c078acb0c0d567b25f0d256a" + value: "registry.redhat.io/openshift-serverless-1/net-istio-webhook-rhel8@sha256:56a0c73e906f6d017e913adfa4f994aa9cf013bf048987db0502e571e1e5f2ac" - name: "IMAGE_eventing-controller__eventing-controller" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-controller-rhel8@sha256:259e5dab50d36cdbfc117a42325128c4e16f34c048ba64b36d4a89132ddb4c1a" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-controller-rhel8@sha256:c40b42ee81eb7e8644cb8c38882f738e612d40ed4392bf1b2f95813d3f7a5142" - name: "IMAGE_eventing-istio-controller__eventing-istio-controller" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-istio-controller-rhel8@sha256:c39cb88afaddc295d93a3774b8a20d001b82392df540fb502ee02316d82460a9" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-istio-controller-rhel8@sha256:c5be2ed5d9ec6a5a1785e974b56daaea320fe6d640892622f7bf989b67ceaba7" - name: "IMAGE_eventing-webhook__eventing-webhook" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-webhook-rhel8@sha256:429d5d9568cca31fbe83c663276a300286af4cdbf3d35685afdbe5f6f2f8c6e0" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-webhook-rhel8@sha256:1e55e0e9371810adde3fedf77d2e529849fa781d78af80ee2239de9c41898b04" - name: "IMAGE_storage-version-migration-eventing-__migrate" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel8@sha256:a1834b620f875681388f0ae224dd0771773a8b61b1d8e5214a942f232854b87b" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel8@sha256:fb71bdc9d4bdc3581ac9696b9ec2f5c527641368d531e3c7473e23eac742bdfa" - name: "IMAGE_mt-broker-controller__mt-broker-controller" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-mtchannel-broker-rhel8@sha256:bf82b37ab8fd29c7a7cd846008a16d14b4cfdc1c09df4f731d71be3957e90123" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-mtchannel-broker-rhel8@sha256:78a384c9edba1b83c7b75a617017ef9f91ad6d3781907552326665a7fb376f64" - name: "IMAGE_mt-broker-filter__filter" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-filter-rhel8@sha256:77e4689b2ce7a713e905553e0e42b8e128045f40cb6c6d4ee082f126cbc46b00" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-filter-rhel8@sha256:36cb0cc98d9027e36a3e3ee6315002e853158fc553c3fee1595e26f7f067b167" - name: "IMAGE_mt-broker-ingress__ingress" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-ingress-rhel8@sha256:c7c2e738e0d9da1d2d1993f68938e72c4709b1f28a54fa92224ef6a0e456b0aa" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-ingress-rhel8@sha256:b35b5e81fc2570f46730b8fd5beb03c9fea85bd03540118a38b6e9f598422d33" - name: "IMAGE_imc-controller__controller" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-controller-rhel8@sha256:4aeb68a22f63300e54391ec6b4cda8c4e665d904b5dcdd3c40155040525742a0" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-controller-rhel8@sha256:4dbc862631f3725b2cfe42460084618aa5a6179e9c02bb881989216e62c1dcfe" - name: "IMAGE_imc-dispatcher__dispatcher" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-dispatcher-rhel8@sha256:52ba6b1252b6f3d41e2a0b3b880cb768010ab9dd925ac34596f6adaedcbbe07c" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-dispatcher-rhel8@sha256:b78ece8e86863984111e22bef75c420e714528f38581d524473f7f5ab33e9ecc" - name: "IMAGE_pingsource-mt-adapter__dispatcher" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-mtping-rhel8@sha256:631eb3a8dd9d83ceafa7d8a4da4b1e2d4f2740e6017c766828dcc7575cf1322f" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-mtping-rhel8@sha256:cb02f6c1bf76eb23a6de75af11ce47f4279532b8d6cefc11301f054d5764a7f6" - name: "IMAGE_job-sink__job-sink" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-jobsink-rhel8@sha256:f2d112ba9fdfccea988589b99b463c8a7157475f7a3f03678e8999e65b678cc3" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-jobsink-rhel8@sha256:588b363b038f2d7a2e36c2723218fe5f5ea5837b67467b9494c97399d5c8285e" - name: "IMAGE_APISERVER_RA_IMAGE" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-apiserver-receive-adapter-rhel8@sha256:6210a946f373b9c36c9b31293debe6fed090008b8234c0ba17d37fa81646172e" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-apiserver-receive-adapter-rhel8@sha256:1fe91343e549a200fb94c6350259f187a27b3cea5b6930ffbdf25306653ba367" - name: "IMAGE_DISPATCHER_IMAGE" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-dispatcher-rhel8@sha256:52ba6b1252b6f3d41e2a0b3b880cb768010ab9dd925ac34596f6adaedcbbe07c" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-dispatcher-rhel8@sha256:b78ece8e86863984111e22bef75c420e714528f38581d524473f7f5ab33e9ecc" - name: "IMAGE_EVENT_TRANSFORM_JSONATA_IMAGE" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-transform-jsonata-rhel8@sha256:3af4c48030263eb5769e5f36a6dd13fd390d8566efaab37532f39e1df1c95c67" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-transform-jsonata-rhel8@sha256:b3b6a1be8ff737575ebeb1737778945a9116b56675ae7006fdccdfe934dd42b3" - name: "IMAGE_INTEGRATION_SOURCE_TIMER_IMAGE" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-timer-source-rhel8@sha256:8fed5ef9a1f39a55077bb5026c8854d0ee7fc8d8ff5da277ce9c1bfc2ab2474b" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-timer-source-rhel8@sha256:7d91fb0841e34c37c870f0b521c60672904a46232443c44d5b3b99af74d49794" - name: "IMAGE_INTEGRATION_SOURCE_AWS_S3_IMAGE" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-s3-source-rhel8@sha256:27e74287774cda208f667bc2a386debe6b6255e8991abfb37c959c8525f2af53" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-s3-source-rhel8@sha256:4420e49d3283fb978e853661c1017b4cc82a7ce0f75c5fbe95953a12983ceb2c" - name: "IMAGE_INTEGRATION_SOURCE_AWS_SQS_IMAGE" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-sqs-source-rhel8@sha256:88323da16360981f27b8e4686fbbb64053e4e0e3c79c65d695edb317b334e1e0" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-sqs-source-rhel8@sha256:f799bbb0f96daec8104860848b80a23eebff7d001a496e97faa18a66ed8b272d" - name: "IMAGE_INTEGRATION_SOURCE_AWS_DDB_STREAMS_IMAGE" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-ddb-streams-source-rhel8@sha256:a903480159ebf1d8652eeaa702d9885fb76bb106c02d75cec5c82c31d77d6410" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-ddb-streams-source-rhel8@sha256:c4377c376500dee43c29c13a0b654dc0e131236b2275d4deb5159488c75cc531" - name: "IMAGE_INTEGRATION_SINK_LOG_IMAGE" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-log-sink-rhel8@sha256:30b8045ef5f925a36c58941386f1899bec125d005a08aeeeba5edd49b0859149" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-log-sink-rhel8@sha256:c4eea4f2496ed98e6a534d2b94fe53c09f5a84726e0092884db5cf7a0a028e49" - name: "IMAGE_INTEGRATION_SINK_AWS_S3_IMAGE" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-s3-sink-rhel8@sha256:d9b944e64391a996104afbe8a21f66316a948e9fb7b91734e861847285be59c7" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-s3-sink-rhel8@sha256:e8ea36f766b8f155edab3da39ed592a0f417c9633f08056f993627adad322915" - name: "IMAGE_INTEGRATION_SINK_AWS_SQS_IMAGE" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-sqs-sink-rhel8@sha256:afa634e029bcf79a972f49372498d44b45bcfbdb6eb28ecaf4f0b0b2a0a1824b" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-sqs-sink-rhel8@sha256:6220faeb259b2b935bca18a9cedf9419adbde4f830c8916ec9fe9c4aa23ae1f1" - name: "IMAGE_INTEGRATION_SINK_AWS_SNS_IMAGE" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-sns-sink-rhel8@sha256:51b5e18e8d4c1ca81d7c5ddfea6352a3887f757acfcc53bd2f8bd3b01337ed42" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-sns-sink-rhel8@sha256:669863acf165bb2aebee5fb3306d6e9804078f236212d58c0b2c12c09b93d67f" - name: "IMAGE_eventmesh-backend__controller" - value: "registry.redhat.io/openshift-serverless-1/kn-backstage-plugins-eventmesh-rhel8@sha256:e3ae1cc6012f19631c012a07b113fb015977d2ee4f9faab3207fbc2464c25aa7" + value: "registry.redhat.io/openshift-serverless-1/kn-backstage-plugins-eventmesh-rhel8@sha256:20a9e06dcea91790168a77fb44c12ee2f41ad63971d08a670b88a084432b0f06" - name: "IMAGE_KUBE_RBAC_PROXY" value: "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:ed89e221d7a0a1dd82f2fa75e9e70bff3dddcb8979594396590bd3a15673a152" - name: "IMAGE_KN_PLUGIN_EVENT_SENDER" value: "registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel8@sha256:0c2cdf917bbad1f5bca8a2a2ef12a96cfcd0c77c190cc35687eb57169b54ab6f" - name: "IMAGE_KN_CLIENT" - value: "registry.redhat.io/openshift-serverless-1/kn-client-kn-rhel8@sha256:ee6533b71cf280877c9d7489dfd821c9209c6802bed7fa3fdb4f8f00fbeacb09" + value: "registry.redhat.io/openshift-serverless-1/kn-client-kn-rhel8@sha256:d1c7690a9f4398cf6cd557b0adb6687121bbc8d5a4060911559f9cb4a8e2178c" - name: "IMAGE_KN_PLUGIN_FUNC_UTIL" value: "registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8@sha256:82e69a1890042f5636ac7bb645b1aaeaba0a4894851eccc1fa1c63296918e31a" - name: "IMAGE_KN_PLUGIN_FUNC_TEKTON_BUILDAH" @@ -1163,25 +1163,25 @@ spec: - name: "IMAGE_KN_PLUGIN_FUNC_PYTHON_39" value: "registry.access.redhat.com/ubi8/python-39@sha256:27e795fd6b1b77de70d1dc73a65e4c790650748a9cfda138fdbd194b3d6eea3d" - name: "KAFKA_IMAGE_kafka-broker-receiver__kafka-broker-receiver" - value: "registry.redhat.io/openshift-serverless-1/kn-ekb-receiver-rhel8@sha256:f4d86b196457cdeebdc380b6f1b707c10f8dee789c7779c90ee1332e511af8c4" + value: "registry.redhat.io/openshift-serverless-1/kn-ekb-receiver-rhel8@sha256:11ddb3ffdb19b84650b21cbfde5a41aecf051017fec406b626ab9af3210bc9a0" - name: "KAFKA_IMAGE_kafka-broker-dispatcher__kafka-broker-dispatcher" - value: "registry.redhat.io/openshift-serverless-1/kn-ekb-dispatcher-rhel8@sha256:9b328fff0cc8545fb9bb1f24f11d78cfac3ee76dedc11fa4def4262d79a60e8c" + value: "registry.redhat.io/openshift-serverless-1/kn-ekb-dispatcher-rhel8@sha256:fe273ab00f4c635bc4b4bc9e2c6d898928f328446da3b969b238ffe189258b66" - name: "KAFKA_IMAGE_kafka-channel-receiver__kafka-channel-receiver" - value: "registry.redhat.io/openshift-serverless-1/kn-ekb-receiver-rhel8@sha256:f4d86b196457cdeebdc380b6f1b707c10f8dee789c7779c90ee1332e511af8c4" + value: "registry.redhat.io/openshift-serverless-1/kn-ekb-receiver-rhel8@sha256:11ddb3ffdb19b84650b21cbfde5a41aecf051017fec406b626ab9af3210bc9a0" - name: "KAFKA_IMAGE_kafka-channel-dispatcher__kafka-channel-dispatcher" - value: "registry.redhat.io/openshift-serverless-1/kn-ekb-dispatcher-rhel8@sha256:9b328fff0cc8545fb9bb1f24f11d78cfac3ee76dedc11fa4def4262d79a60e8c" + value: "registry.redhat.io/openshift-serverless-1/kn-ekb-dispatcher-rhel8@sha256:fe273ab00f4c635bc4b4bc9e2c6d898928f328446da3b969b238ffe189258b66" - name: "KAFKA_IMAGE_kafka-controller__controller" - value: "registry.redhat.io/openshift-serverless-1/kn-ekb-kafka-controller-rhel8@sha256:6b7316cce3432d391adc6ac38c92ff0ee86dd7ae0101957cc65cd338cc69e352" + value: "registry.redhat.io/openshift-serverless-1/kn-ekb-kafka-controller-rhel8@sha256:72e8d33c2973a910a0e011a637f8fe3cb0d49b4e9d7d4042ca559e3b83100b93" - name: "KAFKA_IMAGE_kafka-sink-receiver__kafka-sink-receiver" - value: "registry.redhat.io/openshift-serverless-1/kn-ekb-receiver-rhel8@sha256:f4d86b196457cdeebdc380b6f1b707c10f8dee789c7779c90ee1332e511af8c4" + value: "registry.redhat.io/openshift-serverless-1/kn-ekb-receiver-rhel8@sha256:11ddb3ffdb19b84650b21cbfde5a41aecf051017fec406b626ab9af3210bc9a0" - name: "KAFKA_IMAGE_kafka-source-dispatcher__kafka-source-dispatcher" - value: "registry.redhat.io/openshift-serverless-1/kn-ekb-dispatcher-rhel8@sha256:9b328fff0cc8545fb9bb1f24f11d78cfac3ee76dedc11fa4def4262d79a60e8c" + value: "registry.redhat.io/openshift-serverless-1/kn-ekb-dispatcher-rhel8@sha256:fe273ab00f4c635bc4b4bc9e2c6d898928f328446da3b969b238ffe189258b66" - name: "KAFKA_IMAGE_kafka-webhook-eventing__kafka-webhook-eventing" - value: "registry.redhat.io/openshift-serverless-1/kn-ekb-webhook-kafka-rhel8@sha256:3d780ad1ab280b5092b90e277485d589da2a18e8b08090af7d95aecd17af545d" + value: "registry.redhat.io/openshift-serverless-1/kn-ekb-webhook-kafka-rhel8@sha256:df5ff2d5bb974740435d66146580c7780034fa5782d3bf0d11792a8d5a0c4bfe" - name: "KAFKA_IMAGE_kafka-controller-post-install__post-install" - value: "registry.redhat.io/openshift-serverless-1/kn-ekb-post-install-rhel8@sha256:4274004b6289fa9bea3fa6e56d64077a328a6b5e63a9f0e9c41f6d561f682bd7" + value: "registry.redhat.io/openshift-serverless-1/kn-ekb-post-install-rhel8@sha256:12ffcd1ed1e429d1cc48055a37ebaf7de4dc9ea1b1e2ad34bfb4d04c86ebe435" - name: "KAFKA_IMAGE_knative-kafka-storage-version-migrator__migrate" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel8@sha256:a1834b620f875681388f0ae224dd0771773a8b61b1d8e5214a942f232854b87b" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel8@sha256:fb71bdc9d4bdc3581ac9696b9ec2f5c527641368d531e3c7473e23eac742bdfa" - name: "CURRENT_VERSION" value: "1.36.1" - name: "KNATIVE_SERVING_VERSION" @@ -1215,7 +1215,7 @@ spec: serviceAccountName: knative-openshift-ingress containers: - name: knative-openshift-ingress - image: registry.redhat.io/openshift-serverless-1/serverless-ingress-rhel8@sha256:a47b6b5237a87ccd90e5a49a53d06485fd55c87eebf12d01c335b87fc3a8c494 + image: registry.redhat.io/openshift-serverless-1/serverless-ingress-rhel8@sha256:7dfb0947c8f519b90b4d5ddf6e6c6d0a25cd7c3308c92968ced748fcd2aaea5c imagePullPolicy: Always ports: - containerPort: 9090 @@ -1366,85 +1366,85 @@ spec: - knativeeventings.operator.knative.dev relatedImages: - name: "knative-operator" - image: "registry.redhat.io/openshift-serverless-1/serverless-openshift-kn-rhel8-operator@sha256:78fee4c596f2848487ca704da3fa1074e3c9c99b3f96f66833aeba63836d7b93" + image: "registry.redhat.io/openshift-serverless-1/serverless-openshift-kn-rhel8-operator@sha256:d1738da32aa90f3f6e2bf0976656795bee0e5389a8e02024e253502b741bfe97" - name: "knative-openshift" - image: "registry.redhat.io/openshift-serverless-1/serverless-kn-operator-rhel8@sha256:d6f338e08fa937c8a4ccfec692424de4acded565f7ca3971ea507dffeb351503" + image: "registry.redhat.io/openshift-serverless-1/serverless-kn-operator-rhel8@sha256:00166d6d9e401e2162c808f235b1dc36a643deffbd842269fdbe70330d614679" - name: "knative-openshift-ingress" - image: "registry.redhat.io/openshift-serverless-1/serverless-ingress-rhel8@sha256:a47b6b5237a87ccd90e5a49a53d06485fd55c87eebf12d01c335b87fc3a8c494" + image: "registry.redhat.io/openshift-serverless-1/serverless-ingress-rhel8@sha256:7dfb0947c8f519b90b4d5ddf6e6c6d0a25cd7c3308c92968ced748fcd2aaea5c" - name: "IMAGE_queue-proxy" - image: "registry.redhat.io/openshift-serverless-1/kn-serving-queue-rhel8@sha256:074ebfc4494581611647ba90049655a470ca43743610a27be77db66a8633bac6" + image: "registry.redhat.io/openshift-serverless-1/kn-serving-queue-rhel8@sha256:420b6d1e0d9308c934a39c73f04919db254bb3f526260aae69c76990d7522428" - name: "IMAGE_activator" - image: "registry.redhat.io/openshift-serverless-1/kn-serving-activator-rhel8@sha256:5352e4eb4e426a41521276decadf204b6d23b4762a298e4d3dc73969e3eddc68" + image: "registry.redhat.io/openshift-serverless-1/kn-serving-activator-rhel8@sha256:43d59039f1dfd6269bad7e7ed23d5fd7f4b1a29563dd45da81ac7bc7bd510201" - name: "IMAGE_autoscaler" - image: "registry.redhat.io/openshift-serverless-1/kn-serving-autoscaler-rhel8@sha256:ed60e889a677fb139f2eb4bd9ab4fda6ecc39fd050ca2b6cc1c19717e428535a" + image: "registry.redhat.io/openshift-serverless-1/kn-serving-autoscaler-rhel8@sha256:ce0dd701515146b2aeeedad395459fbc6a3fbc7ce4301ceaab31e8f9cd0649c4" - name: "IMAGE_autoscaler-hpa" - image: "registry.redhat.io/openshift-serverless-1/kn-serving-autoscaler-hpa-rhel8@sha256:596a7272d6de714d7dbc6e00e9e50a2872846c269547465252d953172ef0b009" + image: "registry.redhat.io/openshift-serverless-1/kn-serving-autoscaler-hpa-rhel8@sha256:4025f9d509e2e35d3f3c523f64b78116212b93cb50ddd5dc2b41e9aa792387dc" - name: "IMAGE_controller__controller" - image: "registry.redhat.io/openshift-serverless-1/kn-serving-controller-rhel8@sha256:187fb9d64b53c55a029ffce3c0f9e7c3304683fa8a0e832cfb7134e8a3d0c237" + image: "registry.redhat.io/openshift-serverless-1/kn-serving-controller-rhel8@sha256:92f06d97f49a82670077d75104f5f2e83f2ad1ec8f7227621b76b522909d533e" - name: "IMAGE_webhook__webhook" - image: "registry.redhat.io/openshift-serverless-1/kn-serving-webhook-rhel8@sha256:4344716eb2940c6a3fa9a278250f936602bb1549fece6037912837719c178b24" + image: "registry.redhat.io/openshift-serverless-1/kn-serving-webhook-rhel8@sha256:6dcaffd4a8f74a0b301a4daf50ae544c7cbb0ded2e7fcf97b680960dfa962244" - name: "IMAGE_storage-version-migration-serving-__migrate" - image: "registry.redhat.io/openshift-serverless-1/kn-serving-storage-version-migration-rhel8@sha256:f3d87a7fa5b5f2818effcac3304bd56eddcdb0db97a18ac0f35a06fc7e223e7d" + image: "registry.redhat.io/openshift-serverless-1/kn-serving-storage-version-migration-rhel8@sha256:7ec90839789fdef45427e562f79ee3e09577ffb326dee37359dd5083afe6deb6" - name: "IMAGE_kourier-gateway" image: "registry.redhat.io/openshift-service-mesh/proxyv2-rhel8@sha256:1c19cf86fd05940ef3d0d6e79e6f371db993153f70baedb9107bbe73f236dc24" - name: "IMAGE_net-kourier-controller__controller" - image: "registry.redhat.io/openshift-serverless-1/net-kourier-kourier-rhel8@sha256:3b04e9d8cd4b5e43a07ece838d10478723a6c6529350f010550b4a0d1d0950d1" + image: "registry.redhat.io/openshift-serverless-1/net-kourier-kourier-rhel8@sha256:c3b985152cd7c78231353341550562f52b22eaddf900be0bf32e856e2197b7aa" - name: "IMAGE_net-istio-controller__controller" - image: "registry.redhat.io/openshift-serverless-1/net-istio-controller-rhel8@sha256:dcfe5fbc57b9f8520adbff368c8bf29eb491c9c26d1a1737a1722cffea83eb1b" + image: "registry.redhat.io/openshift-serverless-1/net-istio-controller-rhel8@sha256:5722162d04cc1835071dbaed6199de3e07bad933ad4f3198c95a6734d7b0d316" - name: "IMAGE_net-istio-webhook__webhook" - image: "registry.redhat.io/openshift-serverless-1/net-istio-webhook-rhel8@sha256:a6f565d73375e827d830dca85838f4c4cb7f08b0c078acb0c0d567b25f0d256a" + image: "registry.redhat.io/openshift-serverless-1/net-istio-webhook-rhel8@sha256:56a0c73e906f6d017e913adfa4f994aa9cf013bf048987db0502e571e1e5f2ac" - name: "IMAGE_eventing-controller__eventing-controller" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-controller-rhel8@sha256:259e5dab50d36cdbfc117a42325128c4e16f34c048ba64b36d4a89132ddb4c1a" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-controller-rhel8@sha256:c40b42ee81eb7e8644cb8c38882f738e612d40ed4392bf1b2f95813d3f7a5142" - name: "IMAGE_eventing-istio-controller__eventing-istio-controller" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-istio-controller-rhel8@sha256:c39cb88afaddc295d93a3774b8a20d001b82392df540fb502ee02316d82460a9" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-istio-controller-rhel8@sha256:c5be2ed5d9ec6a5a1785e974b56daaea320fe6d640892622f7bf989b67ceaba7" - name: "IMAGE_eventing-webhook__eventing-webhook" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-webhook-rhel8@sha256:429d5d9568cca31fbe83c663276a300286af4cdbf3d35685afdbe5f6f2f8c6e0" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-webhook-rhel8@sha256:1e55e0e9371810adde3fedf77d2e529849fa781d78af80ee2239de9c41898b04" - name: "IMAGE_storage-version-migration-eventing-__migrate" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel8@sha256:a1834b620f875681388f0ae224dd0771773a8b61b1d8e5214a942f232854b87b" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel8@sha256:fb71bdc9d4bdc3581ac9696b9ec2f5c527641368d531e3c7473e23eac742bdfa" - name: "IMAGE_mt-broker-controller__mt-broker-controller" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-mtchannel-broker-rhel8@sha256:bf82b37ab8fd29c7a7cd846008a16d14b4cfdc1c09df4f731d71be3957e90123" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-mtchannel-broker-rhel8@sha256:78a384c9edba1b83c7b75a617017ef9f91ad6d3781907552326665a7fb376f64" - name: "IMAGE_mt-broker-filter__filter" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-filter-rhel8@sha256:77e4689b2ce7a713e905553e0e42b8e128045f40cb6c6d4ee082f126cbc46b00" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-filter-rhel8@sha256:36cb0cc98d9027e36a3e3ee6315002e853158fc553c3fee1595e26f7f067b167" - name: "IMAGE_mt-broker-ingress__ingress" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-ingress-rhel8@sha256:c7c2e738e0d9da1d2d1993f68938e72c4709b1f28a54fa92224ef6a0e456b0aa" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-ingress-rhel8@sha256:b35b5e81fc2570f46730b8fd5beb03c9fea85bd03540118a38b6e9f598422d33" - name: "IMAGE_imc-controller__controller" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-controller-rhel8@sha256:4aeb68a22f63300e54391ec6b4cda8c4e665d904b5dcdd3c40155040525742a0" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-controller-rhel8@sha256:4dbc862631f3725b2cfe42460084618aa5a6179e9c02bb881989216e62c1dcfe" - name: "IMAGE_imc-dispatcher__dispatcher" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-dispatcher-rhel8@sha256:52ba6b1252b6f3d41e2a0b3b880cb768010ab9dd925ac34596f6adaedcbbe07c" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-dispatcher-rhel8@sha256:b78ece8e86863984111e22bef75c420e714528f38581d524473f7f5ab33e9ecc" - name: "IMAGE_pingsource-mt-adapter__dispatcher" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-mtping-rhel8@sha256:631eb3a8dd9d83ceafa7d8a4da4b1e2d4f2740e6017c766828dcc7575cf1322f" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-mtping-rhel8@sha256:cb02f6c1bf76eb23a6de75af11ce47f4279532b8d6cefc11301f054d5764a7f6" - name: "IMAGE_job-sink__job-sink" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-jobsink-rhel8@sha256:f2d112ba9fdfccea988589b99b463c8a7157475f7a3f03678e8999e65b678cc3" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-jobsink-rhel8@sha256:588b363b038f2d7a2e36c2723218fe5f5ea5837b67467b9494c97399d5c8285e" - name: "IMAGE_APISERVER_RA_IMAGE" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-apiserver-receive-adapter-rhel8@sha256:6210a946f373b9c36c9b31293debe6fed090008b8234c0ba17d37fa81646172e" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-apiserver-receive-adapter-rhel8@sha256:1fe91343e549a200fb94c6350259f187a27b3cea5b6930ffbdf25306653ba367" - name: "IMAGE_DISPATCHER_IMAGE" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-dispatcher-rhel8@sha256:52ba6b1252b6f3d41e2a0b3b880cb768010ab9dd925ac34596f6adaedcbbe07c" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-dispatcher-rhel8@sha256:b78ece8e86863984111e22bef75c420e714528f38581d524473f7f5ab33e9ecc" - name: "IMAGE_EVENT_TRANSFORM_JSONATA_IMAGE" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-transform-jsonata-rhel8@sha256:3af4c48030263eb5769e5f36a6dd13fd390d8566efaab37532f39e1df1c95c67" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-transform-jsonata-rhel8@sha256:b3b6a1be8ff737575ebeb1737778945a9116b56675ae7006fdccdfe934dd42b3" - name: "IMAGE_INTEGRATION_SOURCE_TIMER_IMAGE" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-timer-source-rhel8@sha256:8fed5ef9a1f39a55077bb5026c8854d0ee7fc8d8ff5da277ce9c1bfc2ab2474b" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-timer-source-rhel8@sha256:7d91fb0841e34c37c870f0b521c60672904a46232443c44d5b3b99af74d49794" - name: "IMAGE_INTEGRATION_SOURCE_AWS_S3_IMAGE" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-s3-source-rhel8@sha256:27e74287774cda208f667bc2a386debe6b6255e8991abfb37c959c8525f2af53" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-s3-source-rhel8@sha256:4420e49d3283fb978e853661c1017b4cc82a7ce0f75c5fbe95953a12983ceb2c" - name: "IMAGE_INTEGRATION_SOURCE_AWS_SQS_IMAGE" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-sqs-source-rhel8@sha256:88323da16360981f27b8e4686fbbb64053e4e0e3c79c65d695edb317b334e1e0" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-sqs-source-rhel8@sha256:f799bbb0f96daec8104860848b80a23eebff7d001a496e97faa18a66ed8b272d" - name: "IMAGE_INTEGRATION_SOURCE_AWS_DDB_STREAMS_IMAGE" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-ddb-streams-source-rhel8@sha256:a903480159ebf1d8652eeaa702d9885fb76bb106c02d75cec5c82c31d77d6410" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-ddb-streams-source-rhel8@sha256:c4377c376500dee43c29c13a0b654dc0e131236b2275d4deb5159488c75cc531" - name: "IMAGE_INTEGRATION_SINK_LOG_IMAGE" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-log-sink-rhel8@sha256:30b8045ef5f925a36c58941386f1899bec125d005a08aeeeba5edd49b0859149" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-log-sink-rhel8@sha256:c4eea4f2496ed98e6a534d2b94fe53c09f5a84726e0092884db5cf7a0a028e49" - name: "IMAGE_INTEGRATION_SINK_AWS_S3_IMAGE" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-s3-sink-rhel8@sha256:d9b944e64391a996104afbe8a21f66316a948e9fb7b91734e861847285be59c7" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-s3-sink-rhel8@sha256:e8ea36f766b8f155edab3da39ed592a0f417c9633f08056f993627adad322915" - name: "IMAGE_INTEGRATION_SINK_AWS_SQS_IMAGE" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-sqs-sink-rhel8@sha256:afa634e029bcf79a972f49372498d44b45bcfbdb6eb28ecaf4f0b0b2a0a1824b" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-sqs-sink-rhel8@sha256:6220faeb259b2b935bca18a9cedf9419adbde4f830c8916ec9fe9c4aa23ae1f1" - name: "IMAGE_INTEGRATION_SINK_AWS_SNS_IMAGE" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-sns-sink-rhel8@sha256:51b5e18e8d4c1ca81d7c5ddfea6352a3887f757acfcc53bd2f8bd3b01337ed42" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-integrations-aws-sns-sink-rhel8@sha256:669863acf165bb2aebee5fb3306d6e9804078f236212d58c0b2c12c09b93d67f" - name: "IMAGE_eventmesh-backend__controller" - image: "registry.redhat.io/openshift-serverless-1/kn-backstage-plugins-eventmesh-rhel8@sha256:e3ae1cc6012f19631c012a07b113fb015977d2ee4f9faab3207fbc2464c25aa7" + image: "registry.redhat.io/openshift-serverless-1/kn-backstage-plugins-eventmesh-rhel8@sha256:20a9e06dcea91790168a77fb44c12ee2f41ad63971d08a670b88a084432b0f06" - name: "IMAGE_KUBE_RBAC_PROXY" image: "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:ed89e221d7a0a1dd82f2fa75e9e70bff3dddcb8979594396590bd3a15673a152" - name: "IMAGE_KN_PLUGIN_EVENT_SENDER" image: "registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel8@sha256:0c2cdf917bbad1f5bca8a2a2ef12a96cfcd0c77c190cc35687eb57169b54ab6f" - name: "IMAGE_KN_CLIENT" - image: "registry.redhat.io/openshift-serverless-1/kn-client-kn-rhel8@sha256:ee6533b71cf280877c9d7489dfd821c9209c6802bed7fa3fdb4f8f00fbeacb09" + image: "registry.redhat.io/openshift-serverless-1/kn-client-kn-rhel8@sha256:d1c7690a9f4398cf6cd557b0adb6687121bbc8d5a4060911559f9cb4a8e2178c" - name: "IMAGE_KN_PLUGIN_FUNC_UTIL" image: "registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8@sha256:82e69a1890042f5636ac7bb645b1aaeaba0a4894851eccc1fa1c63296918e31a" - name: "IMAGE_KN_PLUGIN_FUNC_TEKTON_BUILDAH" @@ -1456,28 +1456,28 @@ spec: - name: "IMAGE_KN_PLUGIN_FUNC_PYTHON_39" image: "registry.access.redhat.com/ubi8/python-39@sha256:27e795fd6b1b77de70d1dc73a65e4c790650748a9cfda138fdbd194b3d6eea3d" - name: "KAFKA_IMAGE_kafka-broker-receiver__kafka-broker-receiver" - image: "registry.redhat.io/openshift-serverless-1/kn-ekb-receiver-rhel8@sha256:f4d86b196457cdeebdc380b6f1b707c10f8dee789c7779c90ee1332e511af8c4" + image: "registry.redhat.io/openshift-serverless-1/kn-ekb-receiver-rhel8@sha256:11ddb3ffdb19b84650b21cbfde5a41aecf051017fec406b626ab9af3210bc9a0" - name: "KAFKA_IMAGE_kafka-broker-dispatcher__kafka-broker-dispatcher" - image: "registry.redhat.io/openshift-serverless-1/kn-ekb-dispatcher-rhel8@sha256:9b328fff0cc8545fb9bb1f24f11d78cfac3ee76dedc11fa4def4262d79a60e8c" + image: "registry.redhat.io/openshift-serverless-1/kn-ekb-dispatcher-rhel8@sha256:fe273ab00f4c635bc4b4bc9e2c6d898928f328446da3b969b238ffe189258b66" - name: "KAFKA_IMAGE_kafka-channel-receiver__kafka-channel-receiver" - image: "registry.redhat.io/openshift-serverless-1/kn-ekb-receiver-rhel8@sha256:f4d86b196457cdeebdc380b6f1b707c10f8dee789c7779c90ee1332e511af8c4" + image: "registry.redhat.io/openshift-serverless-1/kn-ekb-receiver-rhel8@sha256:11ddb3ffdb19b84650b21cbfde5a41aecf051017fec406b626ab9af3210bc9a0" - name: "KAFKA_IMAGE_kafka-channel-dispatcher__kafka-channel-dispatcher" - image: "registry.redhat.io/openshift-serverless-1/kn-ekb-dispatcher-rhel8@sha256:9b328fff0cc8545fb9bb1f24f11d78cfac3ee76dedc11fa4def4262d79a60e8c" + image: "registry.redhat.io/openshift-serverless-1/kn-ekb-dispatcher-rhel8@sha256:fe273ab00f4c635bc4b4bc9e2c6d898928f328446da3b969b238ffe189258b66" - name: "KAFKA_IMAGE_kafka-controller__controller" - image: "registry.redhat.io/openshift-serverless-1/kn-ekb-kafka-controller-rhel8@sha256:6b7316cce3432d391adc6ac38c92ff0ee86dd7ae0101957cc65cd338cc69e352" + image: "registry.redhat.io/openshift-serverless-1/kn-ekb-kafka-controller-rhel8@sha256:72e8d33c2973a910a0e011a637f8fe3cb0d49b4e9d7d4042ca559e3b83100b93" - name: "KAFKA_IMAGE_kafka-sink-receiver__kafka-sink-receiver" - image: "registry.redhat.io/openshift-serverless-1/kn-ekb-receiver-rhel8@sha256:f4d86b196457cdeebdc380b6f1b707c10f8dee789c7779c90ee1332e511af8c4" + image: "registry.redhat.io/openshift-serverless-1/kn-ekb-receiver-rhel8@sha256:11ddb3ffdb19b84650b21cbfde5a41aecf051017fec406b626ab9af3210bc9a0" - name: "KAFKA_IMAGE_kafka-source-dispatcher__kafka-source-dispatcher" - image: "registry.redhat.io/openshift-serverless-1/kn-ekb-dispatcher-rhel8@sha256:9b328fff0cc8545fb9bb1f24f11d78cfac3ee76dedc11fa4def4262d79a60e8c" + image: "registry.redhat.io/openshift-serverless-1/kn-ekb-dispatcher-rhel8@sha256:fe273ab00f4c635bc4b4bc9e2c6d898928f328446da3b969b238ffe189258b66" - name: "KAFKA_IMAGE_kafka-webhook-eventing__kafka-webhook-eventing" - image: "registry.redhat.io/openshift-serverless-1/kn-ekb-webhook-kafka-rhel8@sha256:3d780ad1ab280b5092b90e277485d589da2a18e8b08090af7d95aecd17af545d" + image: "registry.redhat.io/openshift-serverless-1/kn-ekb-webhook-kafka-rhel8@sha256:df5ff2d5bb974740435d66146580c7780034fa5782d3bf0d11792a8d5a0c4bfe" - name: "KAFKA_IMAGE_kafka-controller-post-install__post-install" - image: "registry.redhat.io/openshift-serverless-1/kn-ekb-post-install-rhel8@sha256:4274004b6289fa9bea3fa6e56d64077a328a6b5e63a9f0e9c41f6d561f682bd7" + image: "registry.redhat.io/openshift-serverless-1/kn-ekb-post-install-rhel8@sha256:12ffcd1ed1e429d1cc48055a37ebaf7de4dc9ea1b1e2ad34bfb4d04c86ebe435" - name: "KAFKA_IMAGE_knative-kafka-storage-version-migrator__migrate" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel8@sha256:a1834b620f875681388f0ae224dd0771773a8b61b1d8e5214a942f232854b87b" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel8@sha256:fb71bdc9d4bdc3581ac9696b9ec2f5c527641368d531e3c7473e23eac742bdfa" - name: "IMAGE_MUST_GATHER" - image: "registry.redhat.io/openshift-serverless-1/serverless-must-gather-rhel8@sha256:36e589adaf5ff2856f5aada90b3a2be893d9ff89f92b1b2c42ee59523c9c9c8e" + image: "registry.redhat.io/openshift-serverless-1/serverless-must-gather-rhel8@sha256:27914944deaa04f0ce51ceed709416dd10f6092472d72a87d33184bdfabaa719" - name: "IMAGE_KN_CLIENT_CLI_ARTIFACTS" - image: "registry.redhat.io/openshift-serverless-1/kn-client-cli-artifacts-rhel8@sha256:3fe326ad9a00b112fc888ffd345c8d5042f0a22cf32ea575931192c39ce1fece" + image: "registry.redhat.io/openshift-serverless-1/kn-client-cli-artifacts-rhel8@sha256:5b0312167c831f59d9856056d67af51f5b26b2ec631513e5796655fa74807fac" replaces: serverless-operator.v1.36.0 version: 1.36.1 diff --git a/openshift-knative-operator/Dockerfile b/openshift-knative-operator/Dockerfile index 1643ad2a8d..bf65cc0706 100755 --- a/openshift-knative-operator/Dockerfile +++ b/openshift-knative-operator/Dockerfile @@ -25,14 +25,17 @@ COPY openshift-knative-operator/cmd/openshift-knative-operator/kodata $KO_DATA_P USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-openshift-knative-operator-rhel8-container" \ - name="openshift-serverless-1/openshift-knative-operator-rhel8" \ + com.redhat.component="openshift-serverless-1-serverless-openshift-kn-rhel8-operator-container" \ + name="openshift-serverless-1/serverless-openshift-kn-rhel8-operator" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Openshift Knative Operator" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Openshift Knative Operator" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Openshift Knative Operator" \ io.k8s.description="Red Hat OpenShift Serverless Openshift Knative Operator" \ - io.openshift.tags="openshift-knative-operator" - + io.openshift.tags="openshift-knative-operator" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/usr/bin/openshift-knative-operator"] diff --git a/rpms.lock.yaml b/rpms.lock.yaml index 0fbc0ec333..589d6763f5 100644 --- a/rpms.lock.yaml +++ b/rpms.lock.yaml @@ -18,20 +18,20 @@ arches: name: rsync evr: 3.1.3-23.el8_10 sourcerpm: rsync-3.1.3-23.el8_10.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/os/Packages/t/tar-1.30-10.el8_10.aarch64.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/os/Packages/t/tar-1.30-11.el8_10.aarch64.rpm repoid: ubi-8-for-aarch64-baseos-rpms - size: 850208 - checksum: sha256:faa096f95002ea8d8b07b7456fc7bc6cb096d998b5cc5930a01534dc15e02abb + size: 849436 + checksum: sha256:d144cdff236b71afbe4ce9a02919b9723b333c1588c887da781c1a74af56ad29 name: tar - evr: 2:1.30-10.el8_10 - sourcerpm: tar-1.30-10.el8_10.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/os/Packages/t/tzdata-2025b-1.el8.noarch.rpm + evr: 2:1.30-11.el8_10 + sourcerpm: tar-1.30-11.el8_10.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/os/Packages/t/tzdata-2026a-1.el8.noarch.rpm repoid: ubi-8-for-aarch64-baseos-rpms - size: 488428 - checksum: sha256:338539f7f0cd2770694153af81e2e65121b050a1bb555ad66a6fb6f562732602 + size: 562212 + checksum: sha256:4e9b64a18650ea6a7ff540aef7947b9f493d15919662dd067e42b9276acaceb8 name: tzdata - evr: 2025b-1.el8 - sourcerpm: tzdata-2025b-1.el8.src.rpm + evr: 2026a-1.el8 + sourcerpm: tzdata-2026a-1.el8.src.rpm source: - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/appstream/source/SRPMS/Packages/s/socat-1.7.4.1-2.el8_10.src.rpm repoid: ubi-8-for-aarch64-appstream-source-rpms @@ -45,18 +45,18 @@ arches: checksum: sha256:f21aa8abbea6df3016d82d6db3e8b9abce2a068de40373d5ad6fa0926f0ca24a name: rsync evr: 3.1.3-23.el8_10 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/source/SRPMS/Packages/t/tar-1.30-10.el8_10.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/source/SRPMS/Packages/t/tar-1.30-11.el8_10.src.rpm repoid: ubi-8-for-aarch64-baseos-source-rpms - size: 2172709 - checksum: sha256:bf8f8a0c5c47b1a35b732c9e2b9afbd45171a70355f0b93526deb654ed55b566 + size: 2173356 + checksum: sha256:eda17923b1ada7f9d5f8a4501929a61e393b66cb0a6ade6ab13d85817d29f779 name: tar - evr: 2:1.30-10.el8_10 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/source/SRPMS/Packages/t/tzdata-2025b-1.el8.src.rpm + evr: 2:1.30-11.el8_10 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/source/SRPMS/Packages/t/tzdata-2026a-1.el8.src.rpm repoid: ubi-8-for-aarch64-baseos-source-rpms - size: 946701 - checksum: sha256:2f0ba51d371713287a690d9d1635b534113258aa2571862603d52870c1c8b60d + size: 965559 + checksum: sha256:fad45889fe2cf9e129928cfb8d3ffcb95981d3b07c54a75b30ff63f2dc3c7df7 name: tzdata - evr: 2025b-1.el8 + evr: 2026a-1.el8 module_metadata: [] - arch: ppc64le packages: @@ -74,20 +74,20 @@ arches: name: rsync evr: 3.1.3-23.el8_10 sourcerpm: rsync-3.1.3-23.el8_10.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/os/Packages/t/tar-1.30-10.el8_10.ppc64le.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/os/Packages/t/tar-1.30-11.el8_10.ppc64le.rpm repoid: ubi-8-for-ppc64le-baseos-rpms - size: 879004 - checksum: sha256:759b26009945a72d4d5813efcaf17d9ff2494f1031bcd57220acff067a33853e + size: 877676 + checksum: sha256:8f7ab471dc80a164806bae0dab7c4a631383f8fb0c89ab34ac578dd2900ce979 name: tar - evr: 2:1.30-10.el8_10 - sourcerpm: tar-1.30-10.el8_10.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/os/Packages/t/tzdata-2025b-1.el8.noarch.rpm + evr: 2:1.30-11.el8_10 + sourcerpm: tar-1.30-11.el8_10.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/os/Packages/t/tzdata-2026a-1.el8.noarch.rpm repoid: ubi-8-for-ppc64le-baseos-rpms - size: 488428 - checksum: sha256:338539f7f0cd2770694153af81e2e65121b050a1bb555ad66a6fb6f562732602 + size: 562212 + checksum: sha256:4e9b64a18650ea6a7ff540aef7947b9f493d15919662dd067e42b9276acaceb8 name: tzdata - evr: 2025b-1.el8 - sourcerpm: tzdata-2025b-1.el8.src.rpm + evr: 2026a-1.el8 + sourcerpm: tzdata-2026a-1.el8.src.rpm source: - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/appstream/source/SRPMS/Packages/s/socat-1.7.4.1-2.el8_10.src.rpm repoid: ubi-8-for-ppc64le-appstream-source-rpms @@ -101,18 +101,18 @@ arches: checksum: sha256:f21aa8abbea6df3016d82d6db3e8b9abce2a068de40373d5ad6fa0926f0ca24a name: rsync evr: 3.1.3-23.el8_10 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/source/SRPMS/Packages/t/tar-1.30-10.el8_10.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/source/SRPMS/Packages/t/tar-1.30-11.el8_10.src.rpm repoid: ubi-8-for-ppc64le-baseos-source-rpms - size: 2172709 - checksum: sha256:bf8f8a0c5c47b1a35b732c9e2b9afbd45171a70355f0b93526deb654ed55b566 + size: 2173356 + checksum: sha256:eda17923b1ada7f9d5f8a4501929a61e393b66cb0a6ade6ab13d85817d29f779 name: tar - evr: 2:1.30-10.el8_10 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/source/SRPMS/Packages/t/tzdata-2025b-1.el8.src.rpm + evr: 2:1.30-11.el8_10 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/source/SRPMS/Packages/t/tzdata-2026a-1.el8.src.rpm repoid: ubi-8-for-ppc64le-baseos-source-rpms - size: 946701 - checksum: sha256:2f0ba51d371713287a690d9d1635b534113258aa2571862603d52870c1c8b60d + size: 965559 + checksum: sha256:fad45889fe2cf9e129928cfb8d3ffcb95981d3b07c54a75b30ff63f2dc3c7df7 name: tzdata - evr: 2025b-1.el8 + evr: 2026a-1.el8 module_metadata: [] - arch: s390x packages: @@ -130,20 +130,20 @@ arches: name: rsync evr: 3.1.3-23.el8_10 sourcerpm: rsync-3.1.3-23.el8_10.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/os/Packages/t/tar-1.30-10.el8_10.s390x.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/os/Packages/t/tar-1.30-11.el8_10.s390x.rpm repoid: ubi-8-for-s390x-baseos-rpms - size: 853692 - checksum: sha256:783728be13c9e911d2d899b49b8b9be51723359078e8593c7475aeb506b350af + size: 852716 + checksum: sha256:19658f59ed89e790423c0639d1bd39158e7fb20d86aef49765e81878708053ad name: tar - evr: 2:1.30-10.el8_10 - sourcerpm: tar-1.30-10.el8_10.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/os/Packages/t/tzdata-2025b-1.el8.noarch.rpm + evr: 2:1.30-11.el8_10 + sourcerpm: tar-1.30-11.el8_10.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/os/Packages/t/tzdata-2026a-1.el8.noarch.rpm repoid: ubi-8-for-s390x-baseos-rpms - size: 488428 - checksum: sha256:338539f7f0cd2770694153af81e2e65121b050a1bb555ad66a6fb6f562732602 + size: 562212 + checksum: sha256:4e9b64a18650ea6a7ff540aef7947b9f493d15919662dd067e42b9276acaceb8 name: tzdata - evr: 2025b-1.el8 - sourcerpm: tzdata-2025b-1.el8.src.rpm + evr: 2026a-1.el8 + sourcerpm: tzdata-2026a-1.el8.src.rpm source: - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/appstream/source/SRPMS/Packages/s/socat-1.7.4.1-2.el8_10.src.rpm repoid: ubi-8-for-s390x-appstream-source-rpms @@ -157,18 +157,18 @@ arches: checksum: sha256:f21aa8abbea6df3016d82d6db3e8b9abce2a068de40373d5ad6fa0926f0ca24a name: rsync evr: 3.1.3-23.el8_10 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/source/SRPMS/Packages/t/tar-1.30-10.el8_10.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/source/SRPMS/Packages/t/tar-1.30-11.el8_10.src.rpm repoid: ubi-8-for-s390x-baseos-source-rpms - size: 2172709 - checksum: sha256:bf8f8a0c5c47b1a35b732c9e2b9afbd45171a70355f0b93526deb654ed55b566 + size: 2173356 + checksum: sha256:eda17923b1ada7f9d5f8a4501929a61e393b66cb0a6ade6ab13d85817d29f779 name: tar - evr: 2:1.30-10.el8_10 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/source/SRPMS/Packages/t/tzdata-2025b-1.el8.src.rpm + evr: 2:1.30-11.el8_10 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/source/SRPMS/Packages/t/tzdata-2026a-1.el8.src.rpm repoid: ubi-8-for-s390x-baseos-source-rpms - size: 946701 - checksum: sha256:2f0ba51d371713287a690d9d1635b534113258aa2571862603d52870c1c8b60d + size: 965559 + checksum: sha256:fad45889fe2cf9e129928cfb8d3ffcb95981d3b07c54a75b30ff63f2dc3c7df7 name: tzdata - evr: 2025b-1.el8 + evr: 2026a-1.el8 module_metadata: [] - arch: x86_64 packages: @@ -186,20 +186,20 @@ arches: name: rsync evr: 3.1.3-23.el8_10 sourcerpm: rsync-3.1.3-23.el8_10.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/os/Packages/t/tar-1.30-10.el8_10.x86_64.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/os/Packages/t/tar-1.30-11.el8_10.x86_64.rpm repoid: ubi-8-for-x86_64-baseos-rpms - size: 859244 - checksum: sha256:471485af8599f7176f357867dc952e587cffb223dec3455f97d8e40a854515ac + size: 858044 + checksum: sha256:165490e87bdfb8c9647aeb58c72c1676c695218a8f87170753a9f49daabb774c name: tar - evr: 2:1.30-10.el8_10 - sourcerpm: tar-1.30-10.el8_10.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/os/Packages/t/tzdata-2025b-1.el8.noarch.rpm + evr: 2:1.30-11.el8_10 + sourcerpm: tar-1.30-11.el8_10.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/os/Packages/t/tzdata-2026a-1.el8.noarch.rpm repoid: ubi-8-for-x86_64-baseos-rpms - size: 488428 - checksum: sha256:338539f7f0cd2770694153af81e2e65121b050a1bb555ad66a6fb6f562732602 + size: 562212 + checksum: sha256:4e9b64a18650ea6a7ff540aef7947b9f493d15919662dd067e42b9276acaceb8 name: tzdata - evr: 2025b-1.el8 - sourcerpm: tzdata-2025b-1.el8.src.rpm + evr: 2026a-1.el8 + sourcerpm: tzdata-2026a-1.el8.src.rpm source: - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/appstream/source/SRPMS/Packages/s/socat-1.7.4.1-2.el8_10.src.rpm repoid: ubi-8-for-x86_64-appstream-source-rpms @@ -213,16 +213,16 @@ arches: checksum: sha256:f21aa8abbea6df3016d82d6db3e8b9abce2a068de40373d5ad6fa0926f0ca24a name: rsync evr: 3.1.3-23.el8_10 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/source/SRPMS/Packages/t/tar-1.30-10.el8_10.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/source/SRPMS/Packages/t/tar-1.30-11.el8_10.src.rpm repoid: ubi-8-for-x86_64-baseos-source-rpms - size: 2172709 - checksum: sha256:bf8f8a0c5c47b1a35b732c9e2b9afbd45171a70355f0b93526deb654ed55b566 + size: 2173356 + checksum: sha256:eda17923b1ada7f9d5f8a4501929a61e393b66cb0a6ade6ab13d85817d29f779 name: tar - evr: 2:1.30-10.el8_10 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/source/SRPMS/Packages/t/tzdata-2025b-1.el8.src.rpm + evr: 2:1.30-11.el8_10 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/source/SRPMS/Packages/t/tzdata-2026a-1.el8.src.rpm repoid: ubi-8-for-x86_64-baseos-source-rpms - size: 946701 - checksum: sha256:2f0ba51d371713287a690d9d1635b534113258aa2571862603d52870c1c8b60d + size: 965559 + checksum: sha256:fad45889fe2cf9e129928cfb8d3ffcb95981d3b07c54a75b30ff63f2dc3c7df7 name: tzdata - evr: 2025b-1.el8 + evr: 2026a-1.el8 module_metadata: [] diff --git a/serving/ingress/Dockerfile b/serving/ingress/Dockerfile index 2aa2d4c599..6e3a0b9e91 100755 --- a/serving/ingress/Dockerfile +++ b/serving/ingress/Dockerfile @@ -22,14 +22,17 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-ingress-rhel8-container" \ - name="openshift-serverless-1/ingress-rhel8" \ + com.redhat.component="openshift-serverless-1-serverless-ingress-rhel8-container" \ + name="openshift-serverless-1/serverless-ingress-rhel8" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Ingress" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Ingress" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Ingress" \ io.k8s.description="Red Hat OpenShift Serverless Ingress" \ - io.openshift.tags="ingress" - + io.openshift.tags="ingress" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/usr/bin/ingress"] diff --git a/serving/metadata-webhook/Dockerfile b/serving/metadata-webhook/Dockerfile index 55416d1334..4239776cb2 100644 --- a/serving/metadata-webhook/Dockerfile +++ b/serving/metadata-webhook/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Webhook" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Webhook" \ io.k8s.description="Red Hat OpenShift Serverless Webhook" \ - io.openshift.tags="webhook" - + io.openshift.tags="webhook" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/usr/bin/webhook"] diff --git a/test/images-rekt.yaml b/test/images-rekt.yaml index 2c413e9dd8..5bf8d1e231 100644 --- a/test/images-rekt.yaml +++ b/test/images-rekt.yaml @@ -1,2 +1,2 @@ -knative.dev/reconciler-test/cmd/eventshub: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/kn-eventing-test-eventshub@sha256:c8cec1b025ab472ff8ce0a11ebe41f43528dc6089df4e404f651bdb7b0f4b037 -knative.dev/eventing/cmd/heartbeats: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/kn-eventing-heartbeats@sha256:62e478ba5c82f1adccfce4c923cba191a3b8a1ed8eb42e1b7ec8b8820cb54efa +knative.dev/reconciler-test/cmd/eventshub: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/kn-eventing-test-eventshub@sha256:fc2de97dd383073c50434e98f58e06eb44dae68272d2346f446fab9129450105 +knative.dev/eventing/cmd/heartbeats: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/kn-eventing-heartbeats@sha256:2db490e694e04251802f641525a7b4a58ddf01f24c61b177b4f2d2881255892f diff --git a/vendor/github.com/IBM/sarama/entrypoint.sh b/vendor/github.com/IBM/sarama/entrypoint.sh old mode 100644 new mode 100755 diff --git a/vendor/github.com/cespare/xxhash/v2/testall.sh b/vendor/github.com/cespare/xxhash/v2/testall.sh old mode 100644 new mode 100755 diff --git a/vendor/github.com/emicklei/go-restful/v3/bench_test.sh b/vendor/github.com/emicklei/go-restful/v3/bench_test.sh old mode 100644 new mode 100755 diff --git a/vendor/github.com/emicklei/go-restful/v3/coverage.sh b/vendor/github.com/emicklei/go-restful/v3/coverage.sh old mode 100644 new mode 100755 diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/internal/httprule/BUILD.bazel b/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/internal/httprule/BUILD.bazel deleted file mode 100644 index b8fbb2b77c..0000000000 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/internal/httprule/BUILD.bazel +++ /dev/null @@ -1,35 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") - -package(default_visibility = ["//visibility:public"]) - -go_library( - name = "httprule", - srcs = [ - "compile.go", - "parse.go", - "types.go", - ], - importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/internal/httprule", - deps = ["//utilities"], -) - -go_test( - name = "httprule_test", - size = "small", - srcs = [ - "compile_test.go", - "parse_test.go", - "types_test.go", - ], - embed = [":httprule"], - deps = [ - "//utilities", - "@org_golang_google_grpc//grpclog", - ], -) - -alias( - name = "go_default_library", - actual = ":httprule", - visibility = ["//:__subpackages__"], -) diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/runtime/BUILD.bazel b/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/runtime/BUILD.bazel deleted file mode 100644 index a65d88eb86..0000000000 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/runtime/BUILD.bazel +++ /dev/null @@ -1,97 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") - -package(default_visibility = ["//visibility:public"]) - -go_library( - name = "runtime", - srcs = [ - "context.go", - "convert.go", - "doc.go", - "errors.go", - "fieldmask.go", - "handler.go", - "marshal_httpbodyproto.go", - "marshal_json.go", - "marshal_jsonpb.go", - "marshal_proto.go", - "marshaler.go", - "marshaler_registry.go", - "mux.go", - "pattern.go", - "proto2_convert.go", - "query.go", - ], - importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/runtime", - deps = [ - "//internal/httprule", - "//utilities", - "@org_golang_google_genproto_googleapis_api//httpbody", - "@org_golang_google_grpc//codes", - "@org_golang_google_grpc//grpclog", - "@org_golang_google_grpc//health/grpc_health_v1", - "@org_golang_google_grpc//metadata", - "@org_golang_google_grpc//status", - "@org_golang_google_protobuf//encoding/protojson", - "@org_golang_google_protobuf//proto", - "@org_golang_google_protobuf//reflect/protoreflect", - "@org_golang_google_protobuf//reflect/protoregistry", - "@org_golang_google_protobuf//types/known/durationpb", - "@org_golang_google_protobuf//types/known/fieldmaskpb", - "@org_golang_google_protobuf//types/known/structpb", - "@org_golang_google_protobuf//types/known/timestamppb", - "@org_golang_google_protobuf//types/known/wrapperspb", - ], -) - -go_test( - name = "runtime_test", - size = "small", - srcs = [ - "context_test.go", - "convert_test.go", - "errors_test.go", - "fieldmask_test.go", - "handler_test.go", - "marshal_httpbodyproto_test.go", - "marshal_json_test.go", - "marshal_jsonpb_test.go", - "marshal_proto_test.go", - "marshaler_registry_test.go", - "mux_internal_test.go", - "mux_test.go", - "pattern_test.go", - "query_fuzz_test.go", - "query_test.go", - ], - embed = [":runtime"], - deps = [ - "//runtime/internal/examplepb", - "//utilities", - "@com_github_google_go_cmp//cmp", - "@com_github_google_go_cmp//cmp/cmpopts", - "@org_golang_google_genproto_googleapis_api//httpbody", - "@org_golang_google_genproto_googleapis_rpc//errdetails", - "@org_golang_google_genproto_googleapis_rpc//status", - "@org_golang_google_grpc//:grpc", - "@org_golang_google_grpc//codes", - "@org_golang_google_grpc//health/grpc_health_v1", - "@org_golang_google_grpc//metadata", - "@org_golang_google_grpc//status", - "@org_golang_google_protobuf//encoding/protojson", - "@org_golang_google_protobuf//proto", - "@org_golang_google_protobuf//testing/protocmp", - "@org_golang_google_protobuf//types/known/durationpb", - "@org_golang_google_protobuf//types/known/emptypb", - "@org_golang_google_protobuf//types/known/fieldmaskpb", - "@org_golang_google_protobuf//types/known/structpb", - "@org_golang_google_protobuf//types/known/timestamppb", - "@org_golang_google_protobuf//types/known/wrapperspb", - ], -) - -alias( - name = "go_default_library", - actual = ":runtime", - visibility = ["//visibility:public"], -) diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/utilities/BUILD.bazel b/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/utilities/BUILD.bazel deleted file mode 100644 index b894094657..0000000000 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/utilities/BUILD.bazel +++ /dev/null @@ -1,31 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") - -package(default_visibility = ["//visibility:public"]) - -go_library( - name = "utilities", - srcs = [ - "doc.go", - "pattern.go", - "readerfactory.go", - "string_array_flag.go", - "trie.go", - ], - importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/utilities", -) - -go_test( - name = "utilities_test", - size = "small", - srcs = [ - "string_array_flag_test.go", - "trie_test.go", - ], - deps = [":utilities"], -) - -alias( - name = "go_default_library", - actual = ":utilities", - visibility = ["//visibility:public"], -) diff --git a/vendor/github.com/json-iterator/go/build.sh b/vendor/github.com/json-iterator/go/build.sh old mode 100644 new mode 100755 diff --git a/vendor/github.com/json-iterator/go/test.sh b/vendor/github.com/json-iterator/go/test.sh old mode 100644 new mode 100755 diff --git a/vendor/github.com/klauspost/compress/gen.sh b/vendor/github.com/klauspost/compress/gen.sh old mode 100644 new mode 100755 diff --git a/vendor/github.com/manifestival/manifestival/manifestival.go b/vendor/github.com/manifestival/manifestival/manifestival.go index b8d07b8bc2..892433fb61 100644 --- a/vendor/github.com/manifestival/manifestival/manifestival.go +++ b/vendor/github.com/manifestival/manifestival/manifestival.go @@ -133,7 +133,7 @@ func (m Manifest) apply(spec *unstructured.Unstructured, opts ...ApplyOption) er annotate(current, v1.LastAppliedConfigAnnotation, lastApplied(current)) return m.Client.Create(current, opts...) } else { - diff, err := patch.New(current, spec) + diff, err := patch.New(unsetStatus(current), unsetStatus(spec)) if err != nil { return err } @@ -156,6 +156,14 @@ func (m Manifest) apply(spec *unstructured.Unstructured, opts ...ApplyOption) er } } +func unsetStatus(spec *unstructured.Unstructured) *unstructured.Unstructured { + spec = spec.DeepCopy() + if _, ok := spec.Object["status"]; ok { + spec.Object["status"] = nil + } + return spec +} + // update a single resource func (m Manifest) update(live, spec *unstructured.Unstructured, opts ...ApplyOption) error { m.logResource("Updating", live) diff --git a/vendor/github.com/modern-go/concurrent/test.sh b/vendor/github.com/modern-go/concurrent/test.sh old mode 100644 new mode 100755 diff --git a/vendor/github.com/openshift/api/route/v1/test-route-validation.sh b/vendor/github.com/openshift/api/route/v1/test-route-validation.sh old mode 100644 new mode 100755 diff --git a/vendor/github.com/pelletier/go-toml/v2/ci.sh b/vendor/github.com/pelletier/go-toml/v2/ci.sh old mode 100644 new mode 100755 diff --git a/vendor/github.com/rcrowley/go-metrics/validate.sh b/vendor/github.com/rcrowley/go-metrics/validate.sh old mode 100644 new mode 100755 diff --git a/vendor/github.com/rickb777/plural/build+test.sh b/vendor/github.com/rickb777/plural/build+test.sh old mode 100644 new mode 100755 diff --git a/vendor/go.uber.org/zap/checklicense.sh b/vendor/go.uber.org/zap/checklicense.sh old mode 100644 new mode 100755 diff --git a/vendor/golang.org/x/sys/plan9/mkall.sh b/vendor/golang.org/x/sys/plan9/mkall.sh old mode 100644 new mode 100755 diff --git a/vendor/golang.org/x/sys/plan9/mkerrors.sh b/vendor/golang.org/x/sys/plan9/mkerrors.sh old mode 100644 new mode 100755 diff --git a/vendor/golang.org/x/sys/plan9/mksysnum_plan9.sh b/vendor/golang.org/x/sys/plan9/mksysnum_plan9.sh old mode 100644 new mode 100755 diff --git a/vendor/golang.org/x/sys/unix/mkall.sh b/vendor/golang.org/x/sys/unix/mkall.sh old mode 100644 new mode 100755 diff --git a/vendor/golang.org/x/sys/unix/mkerrors.sh b/vendor/golang.org/x/sys/unix/mkerrors.sh old mode 100644 new mode 100755 diff --git a/vendor/k8s.io/apimachinery/pkg/api/errors/OWNERS b/vendor/k8s.io/apimachinery/pkg/api/errors/OWNERS deleted file mode 100644 index 1a9f5e7706..0000000000 --- a/vendor/k8s.io/apimachinery/pkg/api/errors/OWNERS +++ /dev/null @@ -1,16 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -reviewers: - - thockin - - smarterclayton - - wojtek-t - - deads2k - - derekwaynecarr - - caesarxuchao - - mikedanese - - liggitt - - saad-ali - - janetkuo - - tallclair - - dims - - cjcullen diff --git a/vendor/k8s.io/apimachinery/pkg/api/meta/OWNERS b/vendor/k8s.io/apimachinery/pkg/api/meta/OWNERS deleted file mode 100644 index 1e1330fff2..0000000000 --- a/vendor/k8s.io/apimachinery/pkg/api/meta/OWNERS +++ /dev/null @@ -1,14 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -reviewers: - - thockin - - smarterclayton - - wojtek-t - - deads2k - - derekwaynecarr - - caesarxuchao - - mikedanese - - liggitt - - janetkuo - - ncdc - - dims diff --git a/vendor/k8s.io/apimachinery/pkg/api/resource/OWNERS b/vendor/k8s.io/apimachinery/pkg/api/resource/OWNERS deleted file mode 100644 index 063fd285da..0000000000 --- a/vendor/k8s.io/apimachinery/pkg/api/resource/OWNERS +++ /dev/null @@ -1,10 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -reviewers: - - thockin - - smarterclayton - - wojtek-t - - derekwaynecarr - - mikedanese - - saad-ali - - janetkuo diff --git a/vendor/k8s.io/apimachinery/pkg/api/validation/OWNERS b/vendor/k8s.io/apimachinery/pkg/api/validation/OWNERS deleted file mode 100644 index 4023732476..0000000000 --- a/vendor/k8s.io/apimachinery/pkg/api/validation/OWNERS +++ /dev/null @@ -1,11 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -# Disable inheritance as this is an api owners file -options: - no_parent_owners: true -approvers: - - api-approvers -reviewers: - - api-reviewers -labels: - - kind/api-change diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/OWNERS b/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/OWNERS deleted file mode 100644 index e7e5c152d0..0000000000 --- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/OWNERS +++ /dev/null @@ -1,16 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -reviewers: - - thockin - - smarterclayton - - wojtek-t - - deads2k - - caesarxuchao - - liggitt - - sttts - - luxas - - janetkuo - - justinsb - - ncdc - - soltysh - - dims diff --git a/vendor/k8s.io/apimachinery/pkg/util/mergepatch/OWNERS b/vendor/k8s.io/apimachinery/pkg/util/mergepatch/OWNERS deleted file mode 100644 index 349bc69d65..0000000000 --- a/vendor/k8s.io/apimachinery/pkg/util/mergepatch/OWNERS +++ /dev/null @@ -1,6 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -approvers: - - pwittrock -reviewers: - - apelisse diff --git a/vendor/k8s.io/apimachinery/pkg/util/strategicpatch/OWNERS b/vendor/k8s.io/apimachinery/pkg/util/strategicpatch/OWNERS deleted file mode 100644 index 73244449f2..0000000000 --- a/vendor/k8s.io/apimachinery/pkg/util/strategicpatch/OWNERS +++ /dev/null @@ -1,9 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -approvers: - - apelisse - - pwittrock -reviewers: - - apelisse -emeritus_approvers: - - mengqiy diff --git a/vendor/k8s.io/apimachinery/pkg/util/validation/OWNERS b/vendor/k8s.io/apimachinery/pkg/util/validation/OWNERS deleted file mode 100644 index 4023732476..0000000000 --- a/vendor/k8s.io/apimachinery/pkg/util/validation/OWNERS +++ /dev/null @@ -1,11 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -# Disable inheritance as this is an api owners file -options: - no_parent_owners: true -approvers: - - api-approvers -reviewers: - - api-reviewers -labels: - - kind/api-change diff --git a/vendor/k8s.io/apimachinery/third_party/forked/golang/json/OWNERS b/vendor/k8s.io/apimachinery/third_party/forked/golang/json/OWNERS deleted file mode 100644 index 349bc69d65..0000000000 --- a/vendor/k8s.io/apimachinery/third_party/forked/golang/json/OWNERS +++ /dev/null @@ -1,6 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -approvers: - - pwittrock -reviewers: - - apelisse diff --git a/vendor/k8s.io/client-go/openapi/OWNERS b/vendor/k8s.io/client-go/openapi/OWNERS deleted file mode 100644 index e610094242..0000000000 --- a/vendor/k8s.io/client-go/openapi/OWNERS +++ /dev/null @@ -1,4 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -approvers: - - apelisse diff --git a/vendor/k8s.io/client-go/pkg/apis/clientauthentication/OWNERS b/vendor/k8s.io/client-go/pkg/apis/clientauthentication/OWNERS deleted file mode 100644 index 4dfbb98aec..0000000000 --- a/vendor/k8s.io/client-go/pkg/apis/clientauthentication/OWNERS +++ /dev/null @@ -1,8 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -# approval on api packages bubbles to api-approvers -reviewers: - - sig-auth-authenticators-approvers - - sig-auth-authenticators-reviewers -labels: - - sig/auth diff --git a/vendor/k8s.io/client-go/rest/OWNERS b/vendor/k8s.io/client-go/rest/OWNERS deleted file mode 100644 index 7b23294c45..0000000000 --- a/vendor/k8s.io/client-go/rest/OWNERS +++ /dev/null @@ -1,14 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -reviewers: - - thockin - - smarterclayton - - caesarxuchao - - wojtek-t - - deads2k - - liggitt - - sttts - - luxas - - dims - - cjcullen - - lojies diff --git a/vendor/k8s.io/client-go/tools/auth/OWNERS b/vendor/k8s.io/client-go/tools/auth/OWNERS deleted file mode 100644 index c4ea6463df..0000000000 --- a/vendor/k8s.io/client-go/tools/auth/OWNERS +++ /dev/null @@ -1,8 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -approvers: - - sig-auth-authenticators-approvers -reviewers: - - sig-auth-authenticators-reviewers -labels: - - sig/auth diff --git a/vendor/k8s.io/client-go/tools/cache/OWNERS b/vendor/k8s.io/client-go/tools/cache/OWNERS deleted file mode 100644 index 921ac2fa02..0000000000 --- a/vendor/k8s.io/client-go/tools/cache/OWNERS +++ /dev/null @@ -1,28 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -approvers: - - thockin - - smarterclayton - - wojtek-t - - deads2k - - caesarxuchao - - liggitt - - ncdc -reviewers: - - thockin - - smarterclayton - - wojtek-t - - deads2k - - derekwaynecarr - - caesarxuchao - - mikedanese - - liggitt - - janetkuo - - justinsb - - soltysh - - jsafrane - - dims - - ingvagabund - - ncdc -emeritus_approvers: - - lavalamp diff --git a/vendor/k8s.io/client-go/tools/leaderelection/OWNERS b/vendor/k8s.io/client-go/tools/leaderelection/OWNERS deleted file mode 100644 index 908bdacdfe..0000000000 --- a/vendor/k8s.io/client-go/tools/leaderelection/OWNERS +++ /dev/null @@ -1,11 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -approvers: - - mikedanese -reviewers: - - wojtek-t - - deads2k - - mikedanese - - ingvagabund -emeritus_approvers: - - timothysc diff --git a/vendor/k8s.io/client-go/tools/metrics/OWNERS b/vendor/k8s.io/client-go/tools/metrics/OWNERS deleted file mode 100644 index 2c9488a5fb..0000000000 --- a/vendor/k8s.io/client-go/tools/metrics/OWNERS +++ /dev/null @@ -1,5 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -reviewers: - - wojtek-t - - jayunit100 diff --git a/vendor/k8s.io/client-go/tools/record/OWNERS b/vendor/k8s.io/client-go/tools/record/OWNERS deleted file mode 100644 index 8105c4fe08..0000000000 --- a/vendor/k8s.io/client-go/tools/record/OWNERS +++ /dev/null @@ -1,6 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -reviewers: - - sig-instrumentation-reviewers -approvers: - - sig-instrumentation-approvers diff --git a/vendor/k8s.io/client-go/transport/OWNERS b/vendor/k8s.io/client-go/transport/OWNERS deleted file mode 100644 index 34adee5ec5..0000000000 --- a/vendor/k8s.io/client-go/transport/OWNERS +++ /dev/null @@ -1,8 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -reviewers: - - smarterclayton - - wojtek-t - - deads2k - - liggitt - - caesarxuchao diff --git a/vendor/k8s.io/client-go/util/cert/OWNERS b/vendor/k8s.io/client-go/util/cert/OWNERS deleted file mode 100644 index 3c3b94c58c..0000000000 --- a/vendor/k8s.io/client-go/util/cert/OWNERS +++ /dev/null @@ -1,8 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -approvers: - - sig-auth-certificates-approvers -reviewers: - - sig-auth-certificates-reviewers -labels: - - sig/auth diff --git a/vendor/k8s.io/client-go/util/keyutil/OWNERS b/vendor/k8s.io/client-go/util/keyutil/OWNERS deleted file mode 100644 index e6d229d5db..0000000000 --- a/vendor/k8s.io/client-go/util/keyutil/OWNERS +++ /dev/null @@ -1,6 +0,0 @@ -approvers: - - sig-auth-certificates-approvers -reviewers: - - sig-auth-certificates-reviewers -labels: - - sig/auth diff --git a/vendor/k8s.io/client-go/util/retry/OWNERS b/vendor/k8s.io/client-go/util/retry/OWNERS deleted file mode 100644 index 75736b5aac..0000000000 --- a/vendor/k8s.io/client-go/util/retry/OWNERS +++ /dev/null @@ -1,4 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -reviewers: - - caesarxuchao diff --git a/vendor/k8s.io/code-generator/OWNERS b/vendor/k8s.io/code-generator/OWNERS deleted file mode 100644 index 3b87391c29..0000000000 --- a/vendor/k8s.io/code-generator/OWNERS +++ /dev/null @@ -1,15 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -approvers: - - deads2k - - wojtek-t - - sttts -reviewers: - - deads2k - - wojtek-t - - sttts -labels: - - sig/api-machinery - - area/code-generation -emeritus_approvers: - - lavalamp diff --git a/vendor/k8s.io/code-generator/cmd/client-gen/OWNERS b/vendor/k8s.io/code-generator/cmd/client-gen/OWNERS deleted file mode 100644 index 967eb2a7bb..0000000000 --- a/vendor/k8s.io/code-generator/cmd/client-gen/OWNERS +++ /dev/null @@ -1,11 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -approvers: - - wojtek-t - - caesarxuchao -reviewers: - - wojtek-t - - caesarxuchao - - jpbetz -emeritus_approvers: - - lavalamp diff --git a/vendor/k8s.io/code-generator/cmd/go-to-protobuf/OWNERS b/vendor/k8s.io/code-generator/cmd/go-to-protobuf/OWNERS deleted file mode 100644 index af7e2ec4c7..0000000000 --- a/vendor/k8s.io/code-generator/cmd/go-to-protobuf/OWNERS +++ /dev/null @@ -1,6 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -approvers: - - smarterclayton -reviewers: - - smarterclayton diff --git a/vendor/k8s.io/code-generator/generate-groups.sh b/vendor/k8s.io/code-generator/generate-groups.sh old mode 100644 new mode 100755 diff --git a/vendor/k8s.io/code-generator/generate-internal-groups.sh b/vendor/k8s.io/code-generator/generate-internal-groups.sh old mode 100644 new mode 100755 diff --git a/vendor/k8s.io/code-generator/kube_codegen.sh b/vendor/k8s.io/code-generator/kube_codegen.sh old mode 100644 new mode 100755 diff --git a/vendor/k8s.io/klog/v2/OWNERS b/vendor/k8s.io/klog/v2/OWNERS deleted file mode 100644 index 7500475a64..0000000000 --- a/vendor/k8s.io/klog/v2/OWNERS +++ /dev/null @@ -1,16 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners -reviewers: - - harshanarayana - - mengjiao-liu - - pohly -approvers: - - dims - - pohly - - thockin -emeritus_approvers: - - brancz - - justinsb - - lavalamp - - piosz - - serathius - - tallclair diff --git a/vendor/k8s.io/kube-openapi/pkg/generators/rules/OWNERS b/vendor/k8s.io/kube-openapi/pkg/generators/rules/OWNERS deleted file mode 100644 index 235bc545b8..0000000000 --- a/vendor/k8s.io/kube-openapi/pkg/generators/rules/OWNERS +++ /dev/null @@ -1,4 +0,0 @@ -reviewers: -- roycaihw -approvers: -- roycaihw diff --git a/vendor/k8s.io/kube-openapi/pkg/util/proto/OWNERS b/vendor/k8s.io/kube-openapi/pkg/util/proto/OWNERS deleted file mode 100644 index 9621a6a3a4..0000000000 --- a/vendor/k8s.io/kube-openapi/pkg/util/proto/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -approvers: -- apelisse diff --git a/vendor/k8s.io/utils/pointer/OWNERS b/vendor/k8s.io/utils/pointer/OWNERS deleted file mode 100644 index 0d6392752a..0000000000 --- a/vendor/k8s.io/utils/pointer/OWNERS +++ /dev/null @@ -1,10 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -approvers: -- apelisse -- stewart-yu -- thockin -reviewers: -- apelisse -- stewart-yu -- thockin diff --git a/vendor/k8s.io/utils/ptr/OWNERS b/vendor/k8s.io/utils/ptr/OWNERS deleted file mode 100644 index 0d6392752a..0000000000 --- a/vendor/k8s.io/utils/ptr/OWNERS +++ /dev/null @@ -1,10 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -approvers: -- apelisse -- stewart-yu -- thockin -reviewers: -- apelisse -- stewart-yu -- thockin diff --git a/vendor/knative.dev/eventing/test/OWNERS b/vendor/knative.dev/eventing/test/OWNERS deleted file mode 100644 index 65aa9e7b11..0000000000 --- a/vendor/knative.dev/eventing/test/OWNERS +++ /dev/null @@ -1,10 +0,0 @@ -# The OWNERS file is used by prow to automatically merge approved PRs. - -approvers: -- productivity-writers - -reviewers: -- productivity-reviewers - -labels: -- area/test-and-release diff --git a/vendor/knative.dev/eventing/test/e2e-common.sh b/vendor/knative.dev/eventing/test/e2e-common.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/eventing/test/e2e-conformance-tests.sh b/vendor/knative.dev/eventing/test/e2e-conformance-tests.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/eventing/test/e2e-rekt-tests.sh b/vendor/knative.dev/eventing/test/e2e-rekt-tests.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/eventing/test/e2e-tests.sh b/vendor/knative.dev/eventing/test/e2e-tests.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/eventing/test/e2e-upgrade-tests.sh b/vendor/knative.dev/eventing/test/e2e-upgrade-tests.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/eventing/test/lib/recordevents/resources.go b/vendor/knative.dev/eventing/test/lib/recordevents/resources.go index c02661fd78..c10915dfdf 100644 --- a/vendor/knative.dev/eventing/test/lib/recordevents/resources.go +++ b/vendor/knative.dev/eventing/test/lib/recordevents/resources.go @@ -86,6 +86,10 @@ func recordEventsPod(imageName string, name string, serviceAccountName string, r ObjectMeta: metav1.ObjectMeta{ Name: name, Labels: map[string]string{"e2etest": string(uuid.NewUUID())}, + Annotations: map[string]string{ + "sidecar.istio.io/inject": "true", + "sidecar.istio.io/rewriteAppHTTPProbers": "true", + }, }, Spec: corev1.PodSpec{ Containers: []corev1.Container{{ diff --git a/vendor/knative.dev/eventing/test/microbenchmarks-compare.sh b/vendor/knative.dev/eventing/test/microbenchmarks-compare.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/eventing/test/microbenchmarks-run.sh b/vendor/knative.dev/eventing/test/microbenchmarks-run.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/eventing/test/presubmit-tests.sh b/vendor/knative.dev/eventing/test/presubmit-tests.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/eventing/test/upload-test-images.sh b/vendor/knative.dev/eventing/test/upload-test-images.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/hack/OWNERS b/vendor/knative.dev/hack/OWNERS deleted file mode 100644 index 4d20bf8cff..0000000000 --- a/vendor/knative.dev/hack/OWNERS +++ /dev/null @@ -1,8 +0,0 @@ -approvers: - - technical-oversight-committee - - productivity-writers - - knative-release-leads - -reviewers: - - productivity-writers - - productivity-reviewers diff --git a/vendor/knative.dev/hack/OWNERS_ALIASES b/vendor/knative.dev/hack/OWNERS_ALIASES deleted file mode 100644 index 3cd6aae205..0000000000 --- a/vendor/knative.dev/hack/OWNERS_ALIASES +++ /dev/null @@ -1,143 +0,0 @@ -# This file is auto-generated from peribolos. -# Do not modify this file, instead modify peribolos/knative.yaml - -aliases: - client-reviewers: - - itsmurugappan - client-wg-leads: - - dsimansk - - rhuss - client-writers: - - dsimansk - - rhuss - - vyasgun - docs-reviewers: - - nainaz - - retocode - - skonto - docs-writers: - - csantanapr - - retocode - - skonto - eventing-reviewers: - - Leo6Leo - - aslom - - cali0707 - - creydr - eventing-wg-leads: - - pierDipi - eventing-writers: - - Leo6Leo - - aliok - - cali0707 - - creydr - - lionelvillard - - matzew - - pierDipi - func-reviewers: - - jrangelramos - - nainaz - func-writers: - - gauron99 - - jrangelramos - - lance - - lkingland - - matejvasek - - matzew - - salaboy - functions-wg-leads: - - lkingland - - salaboy - knative-admin: - - aliok - - cardil - - davidhadas - - dprotaso - - dsimansk - - evankanderson - - knative-automation - - knative-prow-releaser-robot - - knative-prow-robot - - knative-prow-updater-robot - - knative-test-reporter-robot - - nainaz - - psschwei - - retocode - - salaboy - - skonto - - upodroid - knative-release-leads: - - dsimansk - - retocode - - skonto - knative-robots: - - knative-automation - - knative-prow-releaser-robot - - knative-prow-robot - - knative-prow-updater-robot - - knative-test-reporter-robot - operations-reviewers: - - aliok - - houshengbo - - matzew - operations-wg-leads: - - houshengbo - operations-writers: - - aliok - - houshengbo - - matzew - productivity-leads: - - cardil - - upodroid - productivity-reviewers: - - evankanderson - - mgencur - productivity-wg-leads: - - cardil - - upodroid - productivity-writers: - - cardil - - upodroid - security-wg-leads: - - davidhadas - - evankanderson - security-writers: - - davidhadas - - evankanderson - serving-approvers: - - ReToCode - - skonto - serving-reviewers: - - izabelacg - - retocode - - skonto - serving-triage: - - izabelacg - - retocode - - skonto - serving-wg-leads: - - dprotaso - serving-writers: - - ReToCode - - dprotaso - - skonto - steering-committee: - - aliok - - evankanderson - - nainaz - - salaboy - technical-oversight-committee: - - davidhadas - - dprotaso - - dsimansk - - psschwei - ux-wg-leads: - - cali0707 - - leo6leo - - mmejia02 - - zainabhusain227 - ux-writers: - - cali0707 - - leo6leo - - mmejia02 - - zainabhusain227 diff --git a/vendor/knative.dev/hack/codegen-library.sh b/vendor/knative.dev/hack/codegen-library.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/hack/e2e-tests.sh b/vendor/knative.dev/hack/e2e-tests.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/hack/infra-library.sh b/vendor/knative.dev/hack/infra-library.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/hack/library.sh b/vendor/knative.dev/hack/library.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/hack/microbenchmarks.sh b/vendor/knative.dev/hack/microbenchmarks.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/hack/performance-tests.sh b/vendor/knative.dev/hack/performance-tests.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/hack/presubmit-tests.sh b/vendor/knative.dev/hack/presubmit-tests.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/hack/release.sh b/vendor/knative.dev/hack/release.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/hack/shellcheck-presubmit.sh b/vendor/knative.dev/hack/shellcheck-presubmit.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/operator/pkg/apis/operator/v1beta1/knativeeventing_lifecycle.go b/vendor/knative.dev/operator/pkg/apis/operator/v1beta1/knativeeventing_lifecycle.go index daac20f306..0dc8acd171 100644 --- a/vendor/knative.dev/operator/pkg/apis/operator/v1beta1/knativeeventing_lifecycle.go +++ b/vendor/knative.dev/operator/pkg/apis/operator/v1beta1/knativeeventing_lifecycle.go @@ -17,6 +17,7 @@ limitations under the License. package v1beta1 import ( + "os" "strings" "k8s.io/apimachinery/pkg/runtime/schema" @@ -132,7 +133,7 @@ func (es *KnativeEventingStatus) GetVersion() string { // SetVersion sets the currently installed version of the component. func (es *KnativeEventingStatus) SetVersion(version string) { - es.Version = version + es.Version = os.Getenv("KNATIVE_EVENTING_VERSION") } // GetManifests gets the url links of the manifests. diff --git a/vendor/knative.dev/operator/pkg/apis/operator/v1beta1/knativeserving_lifecycle.go b/vendor/knative.dev/operator/pkg/apis/operator/v1beta1/knativeserving_lifecycle.go index e59ab4c8dc..eb064a50e9 100644 --- a/vendor/knative.dev/operator/pkg/apis/operator/v1beta1/knativeserving_lifecycle.go +++ b/vendor/knative.dev/operator/pkg/apis/operator/v1beta1/knativeserving_lifecycle.go @@ -17,6 +17,7 @@ limitations under the License. package v1beta1 import ( + "os" "strings" "knative.dev/operator/pkg/apis/operator" @@ -132,7 +133,7 @@ func (is *KnativeServingStatus) GetVersion() string { // SetVersion sets the currently installed version of the component. func (is *KnativeServingStatus) SetVersion(version string) { - is.Version = version + is.Version = os.Getenv("KNATIVE_SERVING_VERSION") } // GetManifests gets the url links of the manifests. diff --git a/vendor/knative.dev/operator/pkg/reconciler/common/job.go b/vendor/knative.dev/operator/pkg/reconciler/common/job.go index 240d33f866..7542e92c34 100644 --- a/vendor/knative.dev/operator/pkg/reconciler/common/job.go +++ b/vendor/knative.dev/operator/pkg/reconciler/common/job.go @@ -40,7 +40,7 @@ func JobTransform(obj base.KComponent) mf.Transformer { component := "serving" if _, ok := obj.(*v1beta1.KnativeEventing); ok { - component = "eventing" + component = "" } if job.GetName() == "" { job.SetName(fmt.Sprintf("%s%s-%s", job.GetGenerateName(), component, TargetVersion(obj))) diff --git a/vendor/knative.dev/operator/pkg/reconciler/common/releases.go b/vendor/knative.dev/operator/pkg/reconciler/common/releases.go index 2e190d2886..ab42cb4535 100644 --- a/vendor/knative.dev/operator/pkg/reconciler/common/releases.go +++ b/vendor/knative.dev/operator/pkg/reconciler/common/releases.go @@ -195,18 +195,20 @@ func getManifestWithVersionValidation(manifestsPath string, instance base.KCompo return manifests, nil } - targetVersion := SanitizeSemver(version) - key := "app.kubernetes.io/version" - for _, u := range manifests.Resources() { - // Check the labels of the resources one by one to see if the version matches the target version in terms of - // major.minor. - manifestVersion := u.GetLabels()[key] - manifestVersionSan := SanitizeSemver(u.GetLabels()[key]) - if manifestVersion != "" && semver.MajorMinor(targetVersion) != semver.MajorMinor(manifestVersionSan) { - return mf.Manifest{}, fmt.Errorf("the version of the manifests %s of the component %s does not match the target "+ - "version of the operator CR %s", manifestVersionSan, u.GetName(), targetVersion) - } - } + // We support only one version, there is no need to check manifest consistency and it is actually a pain to experiment + // with future releases. + // + //targetVersion := SanitizeSemver(version) + //key := getVersionKey(instance) + //for _, u := range manifests.Resources() { + // // Check the labels of the resources one by one to see if the version matches the target version in terms of + // // major.minor. + // manifestVersion := u.GetLabels()[key] + // if manifestVersion != "" && semver.MajorMinor(targetVersion) != semver.MajorMinor(manifestVersion) { + // return mf.Manifest{}, fmt.Errorf("the version of the manifests %s of the component %s does not match the target "+ + // "version of the operator CR %s", manifestVersion, u.GetName(), targetVersion) + // } + //} return manifests, nil } diff --git a/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/controller.go b/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/controller.go index bc1340ebff..24227dd988 100644 --- a/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/controller.go +++ b/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/controller.go @@ -22,6 +22,9 @@ import ( "go.uber.org/zap" "k8s.io/client-go/tools/cache" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + namespaceinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/namespace" + "knative.dev/operator/pkg/apis/operator/v1beta1" operatorclient "knative.dev/operator/pkg/client/injection/client" knativeEventinginformer "knative.dev/operator/pkg/client/injection/informers/operator/v1beta1/knativeeventing" @@ -79,6 +82,23 @@ func NewExtendedController(generator common.ExtensionGenerator) injection.Contro knativeEventingInformer.Informer().AddEventHandler(controller.HandleAll(impl.Enqueue)) + namespaceinformer.Get(ctx).Informer().AddEventHandler(cache.FilteringResourceEventHandler{ + FilterFunc: func(obj interface{}) bool { + ns, ok := obj.(metav1.Object) + if !ok { + return false + } + v, ok := ns.GetLabels()["kubernetes.io/metadata.name"] + if !ok { + return false + } + return v == "knative-eventing" + }, + Handler: controller.HandleAll(func(i interface{}) { + impl.GlobalResync(knativeEventingInformer.Informer()) + }), + }) + deploymentInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{ FilterFunc: controller.FilterControllerGVK(v1beta1.SchemeGroupVersion.WithKind("KnativeEventing")), Handler: controller.HandleAll(impl.EnqueueControllerOf), diff --git a/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/eventing_backstage_plugin.go b/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/eventing_backstage_plugin.go new file mode 100644 index 0000000000..e23d375d67 --- /dev/null +++ b/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/eventing_backstage_plugin.go @@ -0,0 +1,79 @@ +/* +Copyright 2023 The Knative Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package knativeeventing + +import ( + "context" + "fmt" + + mf "github.com/manifestival/manifestival" + corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/meta" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" + "knative.dev/eventing/pkg/apis/feature" + + "knative.dev/operator/pkg/apis/operator/base" + "knative.dev/operator/pkg/apis/operator/v1beta1" +) + +var ( + backstageResourcesPred = byLabel("app.kubernetes.io/component", "eventmesh-backend") +) + +const ( + backstageBackendFeatureFlag = "backstage-backend" +) + +func (r *Reconciler) handleBackstageResources(ctx context.Context, manifests *mf.Manifest, comp base.KComponent) error { + instance := comp.(*v1beta1.KnativeEventing) + + if isBackstageEnabled(instance) { + return nil + } + + // Delete Backstage resources (if present) + toBeDeleted := manifests.Filter(backstageResourcesPred) + if err := toBeDeleted.Delete(mf.IgnoreNotFound(true)); err != nil && !meta.IsNoMatchError(err) { + return fmt.Errorf("failed to delete backstage resources: %v", err) + } + + // Filter out Backstage resources from the final list of manifests + *manifests = manifests.Filter(mf.Not(backstageResourcesPred)) + + return nil +} + +func byLabel(key, value string) mf.Predicate { + return func(u *unstructured.Unstructured) bool { + v, ok := u.GetLabels()[key] + return ok && v == value + } +} + +func isBackstageEnabled(instance *v1beta1.KnativeEventing) bool { + cmData, ok := getFeaturesConfig(instance) + if !ok { + return false + } + + f, err := feature.NewFlagsConfigFromConfigMap(&corev1.ConfigMap{Data: cmData}) + if err != nil { + return false + } + + return f.IsEnabled(backstageBackendFeatureFlag) +} diff --git a/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/knativeeventing.go b/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/knativeeventing.go index cdecea40a7..59bd74dd12 100644 --- a/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/knativeeventing.go +++ b/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/knativeeventing.go @@ -124,10 +124,6 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, ke *v1beta1.KnativeEvent logger.Infow("Reconciling KnativeEventing", "status", ke.Status) - if err := common.IsVersionValidMigrationEligible(ke); err != nil { - ke.Status.MarkVersionMigrationNotEligible(err.Error()) - return nil - } ke.Status.MarkVersionMigrationEligible() if err := r.extension.Reconcile(ctx, ke); err != nil { @@ -138,8 +134,13 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, ke *v1beta1.KnativeEvent source.AppendTargetSources, common.AppendAdditionalManifests, r.appendExtensionManifests, + func(ctx context.Context, manifest *mf.Manifest, component base.KComponent) error { + *manifest = manifest.Filter(mf.Not(mf.All(mf.ByKind("Namespace"), mf.ByName("knative-eventing")))) + return nil + }, r.transform, r.handleTLSResources, + r.handleBackstageResources, manifests.Install, common.CheckDeployments, common.InstallWebhookConfigs, diff --git a/vendor/knative.dev/operator/pkg/reconciler/knativeserving/knativeserving.go b/vendor/knative.dev/operator/pkg/reconciler/knativeserving/knativeserving.go index 6810585b52..d760dfb678 100644 --- a/vendor/knative.dev/operator/pkg/reconciler/knativeserving/knativeserving.go +++ b/vendor/knative.dev/operator/pkg/reconciler/knativeserving/knativeserving.go @@ -19,14 +19,15 @@ package knativeserving import ( "context" "fmt" + "os" - mf "github.com/manifestival/manifestival" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" "knative.dev/pkg/logging" pkgreconciler "knative.dev/pkg/reconciler" - + mf "github.com/manifestival/manifestival" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "knative.dev/operator/pkg/apis/operator/base" "knative.dev/operator/pkg/apis/operator/v1beta1" clientset "knative.dev/operator/pkg/client/clientset/versioned" @@ -90,6 +91,12 @@ func (r *Reconciler) FinalizeKind(ctx context.Context, original *v1beta1.Knative if manifest == nil { return nil } + // we need this to apply the correct namespace to the resources otherwise it defaults to knative-serving + *manifest, err = manifest.Transform(overrideKourierNamespace(original)) + if err != nil { + logger.Error("Unable to apply kourier namespace transform", err) + return nil + } if err := common.Uninstall(manifest); err != nil { logger.Error("Failed to finalize platform resources", err) @@ -97,6 +104,20 @@ func (r *Reconciler) FinalizeKind(ctx context.Context, original *v1beta1.Knative return nil } +func overrideKourierNamespace(ks base.KComponent) mf.Transformer { + if ns, required := os.LookupEnv("REQUIRED_SERVING_INGRESS_NAMESPACE"); required { + nsInjector := mf.InjectNamespace(ns) + return func(u *unstructured.Unstructured) error { + provider := u.GetLabels()["networking.knative.dev/ingress-provider"] + if provider != "kourier" { + return nil + } + return nsInjector(u) + } + } + return nil +} + // ReconcileKind compares the actual state with the desired, and attempts to // converge the two. func (r *Reconciler) ReconcileKind(ctx context.Context, ks *v1beta1.KnativeServing) pkgreconciler.Event { @@ -106,10 +127,6 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, ks *v1beta1.KnativeServi logger.Infow("Reconciling KnativeServing", "status", ks.Status) - if err := common.IsVersionValidMigrationEligible(ks); err != nil { - ks.Status.MarkVersionMigrationNotEligible(err.Error()) - return nil - } ks.Status.MarkVersionMigrationEligible() if err := r.extension.Reconcile(ctx, ks); err != nil { @@ -121,6 +138,10 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, ks *v1beta1.KnativeServi security.AppendTargetSecurity, common.AppendAdditionalManifests, r.appendExtensionManifests, + func(ctx context.Context, manifest *mf.Manifest, component base.KComponent) error { + *manifest = manifest.Filter(mf.Not(mf.All(mf.ByKind("Namespace"), mf.ByName("kourier-system")))) + return nil + }, r.transform, manifests.Install, common.CheckDeployments, diff --git a/vendor/knative.dev/pkg/apis/OWNERS b/vendor/knative.dev/pkg/apis/OWNERS deleted file mode 100644 index 13014203fc..0000000000 --- a/vendor/knative.dev/pkg/apis/OWNERS +++ /dev/null @@ -1,15 +0,0 @@ -# The OWNERS file is used by prow to automatically merge approved PRs. - -approvers: -- technical-oversight-committee -- serving-wg-leads -- eventing-wg-leads - -reviewers: -- serving-writers -- eventing-writers -- eventing-reviewers -- serving-reviewers - -options: - no_parent_owners: true diff --git a/vendor/knative.dev/pkg/apis/duck/OWNERS b/vendor/knative.dev/pkg/apis/duck/OWNERS deleted file mode 100644 index af1eb05dac..0000000000 --- a/vendor/knative.dev/pkg/apis/duck/OWNERS +++ /dev/null @@ -1,8 +0,0 @@ -# The OWNERS file is used by prow to automatically merge approved PRs. - -approvers: -- eventing-wg-leads - -reviewers: -- eventing-reviewers -- eventing-writers diff --git a/vendor/knative.dev/pkg/controller/OWNERS b/vendor/knative.dev/pkg/controller/OWNERS deleted file mode 100644 index 64660c9e35..0000000000 --- a/vendor/knative.dev/pkg/controller/OWNERS +++ /dev/null @@ -1,7 +0,0 @@ -# The OWNERS file is used by prow to automatically merge approved PRs. - -approvers: -- serving-writers - -reviewers: -- serving-reviewers diff --git a/vendor/knative.dev/pkg/environment/client_config.go b/vendor/knative.dev/pkg/environment/client_config.go index 9f1883d236..b4c52ceb85 100644 --- a/vendor/knative.dev/pkg/environment/client_config.go +++ b/vendor/knative.dev/pkg/environment/client_config.go @@ -44,8 +44,10 @@ func (c *ClientConfig) InitFlags(fs *flag.FlagSet) { fs.StringVar(&c.ServerURL, "server", "", "The address of the Kubernetes API server. Overrides any value in kubeconfig. Only required if out-of-cluster.") - fs.StringVar(&c.Kubeconfig, "kubeconfig", os.Getenv("KUBECONFIG"), - "Path to a kubeconfig. Only required if out-of-cluster.") + if fs.Lookup("kubeconfig") == nil { + fs.StringVar(&c.Kubeconfig, "kubeconfig", os.Getenv("KUBECONFIG"), + "Path to a kubeconfig. Only required if out-of-cluster.") + } fs.IntVar(&c.Burst, "kube-api-burst", int(envVarOrDefault("KUBE_API_BURST", 0)), "Maximum burst for throttle.") diff --git a/vendor/knative.dev/pkg/hack/format-code.sh b/vendor/knative.dev/pkg/hack/format-code.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/pkg/hack/generate-knative.sh b/vendor/knative.dev/pkg/hack/generate-knative.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/pkg/hack/update-codegen.sh b/vendor/knative.dev/pkg/hack/update-codegen.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/pkg/hack/update-deps.sh b/vendor/knative.dev/pkg/hack/update-deps.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/pkg/hack/verify-codegen.sh b/vendor/knative.dev/pkg/hack/verify-codegen.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/pkg/reconciler/OWNERS b/vendor/knative.dev/pkg/reconciler/OWNERS deleted file mode 100644 index 136197a303..0000000000 --- a/vendor/knative.dev/pkg/reconciler/OWNERS +++ /dev/null @@ -1,7 +0,0 @@ -# The OWNERS file is used by prow to automatically merge approved PRs. - -approvers: -- serving-writers - -reviewers: -- serving-writers diff --git a/vendor/knative.dev/pkg/resolver/OWNERS b/vendor/knative.dev/pkg/resolver/OWNERS deleted file mode 100644 index b5e9581f4e..0000000000 --- a/vendor/knative.dev/pkg/resolver/OWNERS +++ /dev/null @@ -1,8 +0,0 @@ -# The OWNERS file is used by prow to automatically merge approved PRs. - -approvers: -- eventing-writers - -reviewers: -- eventing-reviewers - diff --git a/vendor/knative.dev/pkg/test/OWNERS b/vendor/knative.dev/pkg/test/OWNERS deleted file mode 100644 index 65aa9e7b11..0000000000 --- a/vendor/knative.dev/pkg/test/OWNERS +++ /dev/null @@ -1,10 +0,0 @@ -# The OWNERS file is used by prow to automatically merge approved PRs. - -approvers: -- productivity-writers - -reviewers: -- productivity-reviewers - -labels: -- area/test-and-release diff --git a/vendor/knative.dev/pkg/test/helpers/name.go b/vendor/knative.dev/pkg/test/helpers/name.go index 18a93f2518..8af880d311 100644 --- a/vendor/knative.dev/pkg/test/helpers/name.go +++ b/vendor/knative.dev/pkg/test/helpers/name.go @@ -27,7 +27,7 @@ import ( const ( letterBytes = "abcdefghijklmnopqrstuvwxyz" randSuffixLen = 8 - nameLengthLimit = 50 + nameLengthLimit = 40 sep = '-' sepS = "-" testNamePrefix = "Test" diff --git a/vendor/knative.dev/pkg/test/presubmit-tests.sh b/vendor/knative.dev/pkg/test/presubmit-tests.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/pkg/test/spoof/openshift_checks.go b/vendor/knative.dev/pkg/test/spoof/openshift_checks.go new file mode 100644 index 0000000000..f7ba08f828 --- /dev/null +++ b/vendor/knative.dev/pkg/test/spoof/openshift_checks.go @@ -0,0 +1,22 @@ +package spoof + +import ( + "fmt" + "net/http" + "strings" +) + +// isUnknownAuthority checks if the error contains "certificate signed by unknown authority". +// This error happens when OpenShift Route starts/changes to use passthrough mode. It takes a little bit time to be synced. +func isUnknownAuthority(err error) bool { + return err != nil && strings.Contains(err.Error(), "certificate signed by unknown authority") +} + +// RetryingRouteInconsistency retries common requests seen when creating a new route +// - 503 to account for Openshift route inconsistency (https://jira.coreos.com/browse/SRVKS-157) +func RouteInconsistencyRetryChecker(resp *Response) (bool, error) { + if resp.StatusCode == http.StatusServiceUnavailable { + return true, fmt.Errorf("retrying route inconsistency request: %s", resp) + } + return false, nil +} diff --git a/vendor/knative.dev/pkg/test/spoof/spoof.go b/vendor/knative.dev/pkg/test/spoof/spoof.go index ac1c23e7dc..2c7c5a8a68 100644 --- a/vendor/knative.dev/pkg/test/spoof/spoof.go +++ b/vendor/knative.dev/pkg/test/spoof/spoof.go @@ -164,7 +164,7 @@ func (sc *SpoofingClient) Do(req *http.Request, errorRetryCheckers ...interface{ // If no retry checkers are specified `DefaultErrorRetryChecker` will be used. func (sc *SpoofingClient) Poll(req *http.Request, inState ResponseChecker, checkers ...interface{}) (*Response, error) { if len(checkers) == 0 { - checkers = []interface{}{ErrorRetryChecker(DefaultErrorRetryChecker), ResponseRetryChecker(DefaultResponseRetryChecker)} + checkers = []interface{}{ErrorRetryChecker(DefaultErrorRetryChecker), ResponseRetryChecker(DefaultResponseRetryChecker), ResponseRetryChecker(RouteInconsistencyRetryChecker)} } var resp *Response @@ -252,6 +252,9 @@ func DefaultErrorRetryChecker(err error) (bool, error) { if isNoRouteToHostError(err) { return true, fmt.Errorf("retrying for 'no route to host' error: %w", err) } + if isUnknownAuthority(err) { + return true, fmt.Errorf("retrying for certificate signed by unknown authority: %w", err) + } return false, err } diff --git a/vendor/knative.dev/pkg/test/test-reconciler-codegen.sh b/vendor/knative.dev/pkg/test/test-reconciler-codegen.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/pkg/test/upgrade/shell/fail-example.sh b/vendor/knative.dev/pkg/test/upgrade/shell/fail-example.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/pkg/webhook/OWNERS b/vendor/knative.dev/pkg/webhook/OWNERS deleted file mode 100644 index 64660c9e35..0000000000 --- a/vendor/knative.dev/pkg/webhook/OWNERS +++ /dev/null @@ -1,7 +0,0 @@ -# The OWNERS file is used by prow to automatically merge approved PRs. - -approvers: -- serving-writers - -reviewers: -- serving-reviewers diff --git a/vendor/knative.dev/pkg/webhook/resourcesemantics/conversion/reconciler.go b/vendor/knative.dev/pkg/webhook/resourcesemantics/conversion/reconciler.go index f23b055872..49568b28a7 100644 --- a/vendor/knative.dev/pkg/webhook/resourcesemantics/conversion/reconciler.go +++ b/vendor/knative.dev/pkg/webhook/resourcesemantics/conversion/reconciler.go @@ -19,6 +19,7 @@ package conversion import ( "context" "fmt" + "os" "go.uber.org/zap" apixv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" @@ -77,6 +78,9 @@ func (r *reconciler) Reconcile(ctx context.Context, key string) error { return err } + if os.Getenv("USE_OLM_TLS") != "" { // olm will do the crd update + return nil + } cacert, ok := secret.Data[certresources.CACert] if !ok { return fmt.Errorf("secret %q is missing %q key", r.secretName, certresources.CACert) diff --git a/vendor/knative.dev/reconciler-test/pkg/feature/feature.go b/vendor/knative.dev/reconciler-test/pkg/feature/feature.go index 7a7d410423..d59ae5e761 100644 --- a/vendor/knative.dev/reconciler-test/pkg/feature/feature.go +++ b/vendor/knative.dev/reconciler-test/pkg/feature/feature.go @@ -252,6 +252,15 @@ func DeleteResources(ctx context.Context, t T, refs []corev1.ObjectReference) er return false, fmt.Errorf("failed to get resource %+v %s/%s: %w", resource, ref.Namespace, ref.Name, err) } + // Repeat deleting service accounts. + // Workaround for https://issues.redhat.com/browse/OCPBUGS-35731 + if resource.Resource == "serviceaccounts" { + err = dc.Resource(resource).Namespace(ref.Namespace).Delete(ctx, ref.Name, metav1.DeleteOptions{}) + if err != nil && !apierrors.IsNotFound(err) { + t.Logf("Warning, failed to delete %s/%s of GVR: %+v: %v", ref.Namespace, ref.Name, resource, err) + } + } + lastResource = ref t.Logf("Resource %+v %s/%s still present", resource, ref.Namespace, ref.Name) return false, nil diff --git a/vendor/knative.dev/serving/test/e2e-common.sh b/vendor/knative.dev/serving/test/e2e-common.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/serving/test/e2e-external-domain-tls-tests.sh b/vendor/knative.dev/serving/test/e2e-external-domain-tls-tests.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/serving/test/e2e-networking-library.sh b/vendor/knative.dev/serving/test/e2e-networking-library.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/serving/test/e2e-tests.sh b/vendor/knative.dev/serving/test/e2e-tests.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/serving/test/e2e-upgrade-tests.sh b/vendor/knative.dev/serving/test/e2e-upgrade-tests.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/serving/test/presubmit-tests.sh b/vendor/knative.dev/serving/test/presubmit-tests.sh old mode 100644 new mode 100755 diff --git a/vendor/knative.dev/serving/test/upload-test-images.sh b/vendor/knative.dev/serving/test/upload-test-images.sh old mode 100644 new mode 100755 diff --git a/vendor/sigs.k8s.io/json/OWNERS b/vendor/sigs.k8s.io/json/OWNERS deleted file mode 100644 index 0fadafbddb..0000000000 --- a/vendor/sigs.k8s.io/json/OWNERS +++ /dev/null @@ -1,6 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -approvers: - - deads2k - - lavalamp - - liggitt diff --git a/vendor/sigs.k8s.io/yaml/OWNERS b/vendor/sigs.k8s.io/yaml/OWNERS deleted file mode 100644 index 003a149e15..0000000000 --- a/vendor/sigs.k8s.io/yaml/OWNERS +++ /dev/null @@ -1,23 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -approvers: -- dims -- jpbetz -- smarterclayton -- deads2k -- sttts -- liggitt -reviewers: -- dims -- thockin -- jpbetz -- smarterclayton -- wojtek-t -- deads2k -- derekwaynecarr -- mikedanese -- liggitt -- sttts -- tallclair -labels: -- sig/api-machinery diff --git a/vendor/sigs.k8s.io/yaml/goyaml.v2/OWNERS b/vendor/sigs.k8s.io/yaml/goyaml.v2/OWNERS deleted file mode 100644 index 73be0a3a9b..0000000000 --- a/vendor/sigs.k8s.io/yaml/goyaml.v2/OWNERS +++ /dev/null @@ -1,24 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -approvers: -- dims -- jpbetz -- smarterclayton -- deads2k -- sttts -- liggitt -- natasha41575 -- knverey -reviewers: -- dims -- thockin -- jpbetz -- smarterclayton -- deads2k -- derekwaynecarr -- mikedanese -- liggitt -- sttts -- tallclair -labels: -- sig/api-machinery