diff --git a/docs/contributor/rebase.md b/docs/contributor/rebase.md index acf7d23bc8..603d909261 100644 --- a/docs/contributor/rebase.md +++ b/docs/contributor/rebase.md @@ -304,12 +304,12 @@ To reduce a need of Pull Request synchronization between repositories, keep logi Rebase procedure expects references to AMD64 and ARM64 OpenShift release images, and LVM Storage (LVMS) Operator bundle image. OpenShift release images can be obtained from Release Status pages: [AMD64](https://amd64.ocp.releases.ci.openshift.org/) and [ARM64](https://arm64.ocp.releases.ci.openshift.org/) - navigate to section with nightly image builds for version that is currently worked on and pick latest approved for both architectures. -LVMS Operator bundle image can be obtained from [Red Hat's catalog](https://catalog.redhat.com/software/containers/lvms4/lvms-operator-bundle/63972de4d8764b33ec4dbf79) - tag can be just appended to following URI: `registry.access.redhat.com/lvms4/lvms-operator-bundle:`. +LVMS Operator bundle image can be obtained from [Red Hat's catalog](https://catalog.redhat.com/software/containers/lvms4/lvms-operator-bundle/63972de4d8764b33ec4dbf79) - tag can be just appended to following URI: `registry.redhat.io/lvms4/lvms-operator-bundle:`. These references are passed to `rebase.py` using `AMD64_RELEASE`, `ARM64_RELEASE`, and `LVMS_RELEASE` environment variables, for example: ``` AMD64_RELEASE=registry.ci.openshift.org/ocp/release:4.13.0-0.nightly-2023-01-27-165107 \ ARM64_RELEASE=registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-01-30-010253 \ -LVMS_RELEASE=registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12 \ +LVMS_RELEASE=registry.redhat.io/lvms4/lvms-operator-bundle:v4.12 \ ./scripts/auto-rebase/rebase.py ``` @@ -329,7 +329,7 @@ DRY_RUN=y \ REPO=microshift \ AMD64_RELEASE=registry.ci.openshift.org/ocp/release:4.13.0-0.nightly-2023-01-27-165107 \ ARM64_RELEASE=registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-01-30-010253 \ -LVMS_RELEASE=registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12 \ +LVMS_RELEASE=registry.redhat.io/lvms4/lvms-operator-bundle:v4.12 \ ./scripts/auto-rebase/rebase.py ``` @@ -342,7 +342,7 @@ ORG=USER_NAME \ REPO=microshift \ AMD64_RELEASE=registry.ci.openshift.org/ocp/release:4.13.0-0.nightly-2023-01-27-165107 \ ARM64_RELEASE=registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-01-30-010253 \ -LVMS_RELEASE=registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12 \ +LVMS_RELEASE=registry.redhat.io/lvms4/lvms-operator-bundle:v4.12 \ ./scripts/auto-rebase/rebase.py ``` diff --git a/etcd/go.sum b/etcd/go.sum index 2e771fa331..a906a53686 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -103,9 +103,6 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= @@ -118,7 +115,6 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 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= @@ -424,8 +420,6 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/etcd/vendor/github.com/openshift/microshift/pkg/config/ingress.go b/etcd/vendor/github.com/openshift/microshift/pkg/config/ingress.go index 3f57f9e8b4..c2bd853939 100644 --- a/etcd/vendor/github.com/openshift/microshift/pkg/config/ingress.go +++ b/etcd/vendor/github.com/openshift/microshift/pkg/config/ingress.go @@ -14,6 +14,16 @@ type IngressConfig struct { } type RouteAdmissionPolicy struct { + // Describes how host name claims across namespaces should be handled. + // + // Value must be one of: + // + // - Strict: Do not allow routes in different namespaces to claim the same host. + // + // - InterNamespaceAllowed: Allow routes to claim different paths of the same + // host name across namespaces. + // + // If empty, the default is InterNamespaceAllowed. // +kubebuilder:default="InterNamespaceAllowed" NamespaceOwnership NamespaceOwnershipEnum `json:"namespaceOwnership"` } diff --git a/go.sum b/go.sum index b14e95fadb..5a156572d7 100644 --- a/go.sum +++ b/go.sum @@ -310,8 +310,6 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 311549f769..e69de29bb2 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,26 +0,0 @@ -- cluster-kube-controller-manager-operator embedded-component 5a8a98f06fe9d3ff9f26e2657db5bf5a68112147 to 8dc397b7116673916fa5ba35f63fbeed4154aaad - - 2b2d74c 2024-03-08T13:26:56+01:00 bump(google.golang.org/protobuf)=v1.33.0 - -- cluster-kube-scheduler-operator embedded-component 81808652c748a608f54435f186833e74e6b9cf30 to 4be4e433eec566df60d6d89f09a13b706e93f2a3 - - 89204f6 2024-03-08T13:21:22+01:00 bump(google.golang.org/protobuf)=v1.33.0 - -- cluster-openshift-controller-manager-operator embedded-component d97bdefe3d5c1cb83d63f732fd35732a83ba7708 to 3b30d5f79b4de6d1603dc01373a85309f1e96b76 - - 385fe61 2024-03-11T14:55:20-04:00 BUILD-854: Add adambkaplan as approver - -- cluster-policy-controller embedded-component 7ed07d5ee710a3c450f2134f41030f59c48c5176 to eaea543f4c845a7b65705f12e162cc121bb12f88 - - 5dfdaa3 2024-03-08T13:29:54+01:00 bump(google.golang.org/protobuf)=v1.33.0 - -- machine-config-operator embedded-component a07395300232d2dd00fd86dca0a14068f0d8cdc2 to 562ef07a9e102dcfaaba8114ca41f1ae02eea9df - - c1553d76 2024-03-12T10:38:17+00:00 Add temporary nolint for unused FG params - - 4680a9c5 2024-03-11T16:59:12+00:00 Unwind feature gates from template controller - - 249d1ab8 2024-03-04T10:50:11+01:00 Sync CRI-O owners - - b4d57760 2024-02-29T11:19:48+00:00 Remove cloudConfigFlag from Kubelet Definitions - - 1c389d37 2024-02-29T11:16:45+00:00 Remove reliance on feature gate from cloud provider flags - - 1ff7e3b3 2024-02-29T11:03:57+00:00 Update library-go - -- openshift-controller-manager embedded-component 3369227f301f7bc98e3f364c9bfb6fff788302d6 to 9b5d8e82451da3a0128be1c8fad2742a9764868a - - 94ee6d9 2024-03-11T14:51:23-04:00 BUILD-854: Add adambkaplan as approver - -- oc image-amd64 45fe5d4c22dc44b82f7d8bc556759e9769fe61c6 to c92b50721e5b12fc1edb6cd4cb2390d8622d1f1e - - b0226705 2024-03-11T16:16:30+01:00 tools: extend the image with sosreport - diff --git a/scripts/auto-rebase/last_lvms_rebase.sh b/scripts/auto-rebase/last_lvms_rebase.sh index 166c3cd608..816765c828 100755 --- a/scripts/auto-rebase/last_lvms_rebase.sh +++ b/scripts/auto-rebase/last_lvms_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase-lvms.sh to "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.15.0" +./scripts/auto-rebase/rebase-lvms.sh to "registry.redhat.io/lvms4/lvms-operator-bundle:v4.15.0" diff --git a/scripts/auto-rebase/rebase_job_entrypoint.sh b/scripts/auto-rebase/rebase_job_entrypoint.sh index 2680dd992f..dde1eda8fb 100755 --- a/scripts/auto-rebase/rebase_job_entrypoint.sh +++ b/scripts/auto-rebase/rebase_job_entrypoint.sh @@ -13,7 +13,7 @@ if [[ "$JOB_NAME" == rehearse* ]]; then export DRY_RUN=y fi -cp /secrets/ci-pull-secret/.dockercfg "$HOME/.pull-secret.json" || { +cp /secrets/import-secret/.dockercfg "$HOME/.pull-secret.json" || { echo "WARN: Could not copy registry secret file" } @@ -41,12 +41,12 @@ ARM64_RELEASE=${pullspec_release_arm64} \ # For example, ocp-release at 4.13 will more often than not # correspond to 4.12 LVMS, until the official 4.13 release when both # components will be 4.13. -release_lvms="v4.14.1-4" +release_lvms="v4.15.0" # Since LVMS is not part of the release payload, it is not kept in # CI. Use the latest z-stream that coincides with the release # payload's X.Y version -pullspec_release_lvms="registry.access.redhat.com/lvms4/lvms-operator-bundle:${release_lvms}" +pullspec_release_lvms="registry.redhat.io/lvms4/lvms-operator-bundle:${release_lvms}" ./scripts/auto-rebase/rebase-lvms.sh to "${pullspec_release_lvms}"