diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index aac063a185..79605f505f 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-arm64-2024-10-29-201653 +OCP_VERSION := 4.18.0-0.nightly-arm64-2024-10-30-201653 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index f4b11d8b14..870f7ab3ff 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-2024-10-29-112337 +OCP_VERSION := 4.18.0-0.nightly-2024-10-30-122220 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 7a63c440c8..c695365f97 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2024-10-29-201653" + "base": "4.18.0-0.nightly-arm64-2024-10-30-201653" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fed16f6fca30c2bdf59dffe7d02110be21ded32eabe2b1d96220d3838c0857fd", diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 1a4d4e375b..4a29235bd3 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.18.0-0.nightly-2024-10-29-112337" + "base": "4.18.0-0.nightly-2024-10-30-122220" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6a863d5beff574d72bdcd1c48e6a441d875f878eaca203dd3702988293e7024", diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 3e3e16f8cf..6b953df4e4 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:c9ba1593974f3cb0bda5a5f0dccdc945bfb4d1b2f2e083fbd2c9c218b362faa8 + digest: sha256:8cff3c3b3b6215f20200363e15521d5e7f8d054687d1ab0d4b0586f14159e30d - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:3cc4e3929f9d5511278ac38222cc746aa95bc4125d3b4e922ad68e17d02c5b79 + digest: sha256:41de8a6a302b713a3d56c44e53559b626a69b82cf9508444ca7c2075432562b1 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:84a89ae2513ce7969f0afb7d4f2ce754cd81ab2c1e0bb4d5674bc4c8f3cc9beb @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3cc4e3929f9d5511278ac38222cc746aa95bc4125d3b4e922ad68e17d02c5b79 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:41de8a6a302b713a3d56c44e53559b626a69b82cf9508444ca7c2075432562b1 - op: add path: /spec/template/spec/containers/0/env/- value: name: OLM_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c9ba1593974f3cb0bda5a5f0dccdc945bfb4d1b2f2e083fbd2c9c218b362faa8 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8cff3c3b3b6215f20200363e15521d5e7f8d054687d1ab0d4b0586f14159e30d target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index a66cabaa3b..0bf7af37fe 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:5f0cc99ac3d3c81850433ba2b887eb0f3e6f677ee16b428e66619f5f94384306 + digest: sha256:3f8242f977f72e3b517bb75547b8d0b786c12494388f1e7a57c5a64508aba16c - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:0b756dce01df14be40d5946a02b94e8ca06d2b901ef22634504113d36962fde4 + digest: sha256:72c5ef8bd769afe6e70cb29097e1697da8738c872e3344640a870fdecb548927 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:4c0c2e423c4481a1e5ecd844aa6a62c3ee3f26edb40642056d802a14d2fd46f6 @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b756dce01df14be40d5946a02b94e8ca06d2b901ef22634504113d36962fde4 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:72c5ef8bd769afe6e70cb29097e1697da8738c872e3344640a870fdecb548927 - op: add path: /spec/template/spec/containers/0/env/- value: name: OLM_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5f0cc99ac3d3c81850433ba2b887eb0f3e6f677ee16b428e66619f5f94384306 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f8242f977f72e3b517bb75547b8d0b786c12494388f1e7a57c5a64508aba16c target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index fad6035dea..6bcdce7780 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2024-10-29-201653" + "base": "4.18.0-0.nightly-arm64-2024-10-30-201653" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c9ba1593974f3cb0bda5a5f0dccdc945bfb4d1b2f2e083fbd2c9c218b362faa8", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3cc4e3929f9d5511278ac38222cc746aa95bc4125d3b4e922ad68e17d02c5b79", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8cff3c3b3b6215f20200363e15521d5e7f8d054687d1ab0d4b0586f14159e30d", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:41de8a6a302b713a3d56c44e53559b626a69b82cf9508444ca7c2075432562b1", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84a89ae2513ce7969f0afb7d4f2ce754cd81ab2c1e0bb4d5674bc4c8f3cc9beb" } } diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json index af75e5ab38..3095c4862e 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.18.0-0.nightly-2024-10-29-112337" + "base": "4.18.0-0.nightly-2024-10-30-122220" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5f0cc99ac3d3c81850433ba2b887eb0f3e6f677ee16b428e66619f5f94384306", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b756dce01df14be40d5946a02b94e8ca06d2b901ef22634504113d36962fde4", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f8242f977f72e3b517bb75547b8d0b786c12494388f1e7a57c5a64508aba16c", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:72c5ef8bd769afe6e70cb29097e1697da8738c872e3344640a870fdecb548927", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c0c2e423c4481a1e5ecd844aa6a62c3ee3f26edb40642056d802a14d2fd46f6" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 9a7ab219f8..e669365f12 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2024-10-29-201653" + "base": "4.18.0-0.nightly-arm64-2024-10-30-201653" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:19dd81d38f155b0c9f8bd1d59d915732a015ab8a31d9aea8c918569243e663ac", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 88da91046c..d378168966 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.18.0-0.nightly-2024-10-29-112337" + "base": "4.18.0-0.nightly-2024-10-30-122220" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2ede13f4cb8f6c3633e6ed25598f676a88a249c6b596ea73acba6d78c0a25815", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:66080fa737cf46146d371f7fd140e16321bda206760627a37eb2de92c94278cb", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f4a1372b849882dd2da0127cbd5068a4e3076db82ca9ae641b9b7189d3dcc8b5", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ae743b405c52cc8589d838efd88c32bc4d8f8a442a88e47b7dd2e57f7443e59", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c0c2e423c4481a1e5ecd844aa6a62c3ee3f26edb40642056d802a14d2fd46f6", diff --git a/etcd/go.mod b/etcd/go.mod index accd48d119..5070c322fd 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -145,12 +145,12 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240806135314-3946b2b7b2a8 // from kubernetes - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241002015939-fd65559cbf04 // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241002015939-fd65559cbf04 // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241002015939-fd65559cbf04 // from etcd - go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241002015939-fd65559cbf04 // from etcd - go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241002015939-fd65559cbf04 // from etcd - go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241002015939-fd65559cbf04 // from etcd + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241029125623-825fc46f2c1b // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241029125623-825fc46f2c1b // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241029125623-825fc46f2c1b // from etcd + go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241029125623-825fc46f2c1b // from etcd + go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241029125623-825fc46f2c1b // from etcd + go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241029125623-825fc46f2c1b // from etcd k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241025232031-7ca9eb1e9e5c // staging kubernetes k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241025232031-7ca9eb1e9e5c // staging kubernetes k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241025232031-7ca9eb1e9e5c // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index 8cf917c3ef..3387b7aaa1 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -178,18 +178,18 @@ github.com/openshift/api v0.0.0-20241004095111-b1f700bdd8d2 h1:wCRdyt+nHnJsfuLMJ github.com/openshift/api v0.0.0-20241004095111-b1f700bdd8d2/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo= github.com/openshift/build-machinery-go v0.0.0-20240910153727-5725581bdf8f h1:JMEDso3xFUIDULgFJmcrTfyPpigF3NyyaP07Yy8tHmI= github.com/openshift/build-machinery-go v0.0.0-20240910153727-5725581bdf8f/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE= -github.com/openshift/etcd/api/v3 v3.5.1-0.20241002015939-fd65559cbf04 h1:8nThW5g1IHi7fG2AFMZonmdx11W1tg0z+kP2CEQRHEM= -github.com/openshift/etcd/api/v3 v3.5.1-0.20241002015939-fd65559cbf04/go.mod h1:1P4SlIP/VwkDmGo3OlOD7faPeP8KDIFhqvciH5EfN28= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241002015939-fd65559cbf04 h1:4aRmUf8EtXhOtnJWlNCOaEsiCAEEXnpmKCPbkUU0okU= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241002015939-fd65559cbf04/go.mod h1:V8acl8pcEK0Y2g19YlOV9m9ssUe6MgiDSobSoaBAM0E= -github.com/openshift/etcd/client/v3 v3.5.1-0.20241002015939-fd65559cbf04 h1:J7fTJWYdv23UOSN/k1/KPY1uYs9WUKFxkysOvsQxSmQ= -github.com/openshift/etcd/client/v3 v3.5.1-0.20241002015939-fd65559cbf04/go.mod h1:X+rExSGkyqxvu276cr2OwPLBaeqFu1cIl4vmRjAD/50= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241002015939-fd65559cbf04 h1:MDm1Mrp6bVHxtbhuvfF/ioIWWiDpm7mEZ+sECDb8FC8= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241002015939-fd65559cbf04/go.mod h1:+lutCZHG5MBBFI/U4eYT5yL7sJfnexsoM20Y0t2uNuY= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20241002015939-fd65559cbf04 h1:UE1VIn8YdpQnVnW8CxbVOLJUO+pq4GIlYLF6BMoQt3Y= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20241002015939-fd65559cbf04/go.mod h1:P4UP14AxofMJ/54boWilabqqWoW9eLodl6I5GdGzazI= -github.com/openshift/etcd/server/v3 v3.5.1-0.20241002015939-fd65559cbf04 h1:IHoEo3F0DuG1a2BSqO2UO8Lpv3zvLevqAmr0bNYGuEw= -github.com/openshift/etcd/server/v3 v3.5.1-0.20241002015939-fd65559cbf04/go.mod h1:ynhyZZpdDp1Gq49jkUg5mfkDWZwXnn3eIqCqtJnrD/s= +github.com/openshift/etcd/api/v3 v3.5.1-0.20241029125623-825fc46f2c1b h1:igQekI6NBRUxNacLzRGFksldPX1ZbT/uF4DK8VH8ATk= +github.com/openshift/etcd/api/v3 v3.5.1-0.20241029125623-825fc46f2c1b/go.mod h1:1P4SlIP/VwkDmGo3OlOD7faPeP8KDIFhqvciH5EfN28= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241029125623-825fc46f2c1b h1:6EKE1j9bBJfZiELuXTOBdPOolOM5hdmvpEQyxlcIt1s= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241029125623-825fc46f2c1b/go.mod h1:V8acl8pcEK0Y2g19YlOV9m9ssUe6MgiDSobSoaBAM0E= +github.com/openshift/etcd/client/v3 v3.5.1-0.20241029125623-825fc46f2c1b h1:pSBLiDEIjqp+vWInjcgsykiwGkWEebmKFCun/mgIkCc= +github.com/openshift/etcd/client/v3 v3.5.1-0.20241029125623-825fc46f2c1b/go.mod h1:X+rExSGkyqxvu276cr2OwPLBaeqFu1cIl4vmRjAD/50= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241029125623-825fc46f2c1b h1:gv1dSmjwARNmCBhsGWDQO3N7vqiOTOSDDnC4A+TVoUg= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241029125623-825fc46f2c1b/go.mod h1:+lutCZHG5MBBFI/U4eYT5yL7sJfnexsoM20Y0t2uNuY= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20241029125623-825fc46f2c1b h1:KkGysAG4nEwFOZE4NB4KLAKYgvNd4hcF7Ge04ATARv4= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20241029125623-825fc46f2c1b/go.mod h1:P4UP14AxofMJ/54boWilabqqWoW9eLodl6I5GdGzazI= +github.com/openshift/etcd/server/v3 v3.5.1-0.20241029125623-825fc46f2c1b h1:edbZx56R31SYGz9q7jp866bXCRIwyBWIbVWCNFQdohA= +github.com/openshift/etcd/server/v3 v3.5.1-0.20241029125623-825fc46f2c1b/go.mod h1:ynhyZZpdDp1Gq49jkUg5mfkDWZwXnn3eIqCqtJnrD/s= github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241025232031-7ca9eb1e9e5c h1:bIGSshbw79unEv44zEjOA4G0M3Oq8ZCeWt100aT+5DQ= github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241025232031-7ca9eb1e9e5c/go.mod h1:Dm/iYMJ6/U1e9rvAbrngZcVY7I8bYUHkzPrToon6cTc= github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241025232031-7ca9eb1e9e5c h1:3Z+5wGoK6MYjj6nzn/LQw/Wr5N9fJqXGH15HGg9Hj5M= diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index 3cb7b9f1cd..166baee7e9 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -272,7 +272,7 @@ github.com/xlab/treeprint # go.etcd.io/bbolt v1.3.11 ## explicit; go 1.22 go.etcd.io/bbolt -# go.etcd.io/etcd/api/v3 v3.5.16 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241002015939-fd65559cbf04 +# go.etcd.io/etcd/api/v3 v3.5.16 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241029125623-825fc46f2c1b ## explicit; go 1.22 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb @@ -281,7 +281,7 @@ go.etcd.io/etcd/api/v3/membershippb go.etcd.io/etcd/api/v3/mvccpb go.etcd.io/etcd/api/v3/v3rpc/rpctypes go.etcd.io/etcd/api/v3/version -# go.etcd.io/etcd/client/pkg/v3 v3.5.16 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241002015939-fd65559cbf04 +# go.etcd.io/etcd/client/pkg/v3 v3.5.16 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241029125623-825fc46f2c1b ## explicit; go 1.22 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil @@ -294,14 +294,14 @@ go.etcd.io/etcd/client/pkg/v3/types # go.etcd.io/etcd/client/v2 v2.305.16 ## explicit; go 1.22 go.etcd.io/etcd/client/v2 -# go.etcd.io/etcd/client/v3 v3.5.16 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241002015939-fd65559cbf04 +# go.etcd.io/etcd/client/v3 v3.5.16 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241029125623-825fc46f2c1b ## explicit; go 1.22 go.etcd.io/etcd/client/v3 go.etcd.io/etcd/client/v3/concurrency go.etcd.io/etcd/client/v3/credentials go.etcd.io/etcd/client/v3/internal/endpoint go.etcd.io/etcd/client/v3/internal/resolver -# go.etcd.io/etcd/pkg/v3 v3.5.16 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241002015939-fd65559cbf04 +# go.etcd.io/etcd/pkg/v3 v3.5.16 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241029125623-825fc46f2c1b ## explicit; go 1.22 go.etcd.io/etcd/pkg/v3/adt go.etcd.io/etcd/pkg/v3/contention @@ -318,14 +318,14 @@ go.etcd.io/etcd/pkg/v3/runtime go.etcd.io/etcd/pkg/v3/schedule go.etcd.io/etcd/pkg/v3/traceutil go.etcd.io/etcd/pkg/v3/wait -# go.etcd.io/etcd/raft/v3 v3.5.16 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241002015939-fd65559cbf04 +# go.etcd.io/etcd/raft/v3 v3.5.16 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241029125623-825fc46f2c1b ## explicit; go 1.22 go.etcd.io/etcd/raft/v3 go.etcd.io/etcd/raft/v3/confchange go.etcd.io/etcd/raft/v3/quorum go.etcd.io/etcd/raft/v3/raftpb go.etcd.io/etcd/raft/v3/tracker -# go.etcd.io/etcd/server/v3 v3.5.13 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241002015939-fd65559cbf04 +# go.etcd.io/etcd/server/v3 v3.5.13 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241029125623-825fc46f2c1b ## explicit; go 1.22 go.etcd.io/etcd/server/v3/auth go.etcd.io/etcd/server/v3/config @@ -1063,12 +1063,12 @@ sigs.k8s.io/yaml/goyaml.v3 # github.com/openshift/microshift/pkg/config => ../pkg/config # github.com/openshift/microshift/pkg/util/cryptomaterial => ../pkg/util/cryptomaterial # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240806135314-3946b2b7b2a8 -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241002015939-fd65559cbf04 -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241002015939-fd65559cbf04 -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241002015939-fd65559cbf04 -# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241002015939-fd65559cbf04 -# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241002015939-fd65559cbf04 -# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241002015939-fd65559cbf04 +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241029125623-825fc46f2c1b +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241029125623-825fc46f2c1b +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241029125623-825fc46f2c1b +# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241029125623-825fc46f2c1b +# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241029125623-825fc46f2c1b +# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241029125623-825fc46f2c1b # k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241025232031-7ca9eb1e9e5c # k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241025232031-7ca9eb1e9e5c # k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241025232031-7ca9eb1e9e5c diff --git a/go.mod b/go.mod index 16bfc34218..4c59e77e00 100644 --- a/go.mod +++ b/go.mod @@ -247,9 +247,9 @@ replace ( ) replace ( - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241002015939-fd65559cbf04 // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241002015939-fd65559cbf04 // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241002015939-fd65559cbf04 // from etcd + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241029125623-825fc46f2c1b // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241029125623-825fc46f2c1b // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241029125623-825fc46f2c1b // from etcd ) replace sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240910155719-50d17147f15d // release kube-storage-version-migrator via kubernetes-kube-storage-version-migrator diff --git a/go.sum b/go.sum index 55a61844e4..7ff1374ff0 100644 --- a/go.sum +++ b/go.sum @@ -355,12 +355,12 @@ github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f h1:FRc0bVNWpri github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f/go.mod h1:KiZi2mJRH1TOJ3FtBDYS6YvUL30s/iIXaGSUrSa36mo= github.com/openshift/cluster-policy-controller v0.0.0-20241019011127-5fd852525909 h1:aC79mscCFPFpvDggKoL5mzqaqLxLs7JOZtpUnSO/Z3M= github.com/openshift/cluster-policy-controller v0.0.0-20241019011127-5fd852525909/go.mod h1:zG51UZ65IGizeMF0uj8PTKJJoGaRKrjhDbLAzVAc3vI= -github.com/openshift/etcd/api/v3 v3.5.1-0.20241002015939-fd65559cbf04 h1:8nThW5g1IHi7fG2AFMZonmdx11W1tg0z+kP2CEQRHEM= -github.com/openshift/etcd/api/v3 v3.5.1-0.20241002015939-fd65559cbf04/go.mod h1:1P4SlIP/VwkDmGo3OlOD7faPeP8KDIFhqvciH5EfN28= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241002015939-fd65559cbf04 h1:4aRmUf8EtXhOtnJWlNCOaEsiCAEEXnpmKCPbkUU0okU= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241002015939-fd65559cbf04/go.mod h1:V8acl8pcEK0Y2g19YlOV9m9ssUe6MgiDSobSoaBAM0E= -github.com/openshift/etcd/client/v3 v3.5.1-0.20241002015939-fd65559cbf04 h1:J7fTJWYdv23UOSN/k1/KPY1uYs9WUKFxkysOvsQxSmQ= -github.com/openshift/etcd/client/v3 v3.5.1-0.20241002015939-fd65559cbf04/go.mod h1:X+rExSGkyqxvu276cr2OwPLBaeqFu1cIl4vmRjAD/50= +github.com/openshift/etcd/api/v3 v3.5.1-0.20241029125623-825fc46f2c1b h1:igQekI6NBRUxNacLzRGFksldPX1ZbT/uF4DK8VH8ATk= +github.com/openshift/etcd/api/v3 v3.5.1-0.20241029125623-825fc46f2c1b/go.mod h1:1P4SlIP/VwkDmGo3OlOD7faPeP8KDIFhqvciH5EfN28= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241029125623-825fc46f2c1b h1:6EKE1j9bBJfZiELuXTOBdPOolOM5hdmvpEQyxlcIt1s= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241029125623-825fc46f2c1b/go.mod h1:V8acl8pcEK0Y2g19YlOV9m9ssUe6MgiDSobSoaBAM0E= +github.com/openshift/etcd/client/v3 v3.5.1-0.20241029125623-825fc46f2c1b h1:pSBLiDEIjqp+vWInjcgsykiwGkWEebmKFCun/mgIkCc= +github.com/openshift/etcd/client/v3 v3.5.1-0.20241029125623-825fc46f2c1b/go.mod h1:X+rExSGkyqxvu276cr2OwPLBaeqFu1cIl4vmRjAD/50= github.com/openshift/kubernetes v0.0.0-20241025232031-7ca9eb1e9e5c h1:kPOR0L9kzEtFtkhf4Qgi0O7AOItsaT18loFlaIrKPPE= github.com/openshift/kubernetes v0.0.0-20241025232031-7ca9eb1e9e5c/go.mod h1:irFxKTtK84t/hwUhtyBA1n35y0mFRbr5SSrFk2+1VpA= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240910155719-50d17147f15d h1:rnYg1QgPmhuRhyEILvhh20Cmc08ohEwLjMj8oSUBZk8= diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 476723ccbf..a9bf5bc29f 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,7 +1,12 @@ -- machine-config-operator embedded-component d656f31b697c2671aac38bbe46d9e5b22d27ae90 to c499c1b28590e520514f2dbacd78111f13c81c4d - - c3c8809d 2024-10-11T16:52:49+00:00 Disable ESP offload for OVS attached interfaces - - 3256e6ef 2024-10-10T13:58:26+01:00 manifests: set required-scc for kube-rbac-proxy-crio workloads +- etcd embedded-component fd65559cbf04ccbaf79c8b028a866f1492c0e63a to 825fc46f2c1be39640edce95c49d3b70243e9d6b + - a435a4ab 2024-10-28T16:23:23-04:00 Add support for cachi2 based deps Konflux is replacing RH's internal build system OSBS. OSBS supported a build-time dependency injection system called "cachito". Konflux replaces this with "cachi2" which works differently. REMOTE_SOURCES no longer need to be copied into place and there is no need to source cachito's environment information (Konflux automatically rewrites the Dockerfile to source cachi2/cachi2.env before running the original RUN commands). Additionally, cachito appears to have provided go.sum dependencies whereas cachi2 requires all build-time dependencies in go.mod. Missing dependencies are added to go.mod as // indirect in this change. -- oc image-arm64 ee93eb5a82af5b61c625df9d3a9b50da9740a7d4 to 62471c258d8e92d2d07c97515cc82013cc431cbe +- machine-config-operator embedded-component c499c1b28590e520514f2dbacd78111f13c81c4d to b3a562be44deb94fa4ea86e25a9d83395c3d188d + - 3f9acedb 2024-10-25T11:51:50+02:00 OPNET-569: Do not run resolv-prepender from NM dispatcher + +- operator-framework-olm embedded-component b980e95a56dc213fa987f55db2f8fb426093e51f to 29f4d1afaf2329f5c14b538fed79078ce9b6dedf + - 0f1b3ead 2024-10-30T00:05:48+00:00 fix: buggy nextY logic for maxOCPVersion (#3416) + +- oc image-amd64 ee93eb5a82af5b61c625df9d3a9b50da9740a7d4 to 62471c258d8e92d2d07c97515cc82013cc431cbe - 39272ca9 2024-10-23T18:22:00-04:00 OCPBUGS-43513: Show node-joiner container logs when error occurs diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index db131488d4..d6b6252e7e 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -9,15 +9,15 @@ https://github.com/openshift/cluster-network-operator embedded-component 4e7def6 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 21b8df3a53ed996e0efebf073151462317c0cc17 https://github.com/openshift/cluster-policy-controller embedded-component 5fd852525909ce6eab52972ba9ce8fcf56528eb9 https://github.com/openshift/csi-external-snapshotter embedded-component f52ce8b8b0799a341caf1fb864bba5d9d040a856 -https://github.com/openshift/etcd embedded-component fd65559cbf04ccbaf79c8b028a866f1492c0e63a +https://github.com/openshift/etcd embedded-component 825fc46f2c1be39640edce95c49d3b70243e9d6b https://github.com/openshift/kubernetes embedded-component 7ca9eb1e9e5ced974033c2b6f26560e22535244c https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 50d17147f15d8b216e7c41f91d1bd7d307ca8c73 -https://github.com/openshift/machine-config-operator embedded-component c499c1b28590e520514f2dbacd78111f13c81c4d +https://github.com/openshift/machine-config-operator embedded-component b3a562be44deb94fa4ea86e25a9d83395c3d188d https://github.com/openshift/openshift-controller-manager embedded-component 3ebe2f4f3900d6a3748ef0faf3535f635dbf7d11 -https://github.com/openshift/operator-framework-olm embedded-component b980e95a56dc213fa987f55db2f8fb426093e51f +https://github.com/openshift/operator-framework-olm embedded-component 29f4d1afaf2329f5c14b538fed79078ce9b6dedf https://github.com/openshift/route-controller-manager embedded-component 07daee4d2f0b5c7aaca56ee45ff6dfdf97680db0 https://github.com/openshift/service-ca-operator embedded-component 1f7d6472fea332fc307d9c8911f8c3cf57347755 -https://github.com/openshift/oc image-amd64 ee93eb5a82af5b61c625df9d3a9b50da9740a7d4 +https://github.com/openshift/oc image-amd64 62471c258d8e92d2d07c97515cc82013cc431cbe https://github.com/openshift/coredns image-amd64 cb1abfaeb7b0c5df4f0c56b0a009b439db1d0949 https://github.com/openshift/csi-external-snapshotter image-amd64 f52ce8b8b0799a341caf1fb864bba5d9d040a856 https://github.com/openshift/csi-external-snapshotter image-amd64 f52ce8b8b0799a341caf1fb864bba5d9d040a856 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index b69f5848a5..bc934a46d3 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2024-10-29-112337" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-10-29-201653" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2024-10-30-122220" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-10-30-201653" diff --git a/vendor/modules.txt b/vendor/modules.txt index d5186e5afb..b02cf247a2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -829,7 +829,7 @@ github.com/x448/float16 # github.com/xlab/treeprint v1.2.0 ## explicit; go 1.13 github.com/xlab/treeprint -# go.etcd.io/etcd/api/v3 v3.5.16 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241002015939-fd65559cbf04 +# go.etcd.io/etcd/api/v3 v3.5.16 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241029125623-825fc46f2c1b ## explicit; go 1.22 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb @@ -837,7 +837,7 @@ go.etcd.io/etcd/api/v3/membershippb go.etcd.io/etcd/api/v3/mvccpb go.etcd.io/etcd/api/v3/v3rpc/rpctypes go.etcd.io/etcd/api/v3/version -# go.etcd.io/etcd/client/pkg/v3 v3.5.16 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241002015939-fd65559cbf04 +# go.etcd.io/etcd/client/pkg/v3 v3.5.16 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241029125623-825fc46f2c1b ## explicit; go 1.22 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil @@ -845,7 +845,7 @@ go.etcd.io/etcd/client/pkg/v3/systemd go.etcd.io/etcd/client/pkg/v3/tlsutil go.etcd.io/etcd/client/pkg/v3/transport go.etcd.io/etcd/client/pkg/v3/types -# go.etcd.io/etcd/client/v3 v3.5.14 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241002015939-fd65559cbf04 +# go.etcd.io/etcd/client/v3 v3.5.14 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241029125623-825fc46f2c1b ## explicit; go 1.22 go.etcd.io/etcd/client/v3 go.etcd.io/etcd/client/v3/credentials @@ -3188,9 +3188,9 @@ sigs.k8s.io/yaml/goyaml.v3 # k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241025232031-7ca9eb1e9e5c # k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20241025232031-7ca9eb1e9e5c # k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20241025232031-7ca9eb1e9e5c -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241002015939-fd65559cbf04 -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241002015939-fd65559cbf04 -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241002015939-fd65559cbf04 +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241029125623-825fc46f2c1b +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241029125623-825fc46f2c1b +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241029125623-825fc46f2c1b # sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240910155719-50d17147f15d # k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241025232031-7ca9eb1e9e5c # k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20241025232031-7ca9eb1e9e5c