diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index 75d3d85882..438ba24c92 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=31 KUBE_GIT_VERSION=v1.31.3 -KUBE_GIT_COMMIT=8ac36bf977d93ee5db979a4bda774d4a0f3b3367 +KUBE_GIT_COMMIT=3c62f738ce74a624d46b4f73f25d6c15b3a80a2b KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index cb00dcb646..af4b81e473 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.19.0-0.nightly-arm64-2024-12-12-185745 +OCP_VERSION := 4.19.0-0.nightly-arm64-2024-12-13-065745 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 8ef775dd72..709a8def27 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.19.0-0.nightly-2024-12-10-040415 +OCP_VERSION := 4.19.0-0.nightly-2024-12-13-083421 diff --git a/assets/optional/multus/kustomization.aarch64.yaml b/assets/optional/multus/kustomization.aarch64.yaml index 1f75a69f02..aecd0db02e 100644 --- a/assets/optional/multus/kustomization.aarch64.yaml +++ b/assets/optional/multus/kustomization.aarch64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:e5fea7fd6042dba42a639ca092a2155cb2ad1907e7a3ea9377d35e130d74dc85 + digest: sha256:698625db18424b50454c138d352ac708900968441c19128a36d1ae8dad391c17 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:758200f8625fc59a65a2e080a296af8ca34caa66e5828f725eb3798013d03130 + digest: sha256:0b41c0a434aa18c6c8d117c37e3423750d7d7df065add3f1361c1d774929f2cd diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml index fc47ab0ba0..32e8e1e4c3 100644 --- a/assets/optional/multus/kustomization.x86_64.yaml +++ b/assets/optional/multus/kustomization.x86_64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:75f534782567b2c9858382e383a02518477ee699c2d510eef3f67862f8bd885f + digest: sha256:1cb7164595d0278043b2312bb405085d0a52aa8887f04e3b45b71ceb03e35963 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:c0cdee341181aeee5a0fdb899f3adc003d081ff09550baba66ebfbbd88f80a9c + digest: sha256:c30044805706b248c6388313261fa956b4a8078651e042c829764b2b22b500f8 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 2a6cfb188b..72e667799d 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.19.0-0.nightly-arm64-2024-12-12-185745" + "base": "4.19.0-0.nightly-arm64-2024-12-13-065745" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5fea7fd6042dba42a639ca092a2155cb2ad1907e7a3ea9377d35e130d74dc85", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:758200f8625fc59a65a2e080a296af8ca34caa66e5828f725eb3798013d03130" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:698625db18424b50454c138d352ac708900968441c19128a36d1ae8dad391c17", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b41c0a434aa18c6c8d117c37e3423750d7d7df065add3f1361c1d774929f2cd" } } diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 8634c84cc4..dc7d1ad4e2 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.19.0-0.nightly-2024-12-10-040415" + "base": "4.19.0-0.nightly-2024-12-13-083421" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75f534782567b2c9858382e383a02518477ee699c2d510eef3f67862f8bd885f", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c0cdee341181aeee5a0fdb899f3adc003d081ff09550baba66ebfbbd88f80a9c" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1cb7164595d0278043b2312bb405085d0a52aa8887f04e3b45b71ceb03e35963", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c30044805706b248c6388313261fa956b4a8078651e042c829764b2b22b500f8" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 928d343c49..dbf037afa7 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:15565228f57edc3755a3b8e47cfee054892cabe9ae23c6e18eba9180e553afa5 + digest: sha256:dbed06d895da4c2f5a798fc8a4f8b4703b9cd97c4d77e0f4c26e16374332755b - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:d1b421438373ad5af6365e84a18901a152dd6785d18628c39035647285d573bb + digest: sha256:56ffe3cd25c2038eb5bfb64b6baca158e9e41637cbd76445db4acc5b0b4fac6c - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:12f1b9eedd9597d984944af10116331be505e04dadbb644b72841e144b167754 + digest: sha256:f4b4f8dde1906f5daa20f46251d25a4c4b7529231fc2e6b715913910e6082ba8 patches: - patch: |- @@ -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:d1b421438373ad5af6365e84a18901a152dd6785d18628c39035647285d573bb + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56ffe3cd25c2038eb5bfb64b6baca158e9e41637cbd76445db4acc5b0b4fac6c - 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:15565228f57edc3755a3b8e47cfee054892cabe9ae23c6e18eba9180e553afa5 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dbed06d895da4c2f5a798fc8a4f8b4703b9cd97c4d77e0f4c26e16374332755b 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 f29d898ee2..eb9b3cd489 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:ff7f3e157684126f532c011ea6c1c4e10691a0bc0dda834778a77b3464061e14 + digest: sha256:10fa045f3618bbd2382cb9075b8ae5b0786b55e5439ff9464d01c7e62c9af4fa - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:e4727c291f444adc54745e7ff508a4819cb8627bcbd4a3a06702c45aca55ec78 + digest: sha256:279dbfceedb880413e3480a34c2bf743da653d0a3b05af46c629822b2f6c2e1d - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:15939a25f4893e3ef43e340e9742bf5f60facb47b2537c579e266c1026bc746a + digest: sha256:fecb0048c9c7f250496781179cae0a84b03809cd28b23fc7dd5a39cc245ce1de patches: - patch: |- @@ -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:e4727c291f444adc54745e7ff508a4819cb8627bcbd4a3a06702c45aca55ec78 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:279dbfceedb880413e3480a34c2bf743da653d0a3b05af46c629822b2f6c2e1d - 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:ff7f3e157684126f532c011ea6c1c4e10691a0bc0dda834778a77b3464061e14 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:10fa045f3618bbd2382cb9075b8ae5b0786b55e5439ff9464d01c7e62c9af4fa 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 e8cd791aab..38dc4c61ce 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.19.0-0.nightly-arm64-2024-12-12-185745" + "base": "4.19.0-0.nightly-arm64-2024-12-13-065745" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15565228f57edc3755a3b8e47cfee054892cabe9ae23c6e18eba9180e553afa5", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d1b421438373ad5af6365e84a18901a152dd6785d18628c39035647285d573bb", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:12f1b9eedd9597d984944af10116331be505e04dadbb644b72841e144b167754" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dbed06d895da4c2f5a798fc8a4f8b4703b9cd97c4d77e0f4c26e16374332755b", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56ffe3cd25c2038eb5bfb64b6baca158e9e41637cbd76445db4acc5b0b4fac6c", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f4b4f8dde1906f5daa20f46251d25a4c4b7529231fc2e6b715913910e6082ba8" } } 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 cce0169663..2d890af79a 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.19.0-0.nightly-2024-12-10-040415" + "base": "4.19.0-0.nightly-2024-12-13-083421" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ff7f3e157684126f532c011ea6c1c4e10691a0bc0dda834778a77b3464061e14", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e4727c291f444adc54745e7ff508a4819cb8627bcbd4a3a06702c45aca55ec78", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15939a25f4893e3ef43e340e9742bf5f60facb47b2537c579e266c1026bc746a" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:10fa045f3618bbd2382cb9075b8ae5b0786b55e5439ff9464d01c7e62c9af4fa", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:279dbfceedb880413e3480a34c2bf743da653d0a3b05af46c629822b2f6c2e1d", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fecb0048c9c7f250496781179cae0a84b03809cd28b23fc7dd5a39cc245ce1de" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 37d0ce8252..118daaf1d5 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,17 +1,17 @@ { "release": { - "base": "4.19.0-0.nightly-arm64-2024-12-12-185745" + "base": "4.19.0-0.nightly-arm64-2024-12-13-065745" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ada8d538316c64e697fdc001191eff9dbaada5e27277521722b74983380f8a62", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac7c46e0acb811055792719a0b1b962912b35ebff52cda8269104f7e928c777b", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:616d02742849576aee0150c394ac45383d5c7f5de5ba1897b64d27f5ca922bd3", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:12f1b9eedd9597d984944af10116331be505e04dadbb644b72841e144b167754", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6c143ac06857ec6c977abf31f6ddc98197671501b78fad92bbc18f298324bb5a", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:95400aeea06aabf48ec24cb9fc7d048d7b6b5d97f276613d2878821d7095ef35", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:26ce9277d590307a1b4013882ca1f96f0c049eade459c469fbf34e2c2cb96ef5", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c831570821f098fcb3ca7161decafd3080d85de6f792c01590deb6ab38815217", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9526d4ca032cd86a478640a33cebebc61985ff8f48c90c9b23192bce79416b84", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a8652468d066450a098f2f2f705ac4c088740c3007f42ce84f976c9eb8bbe9d8", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f4b4f8dde1906f5daa20f46251d25a4c4b7529231fc2e6b715913910e6082ba8", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:644a9bfea4326b227e21d40ccbfbb3c0c4c308249a1462d9eb3776637db49c92", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:618a701c092403624182c4969c1a6a2f4aadd26c7b50e46c7fbe7175da0f3575", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ddbe4e12785990a4764abb85ef5c5c64bdaafa83c29e35beb77e03d995f0b256", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb7d94e9197a4fc5048fd8ba3f5ce0f499b0b9969674eed87651f4a023d7d827", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b1794da2d90e4f222aa69fe2ee92ea945e40dfb2b27de34177d2e4258b6eb76b" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7c79ee759c3bb9ae50d27d7487c9dc9de5224c9175ac9636f500ab0fd46e90b", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:30ca243687727c62df5c0f952105a52c6e587c1ec0f348ae91bf8e09de7f2494" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 7396692c36..fe43f68047 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,17 +1,17 @@ { "release": { - "base": "4.19.0-0.nightly-2024-12-10-040415" + "base": "4.19.0-0.nightly-2024-12-13-083421" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:11dcd216400a9a348fd17d4dc655d722366cefa6793772fb05570f514d19c60c", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4e2d35374ebdd21a5b2099a81f2b685f6c2c40fe206ea2ff791fec48aa2db55b", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fc2ebfa9b56c717b132f17c9e5e6cdf56bbc1a86aa0dae877174f073d90f6d4", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15939a25f4893e3ef43e340e9742bf5f60facb47b2537c579e266c1026bc746a", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a93b770eaab502d63f7a9048d7d249503c5e345d2a58abeaf29658ee38c31ae6", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ce8be7e248742136892ccadc709209868b5c370eecca036798e5be9742f6edb1", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bd0fc0973a3f3fe3562bac1412549f339b18db4203f407d110d83b60c8cb2b96", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ce20e9d00b53b9df84182f668cc865f6f2f3bbaad4cd1d920856e246ec19376d", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e24f7193a6269796d7a005febb7f648248c2f9cc7954eba091d50d9bc9d983aa", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ffee8631d4a81b4a9bed4b642177f02e37dd0b1b22110fd04bce0a4d20d821e6", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fecb0048c9c7f250496781179cae0a84b03809cd28b23fc7dd5a39cc245ce1de", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8665919370d3aee9d9a1dc7fbbdaf41ae5d5d905dfbd39b52e5d3d3d07270b9f", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9baab801b7c1371ecebdbb4570228756e056689e7f834fbfc597df4c8eb1e3fd", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e91a5da769452f47bb5c2518174474b08d466344cd9a46f49d386f0562e88acd", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3354e29f3c1124db7e5f4de0a4130539f7c3db1eb15b98b38318fa8d9bb72174", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:26b13adf0c15c49fdf24c4091cbbe1e692c2303c8c6558a271858c2f31f7e0cf" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d49a8e92e26b4e27adbb1d37cf15a2ea2ae0501054ff9db1a355c80802fdc9ba", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:41c28bd33107bba44960076491be57572c782b1275ae5519b0bcd04853efbdb8" } } diff --git a/etcd/go.mod b/etcd/go.mod index e47a180c61..24b68ca6bf 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -1,6 +1,6 @@ module github.com/openshift/microshift/etcd -go 1.22.5 +go 1.23.0 require github.com/openshift/microshift v0.0.0 @@ -11,6 +11,7 @@ replace ( ) require ( + github.com/openshift/api v0.0.0-20241004095111-b1f700bdd8d2 github.com/openshift/build-machinery-go v0.0.0-20240910153727-5725581bdf8f github.com/spf13/cobra v1.8.1 go.etcd.io/etcd/server/v3 v3.5.13 @@ -18,7 +19,7 @@ require ( k8s.io/cli-runtime v0.0.0 k8s.io/component-base v0.31.1 k8s.io/klog/v2 v2.130.1 - k8s.io/kubectl v0.31.3 + k8s.io/kubectl v0.0.0 sigs.k8s.io/yaml v1.4.0 ) @@ -30,7 +31,6 @@ require ( github.com/google/go-cmp v0.6.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect - github.com/openshift/api v0.0.0-20241004095111-b1f700bdd8d2 // indirect github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/vishvananda/netlink v1.1.0 // indirect @@ -151,37 +151,37 @@ replace ( go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241118170732-914783cae63a // from etcd go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241118170732-914783cae63a // from etcd go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241118170732-914783cae63a // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241126153609-8ac36bf977d9 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241126153609-8ac36bf977d9 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241211151829-3c62f738ce74 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241211151829-3c62f738ce74 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes ) -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes -replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes +replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index aeb0e57225..1266aef44f 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -190,20 +190,20 @@ github.com/openshift/etcd/raft/v3 v3.5.1-0.20241118170732-914783cae63a h1:P1hNaY github.com/openshift/etcd/raft/v3 v3.5.1-0.20241118170732-914783cae63a/go.mod h1:uapEfOMPaJ45CqBYIraLO5+fqyIY2d57nFfxzFwy4D4= github.com/openshift/etcd/server/v3 v3.5.1-0.20241118170732-914783cae63a h1:X7PFfxZQaHmXUDLIo+und9jejO3yFwWIdR+m1nvSnww= github.com/openshift/etcd/server/v3 v3.5.1-0.20241118170732-914783cae63a/go.mod h1:40sqgtGt6ZJNKm8nk8x6LexZakPu+NDl/DCgZTZ69Cc= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241126153609-8ac36bf977d9 h1:ardnpguSAWED/kKqAAfQBef/L7pQB1uaZPyu4fatXjo= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:Lx6jvlmXgJVnqVDARguhONKwlnGahRSWUl57wJltaj8= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241126153609-8ac36bf977d9 h1:Ned7vyf5r1GZIOwQ8Q44e3svFclN7cu9WtMsII+c8y8= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:DESUJPjrTWS0YmETcifsHEKOo08a7J20LkYD8kSuPaI= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241126153609-8ac36bf977d9 h1:8rPtzifHdcUx+2kDJPMM5JbzzS0USSglqX+lBGXz+P4= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:Pe8Uicw828Quq+iQKnOG2MB0dZs1qFNcvnixRuMD/58= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241126153609-8ac36bf977d9 h1:TGw2gTBKXjlKSfap0li+V/ExeAh61FEzX++yR22lUB0= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:7mIF0av5qJ4DSYGbNLBdzbf93wTdmRigWWMm3oroVPY= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241126153609-8ac36bf977d9 h1:oQYK8nw+ZOXA+QrSAj36wH3yDJZ76+zHYtX0Bp6n4/A= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:KEnQp4pgQ2zdMSYfbCYTs0YasvrxAVx2iekiuoJYjQM= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241126153609-8ac36bf977d9 h1:k0JcxRlIjNbz1kfMDgMpdZ0fuVX54e7oBbYXee6vFzk= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:B0udSKuoZLeZEw3o8rNmP9ONicaSjCf/RHx2oZ/7laQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241126153609-8ac36bf977d9 h1:5lVVwKlpyWolo9NfHp0QN3XJVlHX9bo0DYZqPp295e0= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:ZZoyj+ofRlbElHajU0pqTd6fEinQQW/B+8RQpMJ7PlM= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241211151829-3c62f738ce74 h1:JOyCcFzzxvN6+amXvg1Bq9WCEzEPb0X5/2HbkSKB1CU= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241211151829-3c62f738ce74/go.mod h1:Lx6jvlmXgJVnqVDARguhONKwlnGahRSWUl57wJltaj8= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241211151829-3c62f738ce74 h1:vkZ6mIJjybxRaQbqPMvdHtlet6M+hU1o2a0n6X78jMI= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241211151829-3c62f738ce74/go.mod h1:DESUJPjrTWS0YmETcifsHEKOo08a7J20LkYD8kSuPaI= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241211151829-3c62f738ce74 h1:YMnKqCm+Va1ZmTSqaXoDkL9vy6Vhu8ludvGw6MjrI+Q= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241211151829-3c62f738ce74/go.mod h1:Pe8Uicw828Quq+iQKnOG2MB0dZs1qFNcvnixRuMD/58= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241211151829-3c62f738ce74 h1:q7b94AJKskPC2rTwsN7cvQMrB/LPjuh632ET3s+XptI= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241211151829-3c62f738ce74/go.mod h1:7mIF0av5qJ4DSYGbNLBdzbf93wTdmRigWWMm3oroVPY= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241211151829-3c62f738ce74 h1:Im0OtWF4EVBrEL5sXN717og6Vl5JPGEMZKGEgfC+hy0= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241211151829-3c62f738ce74/go.mod h1:KEnQp4pgQ2zdMSYfbCYTs0YasvrxAVx2iekiuoJYjQM= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241211151829-3c62f738ce74 h1:UHPFJ6tJQ00qApMKeMFcJnI07or9sLO3JiX7reov8r0= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241211151829-3c62f738ce74/go.mod h1:B0udSKuoZLeZEw3o8rNmP9ONicaSjCf/RHx2oZ/7laQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241211151829-3c62f738ce74 h1:EruIkVJ/vUlkc16kU08x9fgqEn2X0KhFyOZKdnyC8cU= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241211151829-3c62f738ce74/go.mod h1:ZZoyj+ofRlbElHajU0pqTd6fEinQQW/B+8RQpMJ7PlM= github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060 h1:jiDC7d8d+jmjv2WfiMY0+Uf55q11MGyYkGGqXnfqWTU= github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060/go.mod h1:9B1MYPoLtP9tqjWxcbUNVpwxy68zOH/3EIP6c31dAM0= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241008152707-25bf9f14db44 h1:dKUAGq29JBk2oRn955gnnz3sG/UhlkUKh1ISleLiews= diff --git a/etcd/vendor/github.com/openshift/microshift/pkg/config/apiserver.go b/etcd/vendor/github.com/openshift/microshift/pkg/config/apiserver.go index d006726ba9..e793300295 100644 --- a/etcd/vendor/github.com/openshift/microshift/pkg/config/apiserver.go +++ b/etcd/vendor/github.com/openshift/microshift/pkg/config/apiserver.go @@ -25,6 +25,8 @@ type ApiServer struct { AuditLog AuditLog `json:"auditLog"` + TLS TLSConfig `json:"tls"` + // The URL and Port of the API server cannot be changed by the user. URL string `json:"-"` Port int `json:"-"` @@ -40,8 +42,6 @@ type ApiServer struct { // advertising because of dual stack limitations there. This is only to // make ovnk work properly. AdvertiseAddresses []string `json:"-"` - - TLS TLSConfig `json:"tls"` } // NamedCertificateEntry provides certificate details @@ -68,11 +68,13 @@ type AuditLog struct { type TLSConfig struct { // CipherSuites lists the allowed cipher suites that the API server will - // accept and serve. + // accept and serve. Defaults to cipher suites from the minVersion config + // parameter. CipherSuites []string `json:"cipherSuites"` // MinVersion specifies which TLS version is the minimum version of TLS - // to serve from the API server. + // to serve from the API server. Allowed values: VersionTLS12, VersionTLS13. + // Defaults to VersionTLS12. // +kubebuilder:validation:Enum:=VersionTLS12;VersionTLS13 // +kubebuilder:default=VersionTLS12 MinVersion string `json:"minVersion"` diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index 7baae3ab7a..12567a4ce8 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -208,7 +208,7 @@ github.com/openshift/build-machinery-go/scripts github.com/openshift/library-go/pkg/crypto github.com/openshift/library-go/pkg/operator/apiserver/audit # github.com/openshift/microshift v0.0.0 => ../ -## explicit; go 1.22.5 +## explicit; go 1.23.0 github.com/openshift/microshift/pkg/config github.com/openshift/microshift/pkg/config/apiserver github.com/openshift/microshift/pkg/util @@ -626,7 +626,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/api v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -686,7 +686,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apimachinery v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/apimachinery v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -746,18 +746,18 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/apiserver v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/apiserver/pkg/apis/audit k8s.io/apiserver/pkg/apis/audit/v1 k8s.io/apiserver/pkg/authentication/user -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/client-go v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -912,7 +912,7 @@ k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/watchlist k8s.io/client-go/util/workqueue -# k8s.io/component-base v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/component-base v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -949,7 +949,7 @@ k8s.io/kube-openapi/pkg/spec3 k8s.io/kube-openapi/pkg/util/proto k8s.io/kube-openapi/pkg/util/proto/validation k8s.io/kube-openapi/pkg/validation/spec -# k8s.io/kubectl v0.31.3 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -1077,34 +1077,34 @@ sigs.k8s.io/yaml/goyaml.v3 # go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241118170732-914783cae63a # go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241118170732-914783cae63a # go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241118170732-914783cae63a -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20241211151829-3c62f738ce74 diff --git a/go.mod b/go.mod index 36984ebe8d..cb0821ff66 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/openshift/microshift -go 1.22.5 +go 1.23.0 toolchain go1.23.2 @@ -12,9 +12,9 @@ require ( github.com/openshift/api v0.0.0-20241004095111-b1f700bdd8d2 github.com/openshift/build-machinery-go v0.0.0-20240910153727-5725581bdf8f github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f - github.com/openshift/cluster-policy-controller v0.0.0-20241019011127-5fd852525909 + github.com/openshift/cluster-policy-controller v0.0.0-20241210163452-327d3cbd82fd github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060 - github.com/openshift/route-controller-manager v0.0.0-20241204202524-c625ae02c147 + github.com/openshift/route-controller-manager v0.0.0-20241212133037-4a534edbd515 github.com/pkg/errors v0.9.1 // indirect github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 @@ -193,7 +193,7 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/square/go-jose.v2 v2.6.0 // indirect k8s.io/cluster-bootstrap v0.0.0 // indirect - k8s.io/component-helpers v0.30.1 // indirect + k8s.io/component-helpers v0.31.1 // indirect k8s.io/controller-manager v0.31.1 // indirect k8s.io/cri-api v0.0.0 // indirect k8s.io/cri-client v0.0.0 // indirect @@ -215,35 +215,35 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241008152707-25bf9f14db44 // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241126153609-8ac36bf977d9 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241126153609-8ac36bf977d9 // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241126153609-8ac36bf977d9 // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241126153609-8ac36bf977d9 // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241126153609-8ac36bf977d9 // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241126153609-8ac36bf977d9 // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241126153609-8ac36bf977d9 // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241126153609-8ac36bf977d9 // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20241126153609-8ac36bf977d9 // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241126153609-8ac36bf977d9 // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241126153609-8ac36bf977d9 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241126153609-8ac36bf977d9 // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20241126153609-8ac36bf977d9 // release kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241126153609-8ac36bf977d9 // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241126153609-8ac36bf977d9 // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241126153609-8ac36bf977d9 // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241126153609-8ac36bf977d9 // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20241126153609-8ac36bf977d9 // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20241126153609-8ac36bf977d9 // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241211151829-3c62f738ce74 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241211151829-3c62f738ce74 // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241211151829-3c62f738ce74 // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241211151829-3c62f738ce74 // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241211151829-3c62f738ce74 // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241211151829-3c62f738ce74 // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241211151829-3c62f738ce74 // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241211151829-3c62f738ce74 // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20241211151829-3c62f738ce74 // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241211151829-3c62f738ce74 // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241211151829-3c62f738ce74 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241211151829-3c62f738ce74 // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20241211151829-3c62f738ce74 // release kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241211151829-3c62f738ce74 // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241211151829-3c62f738ce74 // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241211151829-3c62f738ce74 // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241211151829-3c62f738ce74 // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20241211151829-3c62f738ce74 // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20241211151829-3c62f738ce74 // from kubernetes ) replace ( @@ -254,6 +254,6 @@ replace ( 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 -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes -replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20241126153609-8ac36bf977d9 // staging kubernetes +replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20241211151829-3c62f738ce74 // staging kubernetes diff --git a/go.sum b/go.sum index 6c71f02dcc..6efbfaa2eb 100644 --- a/go.sum +++ b/go.sum @@ -353,74 +353,74 @@ github.com/openshift/build-machinery-go v0.0.0-20240910153727-5725581bdf8f h1:JM github.com/openshift/build-machinery-go v0.0.0-20240910153727-5725581bdf8f/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE= github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f h1:FRc0bVNWprihWS0GqQWzb3dY4dkCwpOP3mDw5NwSoR4= 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/cluster-policy-controller v0.0.0-20241210163452-327d3cbd82fd h1:jhn2PtwLCwExAr3OJk8YdSipSQf0dC5eiJQ86MWJk4g= +github.com/openshift/cluster-policy-controller v0.0.0-20241210163452-327d3cbd82fd/go.mod h1:fa6znaoI7wWjvdbC3Nv9pLxOwyTM8EQRphC8GFg0FHM= github.com/openshift/etcd/api/v3 v3.5.1-0.20241118170732-914783cae63a h1:+zYlT8ikLojupnnbSNt3PJWKrBGroi8gSrBeHpV4t9w= github.com/openshift/etcd/api/v3 v3.5.1-0.20241118170732-914783cae63a/go.mod h1:d1hvkRuXkts6PmaYk2Vrgqbv7H4ADfAKhyJqHNLJCB4= github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241118170732-914783cae63a h1:REahb+PGf/XXGcbvc8wLbAX+cdlv5xPof5uOjViMnG4= github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241118170732-914783cae63a/go.mod h1:4DqK1TKacp/86nJk4FLQqo6Mn2vvQFBmruW3pP14H/w= github.com/openshift/etcd/client/v3 v3.5.1-0.20241118170732-914783cae63a h1:Tza8C8nqjPxgPL7ft/tYAMm8/thQ2zA3v9BrYubvbJs= github.com/openshift/etcd/client/v3 v3.5.1-0.20241118170732-914783cae63a/go.mod h1:j2d4eXTHWkT2ClBgnnEPm/Wuu7jsqku41v9DZ3OtjQo= -github.com/openshift/kubernetes v0.0.0-20241126153609-8ac36bf977d9 h1:psOHgof0ID2KW5KU4eRLlIMfKRNQtCUF6pPyNlvD/pM= -github.com/openshift/kubernetes v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:i/tRYbbdCLJCAobxOdsAUjYoYmUVsx16LAVn4mPHZgY= +github.com/openshift/kubernetes v0.0.0-20241211151829-3c62f738ce74 h1:S7gWMp0a9klu7IKkWRUMsRepXA/J7UWQ+boYac3vW2w= +github.com/openshift/kubernetes v0.0.0-20241211151829-3c62f738ce74/go.mod h1:i/tRYbbdCLJCAobxOdsAUjYoYmUVsx16LAVn4mPHZgY= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240910155719-50d17147f15d h1:rnYg1QgPmhuRhyEILvhh20Cmc08ohEwLjMj8oSUBZk8= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240910155719-50d17147f15d/go.mod h1:9YVOqIQLlM6x6xS8I4B1Wo2X57lnOJvbYD96VGJ0q8Q= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241126153609-8ac36bf977d9 h1:ardnpguSAWED/kKqAAfQBef/L7pQB1uaZPyu4fatXjo= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:Lx6jvlmXgJVnqVDARguhONKwlnGahRSWUl57wJltaj8= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241126153609-8ac36bf977d9 h1:Ih1vluN/tFBt/wUTO2hwjLK+FebFppuns0BKb5PGk5Q= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:Ruk83+juksSdbZnOzlYZ1wivqvm59xcdKk/fqNwDznU= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241126153609-8ac36bf977d9 h1:Ned7vyf5r1GZIOwQ8Q44e3svFclN7cu9WtMsII+c8y8= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:DESUJPjrTWS0YmETcifsHEKOo08a7J20LkYD8kSuPaI= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241126153609-8ac36bf977d9 h1:8rPtzifHdcUx+2kDJPMM5JbzzS0USSglqX+lBGXz+P4= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:Pe8Uicw828Quq+iQKnOG2MB0dZs1qFNcvnixRuMD/58= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241126153609-8ac36bf977d9 h1:TGw2gTBKXjlKSfap0li+V/ExeAh61FEzX++yR22lUB0= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:7mIF0av5qJ4DSYGbNLBdzbf93wTdmRigWWMm3oroVPY= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241126153609-8ac36bf977d9 h1:oQYK8nw+ZOXA+QrSAj36wH3yDJZ76+zHYtX0Bp6n4/A= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:KEnQp4pgQ2zdMSYfbCYTs0YasvrxAVx2iekiuoJYjQM= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241126153609-8ac36bf977d9 h1:m7IfUlBsjaF9ExgZbjkTXlAg23OdwipxsDjsAZU3y0U= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:nEwZU7cFaFTfdGj+eeN32YEBiltU57p9/KQbku2JMMQ= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241126153609-8ac36bf977d9 h1:h4Ek+ZQI17+SW95eYOck3/dqolurtXeRYxKUMeNzarc= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:2FS5mTet6db56CX8fh1L3nSiRxhve6Bd6PzfWrKS2wY= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241126153609-8ac36bf977d9 h1:k0JcxRlIjNbz1kfMDgMpdZ0fuVX54e7oBbYXee6vFzk= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:B0udSKuoZLeZEw3o8rNmP9ONicaSjCf/RHx2oZ/7laQ= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241126153609-8ac36bf977d9 h1:x7THozW2D3w/KZWtwLBCMUFo309mGKBaoL8H6CmV468= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:IbbTVcuT16Q2Lj2vpV149HHSifXntLbpPhfS2olk77k= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241126153609-8ac36bf977d9 h1:Jgn7izqLArpJ/+YUScXjyFSHwT1yjMT2B9irMQvZg1A= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:2JzBKPD3iMErlEQIR8VO51am4tEQPcdIlxA/XIq5IZU= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241126153609-8ac36bf977d9 h1:a0r79Rl5cf8sWwWHMjDSkGy5Y3Y8f9/QjNIAeZx2AxQ= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:2BwqD0XSL1pZmCLwgq/euzvpZv15BkmMmvYnSauKX/s= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20241126153609-8ac36bf977d9 h1:iyyz0xPASO1R5SN0xk/K0+L1jofPhRCnvGhSatvSMNo= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:lp7qelVbS/vBUrZJYrCtuTcWqKh8iZEtJ2crnvNeutU= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241126153609-8ac36bf977d9 h1:OtmK+hL2ZfoT44Fg35s2JNC/4XgCzYJxAqn/GSdfGEo= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:CE0eNw5xUf4V+w5ZEuXgGNwwWlzcrV3oeh1oN8A7byM= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241126153609-8ac36bf977d9 h1:0ZffB1MUnZnRAFqlO7G/c9dqX9nxXQ8BFXRmi0lRX5k= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:mxCNug6Cazw294TvMT6XD1xfDQVKDX+TilBFrLCWA2I= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241126153609-8ac36bf977d9 h1:gQGzLS/Fadr1R1xa3bUhMZ9ypJZQcvxVmYt8qvTplGw= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:px0rSZFc5gdAy43OLtaK/W1n4Y2+KRb99/gw5e5Nfww= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241126153609-8ac36bf977d9 h1:wN34EyuTVblNT7u0vcQeLaFBdIAMniTZBNLQSOL/pFQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:J+qSAy6to4f2zpJj8XqNEVLGpsMFGGOM76vcIvlSlNw= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241126153609-8ac36bf977d9 h1:BVtPjL+wKRM6z/iFyAz9HmH2iXPLPcbCZaZKMAL3xEk= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:PLkWx8t0apdKUCXIErr4AllJhsY5pcqGLnKSStJb3bI= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241126153609-8ac36bf977d9 h1:VbBElH5OIDlC9rOsSqJ7JPNgFANR2/G0vvqS32gacoE= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:VkQi50CDzkd4QEa3owKply2MDujz8+HlHI5T9Oan0a4= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241126153609-8ac36bf977d9 h1:hWXQUI1Eroo7fmUtKrXrNUQBIPZO7WnNtDRxMQzfAmw= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:8RBMsB1Vyp8wJe4Hu02I7I6assk7uqz6F1j9ejG5pBw= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241126153609-8ac36bf977d9 h1:5lVVwKlpyWolo9NfHp0QN3XJVlHX9bo0DYZqPp295e0= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:ZZoyj+ofRlbElHajU0pqTd6fEinQQW/B+8RQpMJ7PlM= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241126153609-8ac36bf977d9 h1:MBJNf47nUnPu3WmYU7Lys+zIr5ARIBFVWCCgdzC5ULY= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:HswUBVS0yvgtBo2w71448AI5zlbPoj6TbNBG8UuApiI= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241126153609-8ac36bf977d9 h1:JGKxOvbkiDQp6Ut2X58TLUqQEb+fCATXQV3aKRAuV1U= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:HV9BaMyhMoKhNyiYho+m1DgNCu3Dcb4Y8DjeoJLDqE8= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241126153609-8ac36bf977d9 h1:Y/H/jJFm+BTZ1bskW8agVToKxjpWOnBHX8O6kGfpNhk= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:+OJMa3w16QOf8hZQu6Cq+pAt5nRnLWjcc1/ZGi+LTCk= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241126153609-8ac36bf977d9 h1:0KLkYYVzDkrygMVQAcCWY0rPzMVdcUMNRJyOYQbHhjg= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241126153609-8ac36bf977d9/go.mod h1:8dzwMjAspNQcVCgZf0OSd6l0xnQ12tc5YzToLrZKNkg= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241211151829-3c62f738ce74 h1:JOyCcFzzxvN6+amXvg1Bq9WCEzEPb0X5/2HbkSKB1CU= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241211151829-3c62f738ce74/go.mod h1:Lx6jvlmXgJVnqVDARguhONKwlnGahRSWUl57wJltaj8= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241211151829-3c62f738ce74 h1:elyhhDslh6CKQNQuX6WWUE+i3sy1uSz/168MEE6Cmw0= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241211151829-3c62f738ce74/go.mod h1:Ruk83+juksSdbZnOzlYZ1wivqvm59xcdKk/fqNwDznU= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241211151829-3c62f738ce74 h1:vkZ6mIJjybxRaQbqPMvdHtlet6M+hU1o2a0n6X78jMI= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241211151829-3c62f738ce74/go.mod h1:DESUJPjrTWS0YmETcifsHEKOo08a7J20LkYD8kSuPaI= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241211151829-3c62f738ce74 h1:YMnKqCm+Va1ZmTSqaXoDkL9vy6Vhu8ludvGw6MjrI+Q= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241211151829-3c62f738ce74/go.mod h1:Pe8Uicw828Quq+iQKnOG2MB0dZs1qFNcvnixRuMD/58= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241211151829-3c62f738ce74 h1:q7b94AJKskPC2rTwsN7cvQMrB/LPjuh632ET3s+XptI= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241211151829-3c62f738ce74/go.mod h1:7mIF0av5qJ4DSYGbNLBdzbf93wTdmRigWWMm3oroVPY= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241211151829-3c62f738ce74 h1:Im0OtWF4EVBrEL5sXN717og6Vl5JPGEMZKGEgfC+hy0= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241211151829-3c62f738ce74/go.mod h1:KEnQp4pgQ2zdMSYfbCYTs0YasvrxAVx2iekiuoJYjQM= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241211151829-3c62f738ce74 h1:+8S8FBV24Q39PXAIgUORA3rL6x9Xz0G7ITwv39dx8XM= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241211151829-3c62f738ce74/go.mod h1:nEwZU7cFaFTfdGj+eeN32YEBiltU57p9/KQbku2JMMQ= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241211151829-3c62f738ce74 h1:0492dxn4xpybVT3ZGDmtYyMxqQMCk4GyL7seKIr2a8I= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241211151829-3c62f738ce74/go.mod h1:2FS5mTet6db56CX8fh1L3nSiRxhve6Bd6PzfWrKS2wY= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241211151829-3c62f738ce74 h1:UHPFJ6tJQ00qApMKeMFcJnI07or9sLO3JiX7reov8r0= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241211151829-3c62f738ce74/go.mod h1:B0udSKuoZLeZEw3o8rNmP9ONicaSjCf/RHx2oZ/7laQ= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241211151829-3c62f738ce74 h1:Ip0uilDqwx4VUCcfZMwyv7DYSIsixzp+WR2AKVL/rVw= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241211151829-3c62f738ce74/go.mod h1:IbbTVcuT16Q2Lj2vpV149HHSifXntLbpPhfS2olk77k= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241211151829-3c62f738ce74 h1:1XyhVZNReEzEW7ko358Neibe+tRnT7rsP4cYjjzKBU8= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241211151829-3c62f738ce74/go.mod h1:2JzBKPD3iMErlEQIR8VO51am4tEQPcdIlxA/XIq5IZU= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241211151829-3c62f738ce74 h1:RsdIKJIk71CWz2FdFGIEcVz7WNVm2wdG8LtWYzJ5sP0= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241211151829-3c62f738ce74/go.mod h1:2BwqD0XSL1pZmCLwgq/euzvpZv15BkmMmvYnSauKX/s= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20241211151829-3c62f738ce74 h1:SUtpP72r2sbl5is/7G77czZM82lbsb0dq3i7z0FdbuI= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20241211151829-3c62f738ce74/go.mod h1:lp7qelVbS/vBUrZJYrCtuTcWqKh8iZEtJ2crnvNeutU= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241211151829-3c62f738ce74 h1:6oFSIZnHYmeEaaBAEPkhl/f1RuBUT8eDANfnYRS2eWs= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241211151829-3c62f738ce74/go.mod h1:CE0eNw5xUf4V+w5ZEuXgGNwwWlzcrV3oeh1oN8A7byM= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241211151829-3c62f738ce74 h1:XFUkr0u0F8BgYAUugLygD4QR/Uu/AvMrOoCtmvPjZl4= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241211151829-3c62f738ce74/go.mod h1:mxCNug6Cazw294TvMT6XD1xfDQVKDX+TilBFrLCWA2I= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241211151829-3c62f738ce74 h1:NbGAPpWOofkYLd17AtxNeXmCwWKoA5AXU5Yg2w/bL3s= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241211151829-3c62f738ce74/go.mod h1:px0rSZFc5gdAy43OLtaK/W1n4Y2+KRb99/gw5e5Nfww= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241211151829-3c62f738ce74 h1:8dCpLq17ZgcrLYc79I9FKgW6FkvPAgLhuj4La3/CH5E= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241211151829-3c62f738ce74/go.mod h1:J+qSAy6to4f2zpJj8XqNEVLGpsMFGGOM76vcIvlSlNw= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241211151829-3c62f738ce74 h1:jr29FnfRlnzjQtibWadysSiu5kkA4hL6mNTCiXMaiIs= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241211151829-3c62f738ce74/go.mod h1:PLkWx8t0apdKUCXIErr4AllJhsY5pcqGLnKSStJb3bI= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241211151829-3c62f738ce74 h1:2c/E5VEyRukSCK/on6bXbwfZ8X93tXLbrba+1kcRdkw= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241211151829-3c62f738ce74/go.mod h1:VkQi50CDzkd4QEa3owKply2MDujz8+HlHI5T9Oan0a4= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241211151829-3c62f738ce74 h1:KZVQU7ZRbVzp9cLcgesF1gemQL837mcHUB1Phc9vNfc= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241211151829-3c62f738ce74/go.mod h1:8RBMsB1Vyp8wJe4Hu02I7I6assk7uqz6F1j9ejG5pBw= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241211151829-3c62f738ce74 h1:EruIkVJ/vUlkc16kU08x9fgqEn2X0KhFyOZKdnyC8cU= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241211151829-3c62f738ce74/go.mod h1:ZZoyj+ofRlbElHajU0pqTd6fEinQQW/B+8RQpMJ7PlM= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241211151829-3c62f738ce74 h1:PuSnx3LDn2/l14KR8TFNyxU18fBxZmNiJTM9AKaaJdo= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241211151829-3c62f738ce74/go.mod h1:HswUBVS0yvgtBo2w71448AI5zlbPoj6TbNBG8UuApiI= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241211151829-3c62f738ce74 h1:MUkZV7MJ1UJ72Qj0wOs+Eo0gXZtwmxfYHzOcVsPO5go= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241211151829-3c62f738ce74/go.mod h1:HV9BaMyhMoKhNyiYho+m1DgNCu3Dcb4Y8DjeoJLDqE8= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241211151829-3c62f738ce74 h1:HXBghZJbA0ALVB4ni9u0+OQC46bRntKXx1XhgKhWQOI= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241211151829-3c62f738ce74/go.mod h1:+OJMa3w16QOf8hZQu6Cq+pAt5nRnLWjcc1/ZGi+LTCk= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241211151829-3c62f738ce74 h1:lz26U/qarUZxICC+bj1wTs5jdbdEX4HRRQFsGWUT4TI= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241211151829-3c62f738ce74/go.mod h1:8dzwMjAspNQcVCgZf0OSd6l0xnQ12tc5YzToLrZKNkg= github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060 h1:jiDC7d8d+jmjv2WfiMY0+Uf55q11MGyYkGGqXnfqWTU= github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060/go.mod h1:9B1MYPoLtP9tqjWxcbUNVpwxy68zOH/3EIP6c31dAM0= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241008152707-25bf9f14db44 h1:dKUAGq29JBk2oRn955gnnz3sG/UhlkUKh1ISleLiews= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241008152707-25bf9f14db44/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= -github.com/openshift/route-controller-manager v0.0.0-20241204202524-c625ae02c147 h1:5UUmNMDu/dIVlo9+suYELN2wMaf7LPlVBmVldkxRuA0= -github.com/openshift/route-controller-manager v0.0.0-20241204202524-c625ae02c147/go.mod h1:O7hb1v/ChR4wqZ4ikcP3cEq8UMceeFhbFwlj/O1PcM0= +github.com/openshift/route-controller-manager v0.0.0-20241212133037-4a534edbd515 h1:LL1+VHNNV4XD7OMt/TjlIOGiptjOxA5RAFRTj0ajHR4= +github.com/openshift/route-controller-manager v0.0.0-20241212133037-4a534edbd515/go.mod h1:O7hb1v/ChR4wqZ4ikcP3cEq8UMceeFhbFwlj/O1PcM0= github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index 842a11e291..0f6415ae4a 100644 --- a/packaging/crio.conf.d/10-microshift_amd64.conf +++ b/packaging/crio.conf.d/10-microshift_amd64.conf @@ -25,6 +25,6 @@ plugin_dirs = [ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ce8be7e248742136892ccadc709209868b5c370eecca036798e5be9742f6edb1" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9baab801b7c1371ecebdbb4570228756e056689e7f834fbfc597df4c8eb1e3fd" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf index c1821e6415..b10af077b4 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/packaging/crio.conf.d/10-microshift_arm64.conf @@ -25,6 +25,6 @@ plugin_dirs = [ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:95400aeea06aabf48ec24cb9fc7d048d7b6b5d97f276613d2878821d7095ef35" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:618a701c092403624182c4969c1a6a2f4aadd26c7b50e46c7fbe7175da0f3575" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 48edc6c0bb..460747176b 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,9 +1,71 @@ -- oc image-arm64 6e588cf64c6575fa0b862a9d497b92687f9d0d6e to 02503fe1c31903252e45f50f55922ef3f11c1360 +- api embedded-component 831aaaf072a90c489eca2392f9895015e92aee2c to 1a7b90faeadfea580606b4d24ad6e290eaf0fefb + - fdd0236a 2024-12-11T15:29:45+01:00 alert-relabel list should not be a pointer + - fd5b4f32 2024-12-11T10:04:02+01:00 Insights types - unify duration validation + - e566bcbf 2024-12-10T12:13:59-05:00 feat: add HighlyAvailableArbiter control plane topology as feature for techpreview + - 083203ca 2024-12-09T21:08:31+05:30 Add KMSEncryptionProvider FeatureGate + generated files from `PROTO_OPTIONAL="true" make update` + +- cluster-dns-operator embedded-component 208d50c1a5e0aaeb991366daa749abdffa803224 to 0a9deeea4c335e259747b35267811a4a040289fd + - 87425f0 2024-12-05T00:36:48+00:00 Updating ose-cluster-dns-operator-container image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/a39508c86497b4e5e463d7b2c78e51e577be9e7d/images/ose-cluster-dns-operator.yml + +- cluster-kube-apiserver-operator embedded-component d429a315d8073b8f5d7b122c895c6d40ddd09662 to 8ddb15d01947f35a1f30eac102fa466857beb17a + - e8adb5c 2024-12-10T17:04:52-03:00 Remove check for duplicate groups for FeatureGates + - dea2e4f 2024-12-10T13:11:21-03:00 Add resource.k8s.io/v1beta1 for Kubernetes 1.32 + +- cluster-kube-controller-manager-operator embedded-component ce2c021f23f5d178da6ea35d98a229137e5a81c4 to c8341b6b72ad221f16a5276729138adf9a347abe + - 7ef78a3 2024-12-06T16:35:41+01:00 bump go to 1.23 + - 1ee94bc 2024-12-05T07:17:57+00:00 Updating ose-cluster-kube-controller-manager-operator-container image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/a39508c86497b4e5e463d7b2c78e51e577be9e7d/images/ose-cluster-kube-controller-manager-operator.yml + +- cluster-network-operator embedded-component eff7f1d30de00064d4f257cf312797576cb34a2f to de93ea6e09e9afda32bc0a95a08b7b703ce31985 + - 553516e 2024-12-11T18:35:09+01:00 Skip including default crypto policies to avoid authby issue + - 41ab2eb 2024-12-10T19:26:25+01:00 Dockerfile: bump the base images + - 413fc4b 2024-12-09T11:06:27+01:00 Bump the openshift api version + - 97d3f6e 2024-12-09T10:40:11+01:00 Run go mod vendor + - b25b8e5 2024-11-27T11:17:26+01:00 Cleanup ipsec entries from sidecar container + - b5a8e2f 2024-11-27T11:17:26+01:00 Remove ip xfrm state when IPsec is disabled + +- cluster-openshift-controller-manager-operator embedded-component 08c64512c055ae246b3a14f6d1088d39988c44fe to 0b04b66c041c19abc6a04a31fc5b2688249eb0de + - 8df6510 2024-12-05T19:01:57+00:00 Updating ose-cluster-openshift-controller-manager-operator-container image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/a39508c86497b4e5e463d7b2c78e51e577be9e7d/images/ose-cluster-openshift-controller-manager-operator.yml + +- cluster-policy-controller embedded-component 5fd852525909ce6eab52972ba9ce8fcf56528eb9 to 327d3cbd82fd013a9d5d5733eb04cc0dcd97aec5 + - 2607098 2024-12-06T16:32:08+01:00 bump go to 1.23 + - 89fe225 2024-12-06T16:31:50+01:00 Updating ose-cluster-policy-controller-container image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/a39508c86497b4e5e463d7b2c78e51e577be9e7d/images/cluster-policy-controller.yml + - 75c251a 2024-12-06T16:26:35+01:00 pin dependencies for k8s.io/kubernetes + +- kubernetes embedded-component 8ac36bf977d93ee5db979a4bda774d4a0f3b3367 to 3c62f738ce74a624d46b4f73f25d6c15b3a80a2b + - 6fded69bb 2024-12-06T14:53:42+01:00 UPSTREAM: : require configuration file enablement + - 234263863 2024-12-06T10:51:56+01:00 UPSTREAM: 126750: update comments + - 691924b19 2024-12-06T10:51:56+01:00 UPSTREAM: 126750: Add takeByTopologyUnCoreCachePacked if policy option align-cpus-by-uncorecache is enabled. Adding new function to evaluate uncore cache id. Reverse allocation logic. Implement preferAlignByUncorecache within TakeByTopologyNUMAPacked, along with new test cases. + +- machine-config-operator embedded-component 67789532e4569ece95eb98fed1dde03409f065e9 to eacd5926aa87e1fcc1c1208349761320fa2173d0 + - 4422f17d 2024-12-11T23:02:08-05:00 update timeouts & improve debuggability of ocl e2e tests + - 09f90926 2024-12-11T13:50:16-05:00 daemon: preserve logs on shutdown + - aba18f36 2024-12-10T19:13:00-05:00 reconciler: only build mosb's currently targeted by the MCP osbuildcontroller_test: Unit testing for cascading failure + - a49c33d9 2024-12-09T20:09:26-05:00 daemon: add nil check for annotation fetching + - f6a5d80a 2024-12-06T10:20:23-05:00 trying to wait for sub-contorllers + +- operator-framework-olm embedded-component 829e5f64c12269fe2a7370a5a83ab08c0111c6e8 to 63ceefbd13ec2d5f21d117b9cac7112cd315f70d + - 9151a1ea 2024-12-12T12:23:16+01:00 Remove m1kola from owners + - 32567fed 2024-12-10T00:05:00+00:00 CRD upgrade existing CR validation fix (#3442) + - da84cec8 2024-12-04T05:08:06+00:00 Updating operator-registry-container image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/2ea3e6158c93ca104b9d59fd58a71536fa01fb2d/images/operator-registry.yml + - 299c40ab 2024-12-04T00:22:22+00:00 Updating operator-lifecycle-manager-container image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/2ea3e6158c93ca104b9d59fd58a71536fa01fb2d/images/operator-lifecycle-manager.yml + +- route-controller-manager embedded-component c625ae02c1475330182b9ace5a051f2bf3ab7095 to 4a534edbd515d370ff5fe5bb9f2e01e1622e72af + - f231d77 2024-12-12T11:44:20+00:00 Updated OWNERS file to reflect current team + +- oc image-amd64 c724dcbbd0e2fc80320ee3a035e88831fe713a4b to 8295ffc32fa52816a6605aff3fc322aa2aa8de7e - 398f6f25 2024-12-11T00:18:01-05:00 OCPBUGS-45991: Mark --report and --pxe flags as experimental + - 0dd21ddf 2024-12-06T00:49:00+01:00 OCPBUGS-19824: release new: replace 0.0.1-snapshot more + - cce3f5d0 2024-12-03T05:05:10-05:00 fix oc adm node-image create --pxe command to copy the correct artifacts - b3fb741c 2023-09-13T10:56:58-07:00 pkg/cli/admin/release/extract_tools: Enable ImageRegistry, etc. on 4.13-to-4.14 -- kubernetes image-arm64 8ac36bf977d93ee5db979a4bda774d4a0f3b3367 to 3c62f738ce74a624d46b4f73f25d6c15b3a80a2b +- ovn-kubernetes image-amd64 97a2e6b7e17fca030dcda1b1edd884ef8c9b46dd to c713669ede0fb5663e72ad055238037ae2e17938 + - 1bc93172 2024-12-10T13:50:43+08:00 Bump OVS version to 3.4.0-18 + +- kubernetes image-amd64 8ac36bf977d93ee5db979a4bda774d4a0f3b3367 to 3c62f738ce74a624d46b4f73f25d6c15b3a80a2b - 6fded69bb 2024-12-06T14:53:42+01:00 UPSTREAM: : require configuration file enablement - 234263863 2024-12-06T10:51:56+01:00 UPSTREAM: 126750: update comments - 691924b19 2024-12-06T10:51:56+01:00 UPSTREAM: 126750: Add takeByTopologyUnCoreCachePacked if policy option align-cpus-by-uncorecache is enabled. Adding new function to evaluate uncore cache id. Reverse allocation logic. Implement preferAlignByUncorecache within TakeByTopologyNUMAPacked, along with new test cases. +- oc image-arm64 02503fe1c31903252e45f50f55922ef3f11c1360 to 8295ffc32fa52816a6605aff3fc322aa2aa8de7e + - 0dd21ddf 2024-12-06T00:49:00+01:00 OCPBUGS-19824: release new: replace 0.0.1-snapshot more + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 4c0c74a84d..be69fb9703 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,32 +1,32 @@ -https://github.com/openshift/api embedded-component 831aaaf072a90c489eca2392f9895015e92aee2c +https://github.com/openshift/api embedded-component 1a7b90faeadfea580606b4d24ad6e290eaf0fefb https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 5fc8793c990da672a72a70331badbbcbbf35f971 -https://github.com/openshift/cluster-dns-operator embedded-component 208d50c1a5e0aaeb991366daa749abdffa803224 +https://github.com/openshift/cluster-dns-operator embedded-component 0a9deeea4c335e259747b35267811a4a040289fd https://github.com/openshift/cluster-ingress-operator embedded-component 8be174945db79b0660bd0fd21ed279ab7b6aafbf -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component d429a315d8073b8f5d7b122c895c6d40ddd09662 -https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component ce2c021f23f5d178da6ea35d98a229137e5a81c4 +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 8ddb15d01947f35a1f30eac102fa466857beb17a +https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component c8341b6b72ad221f16a5276729138adf9a347abe https://github.com/openshift/cluster-kube-scheduler-operator embedded-component b1cc4471e2f6c5dc81b2b9471f4634f1ecdb88b4 -https://github.com/openshift/cluster-network-operator embedded-component eff7f1d30de00064d4f257cf312797576cb34a2f -https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 08c64512c055ae246b3a14f6d1088d39988c44fe -https://github.com/openshift/cluster-policy-controller embedded-component 5fd852525909ce6eab52972ba9ce8fcf56528eb9 +https://github.com/openshift/cluster-network-operator embedded-component de93ea6e09e9afda32bc0a95a08b7b703ce31985 +https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 0b04b66c041c19abc6a04a31fc5b2688249eb0de +https://github.com/openshift/cluster-policy-controller embedded-component 327d3cbd82fd013a9d5d5733eb04cc0dcd97aec5 https://github.com/openshift/csi-external-snapshotter embedded-component 8ebf69cb405478df19e31d6daded8834876e7871 https://github.com/openshift/etcd embedded-component 914783cae63a13b90971c65e28c3349c1ecb7dfb -https://github.com/openshift/kubernetes embedded-component 8ac36bf977d93ee5db979a4bda774d4a0f3b3367 +https://github.com/openshift/kubernetes embedded-component 3c62f738ce74a624d46b4f73f25d6c15b3a80a2b https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 50d17147f15d8b216e7c41f91d1bd7d307ca8c73 -https://github.com/openshift/machine-config-operator embedded-component 67789532e4569ece95eb98fed1dde03409f065e9 +https://github.com/openshift/machine-config-operator embedded-component eacd5926aa87e1fcc1c1208349761320fa2173d0 https://github.com/openshift/openshift-controller-manager embedded-component 3ebe2f4f3900d6a3748ef0faf3535f635dbf7d11 -https://github.com/openshift/operator-framework-olm embedded-component 829e5f64c12269fe2a7370a5a83ab08c0111c6e8 -https://github.com/openshift/route-controller-manager embedded-component c625ae02c1475330182b9ace5a051f2bf3ab7095 +https://github.com/openshift/operator-framework-olm embedded-component 63ceefbd13ec2d5f21d117b9cac7112cd315f70d +https://github.com/openshift/route-controller-manager embedded-component 4a534edbd515d370ff5fe5bb9f2e01e1622e72af https://github.com/openshift/service-ca-operator embedded-component 1f7d6472fea332fc307d9c8911f8c3cf57347755 -https://github.com/openshift/oc image-amd64 c724dcbbd0e2fc80320ee3a035e88831fe713a4b +https://github.com/openshift/oc image-amd64 8295ffc32fa52816a6605aff3fc322aa2aa8de7e https://github.com/openshift/coredns image-amd64 7a1451db77a68161d58af9b6ca2c9388d578310a https://github.com/openshift/csi-external-snapshotter image-amd64 8ebf69cb405478df19e31d6daded8834876e7871 https://github.com/openshift/csi-external-snapshotter image-amd64 8ebf69cb405478df19e31d6daded8834876e7871 https://github.com/openshift/router image-amd64 be831fa5808df9facf7df4f5cdbf2472c504b60d https://github.com/openshift/kube-rbac-proxy image-amd64 23f96a23777c1b5fcdb587602c156903c32fe52c -https://github.com/openshift/ovn-kubernetes image-amd64 97a2e6b7e17fca030dcda1b1edd884ef8c9b46dd -https://github.com/openshift/kubernetes image-amd64 8ac36bf977d93ee5db979a4bda774d4a0f3b3367 +https://github.com/openshift/ovn-kubernetes image-amd64 c713669ede0fb5663e72ad055238037ae2e17938 +https://github.com/openshift/kubernetes image-amd64 3c62f738ce74a624d46b4f73f25d6c15b3a80a2b https://github.com/openshift/service-ca-operator image-amd64 1f7d6472fea332fc307d9c8911f8c3cf57347755 -https://github.com/openshift/oc image-arm64 02503fe1c31903252e45f50f55922ef3f11c1360 +https://github.com/openshift/oc image-arm64 8295ffc32fa52816a6605aff3fc322aa2aa8de7e https://github.com/openshift/coredns image-arm64 7a1451db77a68161d58af9b6ca2c9388d578310a https://github.com/openshift/csi-external-snapshotter image-arm64 8ebf69cb405478df19e31d6daded8834876e7871 https://github.com/openshift/csi-external-snapshotter image-arm64 8ebf69cb405478df19e31d6daded8834876e7871 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 70a65c1bfa..120b77549d 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.19.0-0.nightly-2024-12-10-040415" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2024-12-12-185745" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2024-12-13-083421" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2024-12-13-065745" diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/cpu_assignment.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/cpu_assignment.go index 08622568ab..b4abf37124 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/cpu_assignment.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/cpu_assignment.go @@ -118,6 +118,17 @@ func (n *numaFirst) takeFullSecondLevel() { n.acc.takeFullSockets() } +// Sort the UncoreCaches within the NUMA nodes. +func (a *cpuAccumulator) sortAvailableUncoreCaches() []int { + var result []int + for _, numa := range a.sortAvailableNUMANodes() { + uncore := a.details.UncoreInNUMANodes(numa).UnsortedList() + a.sort(uncore, a.details.CPUsInUncoreCaches) + result = append(result, uncore...) + } + return result +} + // If NUMA nodes are higher in the memory hierarchy than sockets, then just // sort the NUMA nodes directly, and return them. func (n *numaFirst) sortAvailableNUMANodes() []int { @@ -318,6 +329,12 @@ func (a *cpuAccumulator) isSocketFree(socketID int) bool { return a.details.CPUsInSockets(socketID).Size() == a.topo.CPUsPerSocket() } +// Returns true if the supplied UnCoreCache is fully available, +// "fully available" means that all the CPUs in it are free. +func (a *cpuAccumulator) isUncoreCacheFree(uncoreID int) bool { + return a.details.CPUsInUncoreCaches(uncoreID).Size() == a.topo.CPUDetails.CPUsInUncoreCaches(uncoreID).Size() +} + // Returns true if the supplied core is fully available in `a.details`. // "fully available" means that all the CPUs in it are free. func (a *cpuAccumulator) isCoreFree(coreID int) bool { @@ -346,6 +363,17 @@ func (a *cpuAccumulator) freeSockets() []int { return free } +// Returns free UncoreCache IDs as a slice sorted by sortAvailableUnCoreCache(). +func (a *cpuAccumulator) freeUncoreCache() []int { + free := []int{} + for _, uncore := range a.sortAvailableUncoreCaches() { + if a.isUncoreCacheFree(uncore) { + free = append(free, uncore) + } + } + return free +} + // Returns free core IDs as a slice sorted by sortAvailableCores(). func (a *cpuAccumulator) freeCores() []int { free := []int{} @@ -519,6 +547,62 @@ func (a *cpuAccumulator) takeFullSockets() { } } +func (a *cpuAccumulator) takeFullUncore() { + for _, uncore := range a.freeUncoreCache() { + cpusInUncore := a.topo.CPUDetails.CPUsInUncoreCaches(uncore) + if !a.needsAtLeast(cpusInUncore.Size()) { + continue + } + klog.V(4).InfoS("takeFullUncore: claiming uncore", "uncore", uncore) + a.take(cpusInUncore) + } +} + +func (a *cpuAccumulator) takePartialUncore(uncoreID int) { + numCoresNeeded := a.numCPUsNeeded / a.topo.CPUsPerCore() + + // determine the N number of free cores (physical cpus) within the UncoreCache, then + // determine the M number of free cpus (virtual cpus) that correspond with the free cores + freeCores := a.details.CoresNeededInUncoreCache(numCoresNeeded, uncoreID) + freeCPUs := a.details.CPUsInCores(freeCores.UnsortedList()...) + + // claim the cpus if the free cpus within the UncoreCache can satisfy the needed cpus + claimed := (a.numCPUsNeeded == freeCPUs.Size()) + klog.V(4).InfoS("takePartialUncore: trying to claim partial uncore", + "uncore", uncoreID, + "claimed", claimed, + "needed", a.numCPUsNeeded, + "cores", freeCores.String(), + "cpus", freeCPUs.String()) + if !claimed { + return + + } + a.take(freeCPUs) +} + +// First try to take full UncoreCache, if available and need is at least the size of the UncoreCache group. +// Second try to take the partial UncoreCache if available and the request size can fit w/in the UncoreCache. +func (a *cpuAccumulator) takeUncoreCache() { + numCPUsInUncore := a.topo.CPUsPerUncore() + for _, uncore := range a.sortAvailableUncoreCaches() { + // take full UncoreCache if the CPUs needed is greater than free UncoreCache size + if a.needsAtLeast(numCPUsInUncore) { + a.takeFullUncore() + } + + if a.isSatisfied() { + return + } + + // take partial UncoreCache if the CPUs needed is less than free UncoreCache size + a.takePartialUncore(uncore) + if a.isSatisfied() { + return + } + } +} + func (a *cpuAccumulator) takeFullCores() { for _, core := range a.freeCores() { cpusInCore := a.topo.CPUDetails.CPUsInCores(core) @@ -637,6 +721,14 @@ func (a *cpuAccumulator) iterateCombinations(n []int, k int, f func([]int) LoopC // or the remaining number of CPUs to take after having taken full sockets and NUMA nodes is less // than a whole NUMA node, the function tries to take whole physical cores (cores). // +// If `PreferAlignByUncoreCache` is enabled, the function will try to optimally assign Uncorecaches. +// If `numCPUs` is larger than or equal to the total number of CPUs in a Uncorecache, and there are +// free (i.e. all CPUs within the Uncorecache are free) Uncorecaches, the function takes as many entire +// cores from free Uncorecaches as possible. If/Once `numCPUs` is smaller than the total number of +// CPUs in a free Uncorecache, the function scans each Uncorecache index in numerical order to assign +// cores that will fit within the Uncorecache. If `numCPUs` cannot fit within any Uncorecache, the +// function tries to take whole physical cores. +// // If `numCPUs` is bigger than the total number of CPUs in a core, and there are // free (i.e. all CPUs in them are free) cores, the function takes as many entire free cores as possible. // The cores are taken from one socket at a time, and the sockets are considered by @@ -658,7 +750,7 @@ func (a *cpuAccumulator) iterateCombinations(n []int, k int, f func([]int) LoopC // the least amount of free CPUs to the one with the highest amount of free CPUs (i.e. in ascending // order of free CPUs). For any NUMA node, the cores are selected from the ones in the socket with // the least amount of free CPUs to the one with the highest amount of free CPUs. -func takeByTopologyNUMAPacked(topo *topology.CPUTopology, availableCPUs cpuset.CPUSet, numCPUs int, cpuSortingStrategy CPUSortingStrategy) (cpuset.CPUSet, error) { +func takeByTopologyNUMAPacked(topo *topology.CPUTopology, availableCPUs cpuset.CPUSet, numCPUs int, cpuSortingStrategy CPUSortingStrategy, preferAlignByUncoreCache bool) (cpuset.CPUSet, error) { acc := newCPUAccumulator(topo, availableCPUs, numCPUs, cpuSortingStrategy) if acc.isSatisfied() { return acc.result, nil @@ -681,7 +773,17 @@ func takeByTopologyNUMAPacked(topo *topology.CPUTopology, availableCPUs cpuset.C return acc.result, nil } - // 2. Acquire whole cores, if available and the container requires at least + // 2. If PreferAlignByUncoreCache is enabled, acquire whole UncoreCaches + // if available and the container requires at least a UncoreCache's-worth + // of CPUs. Otherwise, acquire CPUs from the least amount of UncoreCaches. + if preferAlignByUncoreCache { + acc.takeUncoreCache() + if acc.isSatisfied() { + return acc.result, nil + } + } + + // 3. Acquire whole cores, if available and the container requires at least // a core's-worth of CPUs. // If `CPUSortingStrategySpread` is specified, skip taking the whole core. if cpuSortingStrategy != CPUSortingStrategySpread { @@ -691,7 +793,7 @@ func takeByTopologyNUMAPacked(topo *topology.CPUTopology, availableCPUs cpuset.C } } - // 3. Acquire single threads, preferring to fill partially-allocated cores + // 4. Acquire single threads, preferring to fill partially-allocated cores // on the same sockets as the whole cores we have already taken in this // allocation. acc.takeRemainingCPUs() @@ -769,8 +871,10 @@ func takeByTopologyNUMADistributed(topo *topology.CPUTopology, availableCPUs cpu // If the number of CPUs requested cannot be handed out in chunks of // 'cpuGroupSize', then we just call out the packing algorithm since we // can't distribute CPUs in this chunk size. + // PreferAlignByUncoreCache feature not implemented here yet and set to false. + // Support for PreferAlignByUncoreCache to be done at beta release. if (numCPUs % cpuGroupSize) != 0 { - return takeByTopologyNUMAPacked(topo, availableCPUs, numCPUs, cpuSortingStrategy) + return takeByTopologyNUMAPacked(topo, availableCPUs, numCPUs, cpuSortingStrategy, false) } // Otherwise build an accumulator to start allocating CPUs from. @@ -953,7 +1057,7 @@ func takeByTopologyNUMADistributed(topo *topology.CPUTopology, availableCPUs cpu // size 'cpuGroupSize' from 'bestCombo'. distribution := (numCPUs / len(bestCombo) / cpuGroupSize) * cpuGroupSize for _, numa := range bestCombo { - cpus, _ := takeByTopologyNUMAPacked(acc.topo, acc.details.CPUsInNUMANodes(numa), distribution, cpuSortingStrategy) + cpus, _ := takeByTopologyNUMAPacked(acc.topo, acc.details.CPUsInNUMANodes(numa), distribution, cpuSortingStrategy, false) acc.take(cpus) } @@ -968,7 +1072,7 @@ func takeByTopologyNUMADistributed(topo *topology.CPUTopology, availableCPUs cpu if acc.details.CPUsInNUMANodes(numa).Size() < cpuGroupSize { continue } - cpus, _ := takeByTopologyNUMAPacked(acc.topo, acc.details.CPUsInNUMANodes(numa), cpuGroupSize, cpuSortingStrategy) + cpus, _ := takeByTopologyNUMAPacked(acc.topo, acc.details.CPUsInNUMANodes(numa), cpuGroupSize, cpuSortingStrategy, false) acc.take(cpus) remainder -= cpuGroupSize } @@ -992,5 +1096,5 @@ func takeByTopologyNUMADistributed(topo *topology.CPUTopology, availableCPUs cpu // If we never found a combination of NUMA nodes that we could properly // distribute CPUs across, fall back to the packing algorithm. - return takeByTopologyNUMAPacked(topo, availableCPUs, numCPUs, cpuSortingStrategy) + return takeByTopologyNUMAPacked(topo, availableCPUs, numCPUs, cpuSortingStrategy, false) } diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/policy_options.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/policy_options.go index ac6d15ed0d..b3e3e10bd4 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/policy_options.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/policy_options.go @@ -22,9 +22,11 @@ import ( "k8s.io/apimachinery/pkg/util/sets" utilfeature "k8s.io/apiserver/pkg/util/feature" + "k8s.io/klog/v2" kubefeatures "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/topology" "k8s.io/kubernetes/pkg/kubelet/cm/topologymanager" + "k8s.io/kubernetes/pkg/kubelet/llcalign" ) // Names of the options, as part of the user interface. @@ -33,6 +35,7 @@ const ( DistributeCPUsAcrossNUMAOption string = "distribute-cpus-across-numa" AlignBySocketOption string = "align-by-socket" DistributeCPUsAcrossCoresOption string = "distribute-cpus-across-cores" + PreferAlignByUnCoreCacheOption string = "prefer-align-cpus-by-uncorecache" ) var ( @@ -40,6 +43,7 @@ var ( DistributeCPUsAcrossNUMAOption, AlignBySocketOption, DistributeCPUsAcrossCoresOption, + PreferAlignByUnCoreCacheOption, ) betaOptions = sets.New[string]( FullPCPUsOnlyOption, @@ -54,6 +58,14 @@ func CheckPolicyOptionAvailable(option string) error { return fmt.Errorf("unknown CPU Manager Policy option: %q", option) } + // must override the base feature gate check. Relevant only for alpha (disabled by default). + // for beta options are enabled by default and we totally want to keep the possibility to + // disable them explicitly. + if alphaOptions.Has(option) && checkPolicyOptionHasEnablementFile(option) { + // note that we override the decision and shortcut exit with success + // all other cases exit early with failure. + return nil + } if alphaOptions.Has(option) && !utilfeature.DefaultFeatureGate.Enabled(kubefeatures.CPUManagerPolicyAlphaOptions) { return fmt.Errorf("CPU Manager Policy Alpha-level Options not enabled, but option %q provided", option) } @@ -86,6 +98,9 @@ type StaticPolicyOptions struct { // cpus (HT) on different physical core. // This is a preferred policy so do not throw error if they have to packed in one physical core. DistributeCPUsAcrossCores bool + // Flag that makes best-effort to align CPUs to a uncorecache boundary + // As long as there are CPUs available, pods will be admitted if the condition is not met. + PreferAlignByUncoreCacheOption bool } // NewStaticPolicyOptions creates a StaticPolicyOptions struct from the user configuration. @@ -121,7 +136,12 @@ func NewStaticPolicyOptions(policyOptions map[string]string) (StaticPolicyOption return opts, fmt.Errorf("bad value for option %q: %w", name, err) } opts.DistributeCPUsAcrossCores = optValue - + case PreferAlignByUnCoreCacheOption: + optValue, err := strconv.ParseBool(value) + if err != nil { + return opts, fmt.Errorf("bad value for option %q: %w", name, err) + } + opts.PreferAlignByUncoreCacheOption = optValue default: // this should never be reached, we already detect unknown options, // but we keep it as further safety. @@ -138,6 +158,14 @@ func NewStaticPolicyOptions(policyOptions map[string]string) (StaticPolicyOption return opts, fmt.Errorf("static policy options %s and %s can not be used at the same time", DistributeCPUsAcrossNUMAOption, DistributeCPUsAcrossCoresOption) } + if opts.PreferAlignByUncoreCacheOption && opts.DistributeCPUsAcrossCores { + return opts, fmt.Errorf("static policy options %s and %s can not be used at the same time", PreferAlignByUnCoreCacheOption, DistributeCPUsAcrossCoresOption) + } + + if opts.PreferAlignByUncoreCacheOption && opts.DistributeCPUsAcrossNUMA { + return opts, fmt.Errorf("static policy options %s and %s can not be used at the same time", PreferAlignByUnCoreCacheOption, DistributeCPUsAcrossNUMAOption) + } + return opts, nil } @@ -155,3 +183,13 @@ func ValidateStaticPolicyOptions(opts StaticPolicyOptions, topology *topology.CP } return nil } + +func checkPolicyOptionHasEnablementFile(option string) bool { + switch option { + case PreferAlignByUnCoreCacheOption: + val := llcalign.IsEnabled() + klog.InfoS("policy option enablement file check", "option", option, "enablementFile", val) + return val + } + return false +} diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/policy_static.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/policy_static.go index 2d40c5cc2b..899c4dd7de 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/policy_static.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/policy_static.go @@ -510,7 +510,8 @@ func (p *staticPolicy) takeByTopology(availableCPUs cpuset.CPUSet, numCPUs int) } return takeByTopologyNUMADistributed(p.topology, availableCPUs, numCPUs, cpuGroupSize, cpuSortingStrategy) } - return takeByTopologyNUMAPacked(p.topology, availableCPUs, numCPUs, cpuSortingStrategy) + + return takeByTopologyNUMAPacked(p.topology, availableCPUs, numCPUs, cpuSortingStrategy, p.options.PreferAlignByUncoreCacheOption) } func (p *staticPolicy) GetTopologyHints(s state.State, pod *v1.Pod, container *v1.Container) map[string][]topologymanager.TopologyHint { diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/topology/topology.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/topology/topology.go index 62d91a5dee..18b3823366 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/topology/topology.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/topology/topology.go @@ -36,12 +36,14 @@ type CPUDetails map[int]CPUInfo // Core - physical CPU, cadvisor - Core // Socket - socket, cadvisor - Socket // NUMA Node - NUMA cell, cadvisor - Node +// UncoreCache - Split L3 Cache Topology, cadvisor type CPUTopology struct { - NumCPUs int - NumCores int - NumSockets int - NumNUMANodes int - CPUDetails CPUDetails + NumCPUs int + NumCores int + NumUncoreCache int + NumSockets int + NumNUMANodes int + CPUDetails CPUDetails } // CPUsPerCore returns the number of logical CPUs are associated with @@ -62,6 +64,15 @@ func (topo *CPUTopology) CPUsPerSocket() int { return topo.NumCPUs / topo.NumSockets } +// CPUsPerUncore returns the number of logicial CPUs that are associated with +// each UncoreCache +func (topo *CPUTopology) CPUsPerUncore() int { + if topo.NumUncoreCache == 0 { + return 0 + } + return topo.NumCPUs / topo.NumUncoreCache +} + // CPUCoreID returns the physical core ID which the given logical CPU // belongs to. func (topo *CPUTopology) CPUCoreID(cpu int) (int, error) { @@ -90,11 +101,12 @@ func (topo *CPUTopology) CPUNUMANodeID(cpu int) (int, error) { return info.NUMANodeID, nil } -// CPUInfo contains the NUMA, socket, and core IDs associated with a CPU. +// CPUInfo contains the NUMA, socket, UncoreCache and core IDs associated with a CPU. type CPUInfo struct { - NUMANodeID int - SocketID int - CoreID int + NUMANodeID int + SocketID int + CoreID int + UncoreCacheID int } // KeepOnly returns a new CPUDetails object with only the supplied cpus. @@ -108,6 +120,67 @@ func (d CPUDetails) KeepOnly(cpus cpuset.CPUSet) CPUDetails { return result } +// UncoreCaches returns all the uncorecache Id (L3 Index) associated with the CPUs in this CPUDetails +func (d CPUDetails) UncoreCaches() cpuset.CPUSet { + var numUnCoreIDs []int + for _, info := range d { + numUnCoreIDs = append(numUnCoreIDs, info.UncoreCacheID) + } + return cpuset.New(numUnCoreIDs...) +} + +// UnCoresInNUMANodes returns all of the uncore IDs associated with the given +// NUMANode IDs in this CPUDetails. +func (d CPUDetails) UncoreInNUMANodes(ids ...int) cpuset.CPUSet { + var unCoreIDs []int + for _, id := range ids { + for _, info := range d { + if info.NUMANodeID == id { + unCoreIDs = append(unCoreIDs, info.UncoreCacheID) + } + } + } + return cpuset.New(unCoreIDs...) +} + +// CoresNeededInUncoreCache returns either the full list of all available unique core IDs associated with the given +// UnCoreCache IDs in this CPUDetails or subset that matches the ask. +func (d CPUDetails) CoresNeededInUncoreCache(numCoresNeeded int, ids ...int) cpuset.CPUSet { + coreIDs := d.coresInUncoreCache(ids...) + if coreIDs.Size() <= numCoresNeeded { + return coreIDs + } + tmpCoreIDs := coreIDs.List() + return cpuset.New(tmpCoreIDs[:numCoresNeeded]...) +} + +// Helper function that just gets the cores +func (d CPUDetails) coresInUncoreCache(ids ...int) cpuset.CPUSet { + var coreIDs []int + for _, id := range ids { + for _, info := range d { + if info.UncoreCacheID == id { + coreIDs = append(coreIDs, info.CoreID) + } + } + } + return cpuset.New(coreIDs...) +} + +// CPUsInUncoreCaches returns all the logical CPU IDs associated with the given +// UnCoreCache IDs in this CPUDetails +func (d CPUDetails) CPUsInUncoreCaches(ids ...int) cpuset.CPUSet { + var cpuIDs []int + for _, id := range ids { + for cpu, info := range d { + if info.UncoreCacheID == id { + cpuIDs = append(cpuIDs, cpu) + } + } + } + return cpuset.New(cpuIDs...) +} + // NUMANodes returns all of the NUMANode IDs associated with the CPUs in this // CPUDetails. func (d CPUDetails) NUMANodes() cpuset.CPUSet { @@ -245,6 +318,16 @@ func (d CPUDetails) CPUsInCores(ids ...int) cpuset.CPUSet { return cpuset.New(cpuIDs...) } +func getUncoreCacheID(core cadvisorapi.Core) int { + if len(core.UncoreCaches) < 1 { + // In case cAdvisor is nil, failback to socket alignment since uncorecache is not shared + return core.SocketID + } + // Even though cadvisor API returns a slice, we only expect either 0 or a 1 uncore caches, + // so everything past the first entry should be discarded or ignored + return core.UncoreCaches[0].Id +} + // Discover returns CPUTopology based on cadvisor node info func Discover(machineInfo *cadvisorapi.MachineInfo) (*CPUTopology, error) { if machineInfo.NumCores == 0 { @@ -260,9 +343,10 @@ func Discover(machineInfo *cadvisorapi.MachineInfo) (*CPUTopology, error) { if coreID, err := getUniqueCoreID(core.Threads); err == nil { for _, cpu := range core.Threads { CPUDetails[cpu] = CPUInfo{ - CoreID: coreID, - SocketID: core.SocketID, - NUMANodeID: node.Id, + CoreID: coreID, + SocketID: core.SocketID, + NUMANodeID: node.Id, + UncoreCacheID: getUncoreCacheID(core), } } } else { @@ -273,11 +357,12 @@ func Discover(machineInfo *cadvisorapi.MachineInfo) (*CPUTopology, error) { } return &CPUTopology{ - NumCPUs: machineInfo.NumCores, - NumSockets: machineInfo.NumSockets, - NumCores: numPhysicalCores, - NumNUMANodes: CPUDetails.NUMANodes().Size(), - CPUDetails: CPUDetails, + NumCPUs: machineInfo.NumCores, + NumSockets: machineInfo.NumSockets, + NumCores: numPhysicalCores, + NumNUMANodes: CPUDetails.NUMANodes().Size(), + NumUncoreCache: CPUDetails.UncoreCaches().Size(), + CPUDetails: CPUDetails, }, nil } diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/llcalign/llcalign.go b/vendor/k8s.io/kubernetes/pkg/kubelet/llcalign/llcalign.go new file mode 100644 index 0000000000..77293dbe52 --- /dev/null +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/llcalign/llcalign.go @@ -0,0 +1,46 @@ +/* +Copyright 2024 The Kubernetes 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 llcalign + +import ( + "os" +) + +var ( + llcAlignmentEnabled bool + llcAlignmentFilename = "/etc/kubernetes/openshift-llc-alignment" +) + +func init() { + readEnablementFile() +} + +func readEnablementFile() { + if _, err := os.Stat(llcAlignmentFilename); err == nil { + llcAlignmentEnabled = true + } +} + +func IsEnabled() bool { + return llcAlignmentEnabled +} + +func TestOnlySetEnabled(enabled bool) bool { + oldEnabled := llcAlignmentEnabled + llcAlignmentEnabled = enabled + return oldEnabled +} diff --git a/vendor/modules.txt b/vendor/modules.txt index 44fe4ed3d0..4530cb02df 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -676,8 +676,8 @@ github.com/openshift/client-go/user/informers/externalversions/internalinterface github.com/openshift/client-go/user/informers/externalversions/user github.com/openshift/client-go/user/informers/externalversions/user/v1 github.com/openshift/client-go/user/listers/user/v1 -# github.com/openshift/cluster-policy-controller v0.0.0-20241019011127-5fd852525909 -## explicit; go 1.22.5 +# github.com/openshift/cluster-policy-controller v0.0.0-20241210163452-327d3cbd82fd +## explicit; go 1.23.0 github.com/openshift/cluster-policy-controller/pkg/client/genericinformers github.com/openshift/cluster-policy-controller/pkg/cmd/cluster-policy-controller github.com/openshift/cluster-policy-controller/pkg/cmd/controller @@ -738,7 +738,7 @@ github.com/openshift/library-go/pkg/route/validation github.com/openshift/library-go/pkg/security/ldaputil github.com/openshift/library-go/pkg/security/uid github.com/openshift/library-go/pkg/serviceability -# github.com/openshift/route-controller-manager v0.0.0-20241204202524-c625ae02c147 +# github.com/openshift/route-controller-manager v0.0.0-20241212133037-4a534edbd515 ## explicit; go 1.22.0 github.com/openshift/route-controller-manager/pkg/cmd/controller github.com/openshift/route-controller-manager/pkg/cmd/route-controller-manager @@ -1197,7 +1197,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/api v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1257,7 +1257,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apiextensions-apiserver v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/apiextensions-apiserver v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1304,7 +1304,7 @@ k8s.io/apiextensions-apiserver/pkg/generated/openapi k8s.io/apiextensions-apiserver/pkg/registry/customresource k8s.io/apiextensions-apiserver/pkg/registry/customresource/tableconvertor k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition -# k8s.io/apimachinery v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/apimachinery v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1375,7 +1375,7 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/apiserver v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/configuration @@ -1550,13 +1550,13 @@ k8s.io/apiserver/plugin/pkg/authenticator/token/oidc k8s.io/apiserver/plugin/pkg/authenticator/token/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook/metrics -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/client-go v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/client-go/applyconfigurations k8s.io/client-go/applyconfigurations/admissionregistration/v1 @@ -1914,7 +1914,7 @@ k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/watchlist k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -1936,14 +1936,14 @@ k8s.io/cloud-provider/service/helpers k8s.io/cloud-provider/volume k8s.io/cloud-provider/volume/errors k8s.io/cloud-provider/volume/helpers -# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/cluster-bootstrap/token/api k8s.io/cluster-bootstrap/token/jws k8s.io/cluster-bootstrap/token/util k8s.io/cluster-bootstrap/util/secrets k8s.io/cluster-bootstrap/util/tokens -# k8s.io/component-base v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/component-base v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -1977,7 +1977,7 @@ k8s.io/component-base/tracing k8s.io/component-base/tracing/api/v1 k8s.io/component-base/version k8s.io/component-base/version/verflag -# k8s.io/component-helpers v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/component-helpers v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -1990,7 +1990,7 @@ k8s.io/component-helpers/scheduling/corev1 k8s.io/component-helpers/scheduling/corev1/nodeaffinity k8s.io/component-helpers/storage/ephemeral k8s.io/component-helpers/storage/volume -# k8s.io/controller-manager v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/controller-manager v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -2007,27 +2007,27 @@ k8s.io/controller-manager/pkg/informerfactory k8s.io/controller-manager/pkg/leadermigration k8s.io/controller-manager/pkg/leadermigration/config k8s.io/controller-manager/pkg/leadermigration/options -# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1 k8s.io/cri-api/pkg/errors -# k8s.io/cri-client v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/cri-client v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/cri-client/pkg k8s.io/cri-client/pkg/internal k8s.io/cri-client/pkg/logs k8s.io/cri-client/pkg/util -# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/csi-translation-lib k8s.io/csi-translation-lib/plugins -# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/dynamic-resource-allocation/cel k8s.io/dynamic-resource-allocation/resourceclaim k8s.io/dynamic-resource-allocation/structured -# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/endpointslice k8s.io/endpointslice/metrics @@ -2052,13 +2052,13 @@ k8s.io/klog/v2/internal/severity k8s.io/klog/v2/internal/sloghandler k8s.io/klog/v2/internal/verbosity k8s.io/klog/v2/textlogger -# k8s.io/kms v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/kms v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/kms/apis/v1beta1 k8s.io/kms/apis/v2 k8s.io/kms/pkg/service k8s.io/kms/pkg/util -# k8s.io/kube-aggregator v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/kube-aggregator v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2091,7 +2091,7 @@ k8s.io/kube-aggregator/pkg/controllers/status/remote k8s.io/kube-aggregator/pkg/registry/apiservice k8s.io/kube-aggregator/pkg/registry/apiservice/etcd k8s.io/kube-aggregator/pkg/registry/apiservice/rest -# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 @@ -2124,11 +2124,11 @@ k8s.io/kube-openapi/pkg/validation/spec k8s.io/kube-openapi/pkg/validation/strfmt k8s.io/kube-openapi/pkg/validation/strfmt/bson k8s.io/kube-openapi/pkg/validation/validate -# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/kube-scheduler/config/v1 k8s.io/kube-scheduler/extender/v1 -# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources @@ -2163,7 +2163,7 @@ k8s.io/kubectl/pkg/util/storage k8s.io/kubectl/pkg/util/templates k8s.io/kubectl/pkg/util/term k8s.io/kubectl/pkg/validation -# k8s.io/kubelet v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/kubelet v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 @@ -2184,7 +2184,7 @@ k8s.io/kubelet/pkg/cri/streaming k8s.io/kubelet/pkg/cri/streaming/portforward k8s.io/kubelet/pkg/cri/streaming/remotecommand k8s.io/kubelet/pkg/types -# k8s.io/kubernetes v1.31.1 => github.com/openshift/kubernetes v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/kubernetes v1.31.1 => github.com/openshift/kubernetes v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -2621,6 +2621,7 @@ k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/codec k8s.io/kubernetes/pkg/kubelet/kuberuntime k8s.io/kubernetes/pkg/kubelet/kuberuntime/util k8s.io/kubernetes/pkg/kubelet/lifecycle +k8s.io/kubernetes/pkg/kubelet/llcalign k8s.io/kubernetes/pkg/kubelet/logs k8s.io/kubernetes/pkg/kubelet/managed k8s.io/kubernetes/pkg/kubelet/metrics @@ -2993,7 +2994,7 @@ k8s.io/kubernetes/third_party/forked/gonum/graph k8s.io/kubernetes/third_party/forked/gonum/graph/internal/linear k8s.io/kubernetes/third_party/forked/gonum/graph/simple k8s.io/kubernetes/third_party/forked/gonum/graph/traverse -# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3008,10 +3009,10 @@ k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1 k8s.io/metrics/pkg/client/custom_metrics k8s.io/metrics/pkg/client/custom_metrics/scheme k8s.io/metrics/pkg/client/external_metrics -# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/pod-security-admission v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241211151829-3c62f738ce74 ## explicit; go 1.22.0 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3163,38 +3164,38 @@ sigs.k8s.io/yaml sigs.k8s.io/yaml/goyaml.v2 sigs.k8s.io/yaml/goyaml.v3 # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241008152707-25bf9f14db44 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20241126153609-8ac36bf977d9 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20241211151829-3c62f738ce74 # go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241118170732-914783cae63a # go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241118170732-914783cae63a # go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241118170732-914783cae63a # 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-20241126153609-8ac36bf977d9 -# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20241126153609-8ac36bf977d9 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241211151829-3c62f738ce74 +# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20241211151829-3c62f738ce74