From e3a4c1049ad4494beab4998d6d097343a337005c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Sep 2025 22:21:46 +0000 Subject: [PATCH 1/2] [release-1.36][gomod]: Bump github.com/google/go-cmp from 0.6.0 to 0.7.0 Bumps [github.com/google/go-cmp](https://github.com/google/go-cmp) from 0.6.0 to 0.7.0. - [Release notes](https://github.com/google/go-cmp/releases) - [Commits](https://github.com/google/go-cmp/compare/v0.6.0...v0.7.0) --- updated-dependencies: - dependency-name: github.com/google/go-cmp dependency-version: 0.7.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 3 +- 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 .../google/go-cmp/cmp/cmpopts/sort.go | 64 +++++--- .../go-cmp/cmp/internal/function/func.go | 7 + .../github.com/google/go-cmp/cmp/options.go | 10 +- .../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/modules.txt | 4 +- vendor/sigs.k8s.io/json/OWNERS | 6 + vendor/sigs.k8s.io/yaml/OWNERS | 23 +++ vendor/sigs.k8s.io/yaml/goyaml.v2/OWNERS | 24 +++ 121 files changed, 817 insertions(+), 232 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 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..e7a6204323 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23.0 require ( github.com/blang/semver/v4 v4.0.0 github.com/coreos/go-semver v0.3.1 - github.com/google/go-cmp v0.6.0 + github.com/google/go-cmp v0.7.0 github.com/jaegertracing/jaeger v1.62.0 github.com/manifestival/controller-runtime-client v0.4.0 github.com/manifestival/manifestival v0.7.2 diff --git a/go.sum b/go.sum index be5aa571b1..ea5c91bb20 100644 --- a/go.sum +++ b/go.sum @@ -1081,8 +1081,9 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/go-containerregistry v0.19.2 h1:TannFKE1QSajsP6hPWb5oJNgKe1IKjHukIKDUmvsV6w= github.com/google/go-containerregistry v0.19.2/go.mod h1:YCMFNQeeXeLF+dnhhWkqDItx/JSkH01j1Kis4PsjzFI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= 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/google/go-cmp/cmp/cmpopts/sort.go b/vendor/github.com/google/go-cmp/cmp/cmpopts/sort.go index c6d09dae40..720f3cdf57 100644 --- a/vendor/github.com/google/go-cmp/cmp/cmpopts/sort.go +++ b/vendor/github.com/google/go-cmp/cmp/cmpopts/sort.go @@ -14,22 +14,29 @@ import ( ) // SortSlices returns a [cmp.Transformer] option that sorts all []V. -// The less function must be of the form "func(T, T) bool" which is used to -// sort any slice with element type V that is assignable to T. +// The lessOrCompareFunc function must be either +// a less function of the form "func(T, T) bool" or +// a compare function of the format "func(T, T) int" +// which is used to sort any slice with element type V that is assignable to T. // -// The less function must be: +// A less function must be: // - Deterministic: less(x, y) == less(x, y) // - Irreflexive: !less(x, x) // - Transitive: if !less(x, y) and !less(y, z), then !less(x, z) // -// The less function does not have to be "total". That is, if !less(x, y) and -// !less(y, x) for two elements x and y, their relative order is maintained. +// A compare function must be: +// - Deterministic: compare(x, y) == compare(x, y) +// - Irreflexive: compare(x, x) == 0 +// - Transitive: if !less(x, y) and !less(y, z), then !less(x, z) +// +// The function does not have to be "total". That is, if x != y, but +// less or compare report inequality, their relative order is maintained. // // SortSlices can be used in conjunction with [EquateEmpty]. -func SortSlices(lessFunc interface{}) cmp.Option { - vf := reflect.ValueOf(lessFunc) - if !function.IsType(vf.Type(), function.Less) || vf.IsNil() { - panic(fmt.Sprintf("invalid less function: %T", lessFunc)) +func SortSlices(lessOrCompareFunc interface{}) cmp.Option { + vf := reflect.ValueOf(lessOrCompareFunc) + if (!function.IsType(vf.Type(), function.Less) && !function.IsType(vf.Type(), function.Compare)) || vf.IsNil() { + panic(fmt.Sprintf("invalid less or compare function: %T", lessOrCompareFunc)) } ss := sliceSorter{vf.Type().In(0), vf} return cmp.FilterValues(ss.filter, cmp.Transformer("cmpopts.SortSlices", ss.sort)) @@ -79,28 +86,40 @@ func (ss sliceSorter) checkSort(v reflect.Value) { } func (ss sliceSorter) less(v reflect.Value, i, j int) bool { vx, vy := v.Index(i), v.Index(j) - return ss.fnc.Call([]reflect.Value{vx, vy})[0].Bool() + vo := ss.fnc.Call([]reflect.Value{vx, vy})[0] + if vo.Kind() == reflect.Bool { + return vo.Bool() + } else { + return vo.Int() < 0 + } } -// SortMaps returns a [cmp.Transformer] option that flattens map[K]V types to be a -// sorted []struct{K, V}. The less function must be of the form -// "func(T, T) bool" which is used to sort any map with key K that is -// assignable to T. +// SortMaps returns a [cmp.Transformer] option that flattens map[K]V types to be +// a sorted []struct{K, V}. The lessOrCompareFunc function must be either +// a less function of the form "func(T, T) bool" or +// a compare function of the format "func(T, T) int" +// which is used to sort any map with key K that is assignable to T. // // Flattening the map into a slice has the property that [cmp.Equal] is able to // use [cmp.Comparer] options on K or the K.Equal method if it exists. // -// The less function must be: +// A less function must be: // - Deterministic: less(x, y) == less(x, y) // - Irreflexive: !less(x, x) // - Transitive: if !less(x, y) and !less(y, z), then !less(x, z) // - Total: if x != y, then either less(x, y) or less(y, x) // +// A compare function must be: +// - Deterministic: compare(x, y) == compare(x, y) +// - Irreflexive: compare(x, x) == 0 +// - Transitive: if compare(x, y) < 0 and compare(y, z) < 0, then compare(x, z) < 0 +// - Total: if x != y, then compare(x, y) != 0 +// // SortMaps can be used in conjunction with [EquateEmpty]. -func SortMaps(lessFunc interface{}) cmp.Option { - vf := reflect.ValueOf(lessFunc) - if !function.IsType(vf.Type(), function.Less) || vf.IsNil() { - panic(fmt.Sprintf("invalid less function: %T", lessFunc)) +func SortMaps(lessOrCompareFunc interface{}) cmp.Option { + vf := reflect.ValueOf(lessOrCompareFunc) + if (!function.IsType(vf.Type(), function.Less) && !function.IsType(vf.Type(), function.Compare)) || vf.IsNil() { + panic(fmt.Sprintf("invalid less or compare function: %T", lessOrCompareFunc)) } ms := mapSorter{vf.Type().In(0), vf} return cmp.FilterValues(ms.filter, cmp.Transformer("cmpopts.SortMaps", ms.sort)) @@ -143,5 +162,10 @@ func (ms mapSorter) checkSort(v reflect.Value) { } func (ms mapSorter) less(v reflect.Value, i, j int) bool { vx, vy := v.Index(i).Field(0), v.Index(j).Field(0) - return ms.fnc.Call([]reflect.Value{vx, vy})[0].Bool() + vo := ms.fnc.Call([]reflect.Value{vx, vy})[0] + if vo.Kind() == reflect.Bool { + return vo.Bool() + } else { + return vo.Int() < 0 + } } diff --git a/vendor/github.com/google/go-cmp/cmp/internal/function/func.go b/vendor/github.com/google/go-cmp/cmp/internal/function/func.go index d127d43623..def01a6be3 100644 --- a/vendor/github.com/google/go-cmp/cmp/internal/function/func.go +++ b/vendor/github.com/google/go-cmp/cmp/internal/function/func.go @@ -19,6 +19,7 @@ const ( tbFunc // func(T) bool ttbFunc // func(T, T) bool + ttiFunc // func(T, T) int trbFunc // func(T, R) bool tibFunc // func(T, I) bool trFunc // func(T) R @@ -28,11 +29,13 @@ const ( Transformer = trFunc // func(T) R ValueFilter = ttbFunc // func(T, T) bool Less = ttbFunc // func(T, T) bool + Compare = ttiFunc // func(T, T) int ValuePredicate = tbFunc // func(T) bool KeyValuePredicate = trbFunc // func(T, R) bool ) var boolType = reflect.TypeOf(true) +var intType = reflect.TypeOf(0) // IsType reports whether the reflect.Type is of the specified function type. func IsType(t reflect.Type, ft funcType) bool { @@ -49,6 +52,10 @@ func IsType(t reflect.Type, ft funcType) bool { if ni == 2 && no == 1 && t.In(0) == t.In(1) && t.Out(0) == boolType { return true } + case ttiFunc: // func(T, T) int + if ni == 2 && no == 1 && t.In(0) == t.In(1) && t.Out(0) == intType { + return true + } case trbFunc: // func(T, R) bool if ni == 2 && no == 1 && t.Out(0) == boolType { return true diff --git a/vendor/github.com/google/go-cmp/cmp/options.go b/vendor/github.com/google/go-cmp/cmp/options.go index 754496f3b3..ba3fce81ff 100644 --- a/vendor/github.com/google/go-cmp/cmp/options.go +++ b/vendor/github.com/google/go-cmp/cmp/options.go @@ -232,7 +232,15 @@ func (validator) apply(s *state, vx, vy reflect.Value) { if t := s.curPath.Index(-2).Type(); t.Name() != "" { // Named type with unexported fields. name = fmt.Sprintf("%q.%v", t.PkgPath(), t.Name()) // e.g., "path/to/package".MyType - if _, ok := reflect.New(t).Interface().(error); ok { + isProtoMessage := func(t reflect.Type) bool { + m, ok := reflect.PointerTo(t).MethodByName("ProtoReflect") + return ok && m.Type.NumIn() == 1 && m.Type.NumOut() == 1 && + m.Type.Out(0).PkgPath() == "google.golang.org/protobuf/reflect/protoreflect" && + m.Type.Out(0).Name() == "Message" + } + if isProtoMessage(t) { + help = `consider using "google.golang.org/protobuf/testing/protocmp".Transform to compare proto.Message types` + } else if _, ok := reflect.New(t).Interface().(error); ok { help = "consider using cmpopts.EquateErrors to compare error values" } else if t.Comparable() { help = "consider using cmpopts.EquateComparable to compare comparable Go types" 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/go.uber.org/zap/checklicense.sh b/vendor/go.uber.org/zap/checklicense.sh old mode 100755 new mode 100644 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..4322dc227d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -163,8 +163,8 @@ github.com/google/gnostic-models/extensions github.com/google/gnostic-models/jsonschema github.com/google/gnostic-models/openapiv2 github.com/google/gnostic-models/openapiv3 -# github.com/google/go-cmp v0.6.0 -## explicit; go 1.13 +# github.com/google/go-cmp v0.7.0 +## explicit; go 1.21 github.com/google/go-cmp/cmp github.com/google/go-cmp/cmp/cmpopts github.com/google/go-cmp/cmp/internal/diff 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 8df8e095ef2e2b87d92d71a3e93a19980f899f4e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 22 Sep 2025 22:47:48 +0000 Subject: [PATCH 2/2] Run make generated-files --- 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 --- 115 files changed, 207 insertions(+), 752 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/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