UPSTREAM: <carry>: Merge branch 'master' in rebase

# Conflicts: # vendor/k8s.io/kube-openapi/pkg/builder3/util/BUILD # vendor/k8s.io/kube-openapi/pkg/common/restfuladapter/BUILD # vendor/k8s.io/kube-openapi/pkg/openapiconv/BUILD
openshift · Aug 8, 2022 · 12092a5 · 12092a5
2 parents 93a4ee4 + 9a303b1
commit 12092a5
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 130 deletions.
diff --git a/crd/client/gcpfirewall/informers/externalversions/BUILD b/crd/client/gcpfirewall/informers/externalversions/BUILD
diff --git a/crd/client/gcpfirewall/informers/externalversions/gcpfirewall/v1alpha1/BUILD b/crd/client/gcpfirewall/informers/externalversions/gcpfirewall/v1alpha1/BUILD
diff --git a/crd/client/gcpfirewall/informers/externalversions/internalinterfaces/BUILD b/crd/client/gcpfirewall/informers/externalversions/internalinterfaces/BUILD
diff --git a/crd/client/gcpfirewall/listers/gcpfirewall/v1alpha1/BUILD b/crd/client/gcpfirewall/listers/gcpfirewall/v1alpha1/BUILD
diff --git a/pkg/controller/nodeipam/OWNERS b/pkg/controller/nodeipam/OWNERS
diff --git a/vendor/k8s.io/kube-openapi/pkg/builder3/util/BUILD b/vendor/k8s.io/kube-openapi/pkg/builder3/util/BUILD
diff --git a/vendor/k8s.io/kube-openapi/pkg/common/restfuladapter/BUILD b/vendor/k8s.io/kube-openapi/pkg/common/restfuladapter/BUILD
diff --git a/vendor/k8s.io/kube-openapi/pkg/openapiconv/BUILD b/vendor/k8s.io/kube-openapi/pkg/openapiconv/BUILD