diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index c842e8b036..1fbe2da6db 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=26 KUBE_GIT_VERSION=v1.26.0 -KUBE_GIT_COMMIT=dc93b13d1f6518d62ea9e3dea64d843c2ce35cbf +KUBE_GIT_COMMIT=7195e44fb36b487f275becffbf5828e2021f94d4 KUBE_GIT_TREE_STATE=clean diff --git a/assets/controllers/kube-controller-manager/defaultconfig.yaml b/assets/controllers/kube-controller-manager/defaultconfig.yaml index 7aca755b62..efceaa3c61 100644 --- a/assets/controllers/kube-controller-manager/defaultconfig.yaml +++ b/assets/controllers/kube-controller-manager/defaultconfig.yaml @@ -14,9 +14,9 @@ extendedArguments: leader-elect-retry-period: - "3s" leader-elect-resource-lock: - - "configmapsleases" + - "leases" leader-elect-renew-deadline: - - "12s" # Increase api call timeout value from default 5s to 6s, required in case primary dns server fail. + - "12s" # Increase api call timeout value from default 5s to 6s, required in case primary dns server fail. controllers: - "*" - "-ttl" # TODO: this is excluded in kube-core, but not in #21092 diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index dfb8eac78d..66732778f3 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.13.0-0.nightly-arm64-2023-03-28-131444" + "base": "4.13.0-0.nightly-arm64-2023-03-30-050636" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8f49c6749ca274cb45371fe9df6c8f7e93149a14c3ed7357100b8ec6c67e5689", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f68737e9d390c2b3b20fdd6442ce0e090812e5f4393d08f722fb231e01bf606", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9171422b4f573a367cd042a87a103f208375646c50ce0e830dc540fd30568712", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2f26942b0de3317aeba0ebd345a5db6e6fa6807158e24491422bfa0f4b259aa3", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c21b0f23ef9874150f91f6a4db29770008d9dbaefa03574733dcadf8ad62947", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf3a374408dba3051947f141411f1a39b76a007ad1d4c00d68f0f6566c219ba1", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:95b51ae3818ee76d65b6c907bf5f86d7edb4f5f5b4a8a2ffce329ff53aedcadf", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:801526ea5132128e271ac6722602adecc7c1934a42f4ba05dbe1d841b4312a7d", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "ovn-kubernetes-microshift-rhel-9": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad6a1b1a01f928dad3ed9b1d1288c4d5e665868c1713ca54c64ff21ebe4fb8ca", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe1d1fa6f1515af43bdf7134c9726b4ec96f15afdeac1a29788edaacc972b3ba", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9e505194244679062036cd740bf6c3d31f8c023f254a0d134d541df0d9f4fb04", + "ovn-kubernetes-microshift-rhel-9": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8d48a2365ae185e8676c8ec52bf449360411e84d46de41c5e3798ddcbfe7d94", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f60a54ff8d67382fa7e89e0a0841e1f6c0e7a68261f94a093c881e39f03979d6", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4bc63e2ea6e8ecdd5bbf4002d9afde7b622811eb35e331a8aaa39c488619dd3c", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:a4319ff7c736ca9fe20500dc3e5862d6bb446f2428ea2eadfb5f042195f4f860", "topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:9df24be671271f5ea9414bfd08e58bc2fa3dc4bc68075002f3db0fd020b58be0", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index eaf9b02523..794bb025da 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.13.0-0.nightly-2023-03-28-014156" + "base": "4.13.0-0.nightly-2023-04-01-062001" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:90d5de548e62036ca86387d04d3a09208c0c958510ae9e73d0450b5672e2db3e", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:83d168862ea6c2f10887785a9ac9ada19cc899bf2990d2e773e330e80b02eb22", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fd90f3aeec0063db7bec9707c7e276ae466ad980b9e362453d638fb01b59f649", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eee411798b259500dd2da36618caac211e46f28981bc4a7bfbeac68ce2e7c074", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bd9969cec172266143b779e4fb7b4130ed89435bd95fb7682747aeae13065ee6", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dab7cbb4ec3c211fd6c109e5de9ed848d8b96b35a4622f019eb324fa12adeb4d", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5965979168568e6f4b6a79d195c4002941be7e7a250f9510e8e05c1d1deb68eb", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:343f6fdc5a63b904ec329020977cbbfcce7035893e5a1cc37388d77f5e7e7a15", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "ovn-kubernetes-microshift-rhel-9": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5ab6561dbe5a00a9b96e1c29818d8376c8e871e6757875c9cf7f48e333425065", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4d817698879f98bdb09f2cbfcdd33eddcbf906fc432caeaace27072ae2ab86bf", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f74348281fa0a0068b6b4defb8ad5a36aa765bdf419311738cecf9825ccd6276", + "ovn-kubernetes-microshift-rhel-9": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:665cec0f63b8529c7d58bb8dc50073fccf86c959565958a8e9448c497e6d2cfd", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c39dfe34ed175b0f816f73fa9f6d51ae972dd9d73122ed3e4c99f7026bd5272d", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9783ff266388df6423e07a28f90b8a98761624663dc73c3544b92be647570800", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:a4319ff7c736ca9fe20500dc3e5862d6bb446f2428ea2eadfb5f042195f4f860", "topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:9df24be671271f5ea9414bfd08e58bc2fa3dc4bc68075002f3db0fd020b58be0", diff --git a/etcd/go.mod b/etcd/go.mod index 8aaf3223ec..494e9ac658 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -143,33 +143,33 @@ replace ( go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230322155524-f70da9d78221 // from etcd go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20230322155524-f70da9d78221 // from etcd go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20230322155524-f70da9d78221 // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230320215851-dc93b13d1f65 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230320215851-dc93b13d1f65 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230330150607-7195e44fb36b // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230330150607-7195e44fb36b // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230330150607-7195e44fb36b // staging kubernetes ) diff --git a/etcd/go.sum b/etcd/go.sum index a83a671226..0f81bd2e27 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -371,18 +371,18 @@ github.com/openshift/etcd/raft/v3 v3.5.1-0.20230322155524-f70da9d78221 h1:Sjmgmr github.com/openshift/etcd/raft/v3 v3.5.1-0.20230322155524-f70da9d78221/go.mod h1:wL8kkRGx1Hp8FmZUuHfL3K2/OaGIDaXGr1N7i2G07J0= github.com/openshift/etcd/server/v3 v3.5.1-0.20230322155524-f70da9d78221 h1:oY9dmUpbeBrOE/0QAN0gL6Lz80E9J9KrXY1iz6a3ae8= github.com/openshift/etcd/server/v3 v3.5.1-0.20230322155524-f70da9d78221/go.mod h1:6/Gfe8XTGXQJgLYQ65oGKMfPivb2EASLUSMSWN9Sroo= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230320215851-dc93b13d1f65 h1:R+QHGTVvds4UdDuNj3iM0DAptll1ZGTu+3CeBUVKY7U= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:RTbOBHv2jYAglrayTACr8ehH2HG1tEW8PXS62qjcXsM= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230320215851-dc93b13d1f65 h1:3BLuSiiTDx0i8PuBby+9wjrCmh1XN9PB7gvRQC7vsEs= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:IgGsaYCHg2HXxQq/DkcLV7Qqb5wXHuiOghXAWNRvTIo= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230320215851-dc93b13d1f65 h1:8h/dhmzLuNF07zn7BWemWuXvOjKGeDKF4M+PfYlREnM= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:9VL9PumwGZm4ySijjOkqi2A8Q8o/jH6NPv36Hcyff2c= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230320215851-dc93b13d1f65 h1:QlbgdZ1kHaWGUj6nCA1GMF4ZNBkxNgOzAT6gNRuqgg0= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:j2CuU4yppRfeP82jtQ9Og0EPAoA03neRboLDK7m4tQc= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230320215851-dc93b13d1f65 h1:ESBhpxZ22bsGLvoEwGuEvXHTPjv8oLRkg6eSxk1AH+4= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:Qixtkhh98MU5XSgj3qwsRRdXX650+J9CmYavg7UHfGc= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230320215851-dc93b13d1f65 h1:5qjRTrQ0yg2qds0ikK6BUSb6r8TrwvhSmPeaUFnah00= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:PHFHN0OYvl1mOobtWnD5t83uJuHy4pDEeshl0a/t5Do= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230330150607-7195e44fb36b h1:xTsEOcBuimHVQRDbX/o4e6X4AqstVSi3Loo99EFfSRI= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230330150607-7195e44fb36b/go.mod h1:RTbOBHv2jYAglrayTACr8ehH2HG1tEW8PXS62qjcXsM= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230330150607-7195e44fb36b h1:mbMIc1jxKj2ViSqc3Gxj2lIbF8RyWbx+zwT8q31w0P4= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230330150607-7195e44fb36b/go.mod h1:IgGsaYCHg2HXxQq/DkcLV7Qqb5wXHuiOghXAWNRvTIo= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230330150607-7195e44fb36b h1:7t/Y8yxVuGwnTBSsfQTcUbTCJAQNHDA1FCE4ctGsGMU= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230330150607-7195e44fb36b/go.mod h1:9VL9PumwGZm4ySijjOkqi2A8Q8o/jH6NPv36Hcyff2c= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230330150607-7195e44fb36b h1:DpqYztNyMocHfqt3tnj9WZmU5zOl4ptmbQSuwLXaDhw= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230330150607-7195e44fb36b/go.mod h1:j2CuU4yppRfeP82jtQ9Og0EPAoA03neRboLDK7m4tQc= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230330150607-7195e44fb36b h1:M19Saufssg/9UbDEL5x2rnQ2MmL+cxCZ4PSsmKbhq+0= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230330150607-7195e44fb36b/go.mod h1:Qixtkhh98MU5XSgj3qwsRRdXX650+J9CmYavg7UHfGc= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230330150607-7195e44fb36b h1:6KK8gXoJVJ4kAdpMgufNyZSbdeGXkKWMF13E0Db99F4= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230330150607-7195e44fb36b/go.mod h1:PHFHN0OYvl1mOobtWnD5t83uJuHy4pDEeshl0a/t5Do= github.com/openshift/onsi-ginkgo/v2 v2.4.1-0.20221214150008-e73634cb3870 h1:YH3Z3ZWCDWjkAGdZpK5rCm5pRZ4wt0uEx1GwvCiO3+I= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= diff --git a/etcd/vendor/github.com/openshift/microshift/pkg/util/cert.go b/etcd/vendor/github.com/openshift/microshift/pkg/util/cert.go index c4821ec1af..1ee6d6dd50 100644 --- a/etcd/vendor/github.com/openshift/microshift/pkg/util/cert.go +++ b/etcd/vendor/github.com/openshift/microshift/pkg/util/cert.go @@ -21,7 +21,7 @@ import ( "crypto/x509" "encoding/pem" "fmt" - "io/ioutil" + "os" "time" "github.com/pkg/errors" @@ -69,7 +69,7 @@ func GenKeys(pubPath, keyPath string) error { return fmt.Errorf("failed to write the private key to %s: %v", keyPath, err) } - ioutil.WriteFile(pubPath, pubPEM, 0644) + os.WriteFile(pubPath, pubPEM, 0400) return nil } diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index 061fd9dd93..1326b0a132 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -584,7 +584,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230320215851-dc93b13d1f65 +# k8s.io/api v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -640,7 +640,7 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apimachinery v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230320215851-dc93b13d1f65 +# k8s.io/apimachinery v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/apimachinery/pkg/api/errors k8s.io/apimachinery/pkg/api/meta @@ -687,12 +687,12 @@ 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/cli-runtime v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230320215851-dc93b13d1f65 +# k8s.io/cli-runtime v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230320215851-dc93b13d1f65 +# k8s.io/client-go v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -835,7 +835,7 @@ k8s.io/client-go/util/homedir k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/workqueue -# k8s.io/component-base v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230320215851-dc93b13d1f65 +# k8s.io/component-base v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -871,7 +871,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.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230320215851-dc93b13d1f65 +# k8s.io/kubectl v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -998,32 +998,32 @@ sigs.k8s.io/yaml # go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230322155524-f70da9d78221 # go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20230322155524-f70da9d78221 # go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20230322155524-f70da9d78221 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230320215851-dc93b13d1f65 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230330150607-7195e44fb36b +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230330150607-7195e44fb36b +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230330150607-7195e44fb36b +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230330150607-7195e44fb36b +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230330150607-7195e44fb36b +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230330150607-7195e44fb36b +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230330150607-7195e44fb36b +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230330150607-7195e44fb36b +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230330150607-7195e44fb36b +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230330150607-7195e44fb36b +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230330150607-7195e44fb36b +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230330150607-7195e44fb36b +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230330150607-7195e44fb36b +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230330150607-7195e44fb36b +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230330150607-7195e44fb36b +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230330150607-7195e44fb36b +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230330150607-7195e44fb36b +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230330150607-7195e44fb36b +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230330150607-7195e44fb36b +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230330150607-7195e44fb36b +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230330150607-7195e44fb36b +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230330150607-7195e44fb36b +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230330150607-7195e44fb36b +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230330150607-7195e44fb36b +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230330150607-7195e44fb36b +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230330150607-7195e44fb36b +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230330150607-7195e44fb36b +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230330150607-7195e44fb36b +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230330150607-7195e44fb36b diff --git a/go.mod b/go.mod index b204b25872..84b010a7fa 100644 --- a/go.mod +++ b/go.mod @@ -231,34 +231,34 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.4.1-0.20221214150008-e73634cb3870 // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230320215851-dc93b13d1f65 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230320215851-dc93b13d1f65 // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230320215851-dc93b13d1f65 // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230320215851-dc93b13d1f65 // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230320215851-dc93b13d1f65 // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230320215851-dc93b13d1f65 // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230320215851-dc93b13d1f65 // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230320215851-dc93b13d1f65 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230320215851-dc93b13d1f65 // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230320215851-dc93b13d1f65 // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230320215851-dc93b13d1f65 // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230320215851-dc93b13d1f65 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230320215851-dc93b13d1f65 // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230320215851-dc93b13d1f65 // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230320215851-dc93b13d1f65 // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230320215851-dc93b13d1f65 // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230320215851-dc93b13d1f65 // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230320215851-dc93b13d1f65 // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230320215851-dc93b13d1f65 // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230320215851-dc93b13d1f65 // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230320215851-dc93b13d1f65 // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230330150607-7195e44fb36b // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230330150607-7195e44fb36b // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230330150607-7195e44fb36b // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230330150607-7195e44fb36b // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230330150607-7195e44fb36b // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230330150607-7195e44fb36b // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230330150607-7195e44fb36b // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230330150607-7195e44fb36b // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230330150607-7195e44fb36b // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230330150607-7195e44fb36b // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230330150607-7195e44fb36b // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230330150607-7195e44fb36b // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230330150607-7195e44fb36b // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230330150607-7195e44fb36b // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230330150607-7195e44fb36b // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230330150607-7195e44fb36b // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230330150607-7195e44fb36b // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230330150607-7195e44fb36b // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230330150607-7195e44fb36b // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230330150607-7195e44fb36b // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230330150607-7195e44fb36b // from kubernetes ) diff --git a/go.sum b/go.sum index 6fd283fad4..b0e8160855 100644 --- a/go.sum +++ b/go.sum @@ -608,57 +608,57 @@ github.com/openshift/client-go v0.0.0-20230120202327-72f107311084 h1:66uaqNwA+qY github.com/openshift/client-go v0.0.0-20230120202327-72f107311084/go.mod h1:M3h9m001PWac3eAudGG3isUud6yBjr5XpzLYLLTlHKo= github.com/openshift/cluster-policy-controller v0.0.0-20230324020700-d02c85ab3203 h1:rafkiE1rN2dQC0rq7q44mI4/69aEkcxmdpxVlwvTOPY= github.com/openshift/cluster-policy-controller v0.0.0-20230324020700-d02c85ab3203/go.mod h1:vlkRuwyRueLOQ/ZRRle+rCrh+YNoh+pzJm9WaN9e6mU= -github.com/openshift/kubernetes v0.0.0-20230320215851-dc93b13d1f65 h1:KxRTY0GQUEGc61T5PInmFfDtmIcYBCLcHydOFeAmTzs= -github.com/openshift/kubernetes v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:FFmjFkZxW22qBBjGCdvUj9MzYgHeh1t+7fG3n7162tM= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230320215851-dc93b13d1f65 h1:R+QHGTVvds4UdDuNj3iM0DAptll1ZGTu+3CeBUVKY7U= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:RTbOBHv2jYAglrayTACr8ehH2HG1tEW8PXS62qjcXsM= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230320215851-dc93b13d1f65 h1:6DOaa5UxnHAyBpk5Ms++SaLile4nkCrCv6qFQamvjeU= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:U0Mmzj5eyc8IBdGjsF2XR3dBQG0yqvhy468GKZvdfXU= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230320215851-dc93b13d1f65 h1:3BLuSiiTDx0i8PuBby+9wjrCmh1XN9PB7gvRQC7vsEs= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:IgGsaYCHg2HXxQq/DkcLV7Qqb5wXHuiOghXAWNRvTIo= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230320215851-dc93b13d1f65 h1:cUl6TWk6zZzxdc2IMYhHXgwW03sJyHlzRZwmcGV/jqM= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:xwqK7Ox7oH/b11ZMPYtqPV/OYt2ZlYZf7XsuukECSc4= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230320215851-dc93b13d1f65 h1:8h/dhmzLuNF07zn7BWemWuXvOjKGeDKF4M+PfYlREnM= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:9VL9PumwGZm4ySijjOkqi2A8Q8o/jH6NPv36Hcyff2c= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230320215851-dc93b13d1f65 h1:QlbgdZ1kHaWGUj6nCA1GMF4ZNBkxNgOzAT6gNRuqgg0= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:j2CuU4yppRfeP82jtQ9Og0EPAoA03neRboLDK7m4tQc= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230320215851-dc93b13d1f65 h1:NbmuhD07/za6M7E/9umaQou0umK7lQb8tZztBUKxv04= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:C8LxhCSrMIvk2892MFXHd6Ygyy/cCVK30VOZZVm4KSM= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230320215851-dc93b13d1f65 h1:wlLFeaYE9r3SlAIRr4LjSuvlAx6fIWayNFg+inFZej8= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:sf8VADmgVR2MzucAzvUaYsYLUi8S4onGjDNXWp6+iOw= -github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:HDEVJ4fMSa8PKXQ5cJgG2PEEYCM9NDxpj7EojkpHatA= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230320215851-dc93b13d1f65 h1:ESBhpxZ22bsGLvoEwGuEvXHTPjv8oLRkg6eSxk1AH+4= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:Qixtkhh98MU5XSgj3qwsRRdXX650+J9CmYavg7UHfGc= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230320215851-dc93b13d1f65 h1:xzSbQBONE7GPIXewyx4wmHlcO41p7OPUxjBeJs+bTc4= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:v9q5XN/HFJwSIQ9HiyzSh9Pgpkf0sdmLX2s4wWmub1c= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230320215851-dc93b13d1f65 h1:XBKlErau4l+exgzjKQrqIAIlJX7nSvc+WSo9RrvZGMg= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:45yXoVo9Jbbpsz92uqBbG2oVBkVEWv+4ROfek4yo0NE= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230320215851-dc93b13d1f65 h1:4TmEB/ld/IkLYBXMDpkpfBXdkcrZb2hLeSxSfCqkeAM= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:X6BH8wZUzqCnAYka7oy7QYoBUcN3xSXV6rZIxdXoArE= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230320215851-dc93b13d1f65 h1:OYTjbDCzUFrnCcY2cSmu2IObKeciw9I416djfoyOIpU= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:aNNfBLYfQbTrwqWHK9JMaodwbDNG1lELDChC0mhKLJQ= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230320215851-dc93b13d1f65 h1:wiyzwM+xGczeSlKnXh7gjpqjSeIfRlY80rsVMDVAS7k= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:MovKp06tUSXe3MnKchEr1D8CdDZgIhYiw6D6sBjZy94= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230320215851-dc93b13d1f65 h1:smjFuMcB5aKzPKccWdGjRatDVksExnMqYFplj+WPvUQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:RBaXXXu0TgOgwWU+GKrNbBjVj6I6mZ3Kuwxphmx83hM= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230320215851-dc93b13d1f65 h1:pBk+QBgTYBdDfsqm57UZLuSWNcKuAqajz8GoEUixG70= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:tZLl7PAQI9WT9QcUVeua4aK0EIZE1DZhQorO9WLoRGs= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230320215851-dc93b13d1f65 h1:0VdJn3iHYz66PKvYcxC9XUcWCwjwSRH6AZqlpv6/1/g= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:FmdoDrAFpzYtGWgaPrurpkB+ITnnOV/V/+uoFPovBKA= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230320215851-dc93b13d1f65 h1:uCwvLRVpOODJ5dhTrMIapg41uC83DII11PI0RqYEuyY= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:Zgt5E29gT4nxpbFBvx43u3fRNTfMAvqZxchXnjw+gOo= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230320215851-dc93b13d1f65 h1:5qjRTrQ0yg2qds0ikK6BUSb6r8TrwvhSmPeaUFnah00= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:PHFHN0OYvl1mOobtWnD5t83uJuHy4pDEeshl0a/t5Do= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230320215851-dc93b13d1f65 h1:EtIdy8qM7d1te2dglgj4F4XWt8vF/ymFulGuJ/YniBo= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:A6pOnDSKM3jdR7v/EOkKKuHWsR3GGm4T3Vr9jS1U6QA= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230320215851-dc93b13d1f65 h1:5/y+H5uhTgp7d1TbWb/2WPHW6hy3mj11FLjCPiBySUk= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:K4ChxIQRGSv8E4Cz3XSuZ38G5UwpTb/4p32vGMDpa1k= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230320215851-dc93b13d1f65 h1:eEq1rRjHJ9HRw59SwUlkxVSrrF6B889MhQpoxJWDOgE= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:5qMnaoxtG8tgh9JRt99mH4aEw1Us6LFFigCQExPUeXQ= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230320215851-dc93b13d1f65 h1:ISNVf6yXdzTDl72PJEiBmmk+TNeBzd5GIdGuLFDDby4= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:1PgQc8yQxp+tnTD2lzlyNGTngwImNyANUq74eRnHT5U= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230320215851-dc93b13d1f65 h1:Ei2yhSKra+KyXBD763SwrCWV2XfBBsVokcQjocmFgQs= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:KtKLalpm2l5WOPMqKs6VETKre5j3sPUz0D16MXQd1QI= +github.com/openshift/kubernetes v0.0.0-20230330150607-7195e44fb36b h1:6Nc1Ecx7jY7c2tboM/2tq4Cf6qPZ5oHQJp45+d3JMwU= +github.com/openshift/kubernetes v0.0.0-20230330150607-7195e44fb36b/go.mod h1:FFmjFkZxW22qBBjGCdvUj9MzYgHeh1t+7fG3n7162tM= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230330150607-7195e44fb36b h1:xTsEOcBuimHVQRDbX/o4e6X4AqstVSi3Loo99EFfSRI= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230330150607-7195e44fb36b/go.mod h1:RTbOBHv2jYAglrayTACr8ehH2HG1tEW8PXS62qjcXsM= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230330150607-7195e44fb36b h1:1p9ENfcAhgoYu3JXDFAKLoMql8Xis+JkTKbTyT7e92M= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230330150607-7195e44fb36b/go.mod h1:U0Mmzj5eyc8IBdGjsF2XR3dBQG0yqvhy468GKZvdfXU= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230330150607-7195e44fb36b h1:mbMIc1jxKj2ViSqc3Gxj2lIbF8RyWbx+zwT8q31w0P4= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230330150607-7195e44fb36b/go.mod h1:IgGsaYCHg2HXxQq/DkcLV7Qqb5wXHuiOghXAWNRvTIo= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230330150607-7195e44fb36b h1:7F5PdsTBYiIYtNvLqaPKNVUxREQJ60eY7aKrdAN8loA= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230330150607-7195e44fb36b/go.mod h1:xwqK7Ox7oH/b11ZMPYtqPV/OYt2ZlYZf7XsuukECSc4= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230330150607-7195e44fb36b h1:7t/Y8yxVuGwnTBSsfQTcUbTCJAQNHDA1FCE4ctGsGMU= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230330150607-7195e44fb36b/go.mod h1:9VL9PumwGZm4ySijjOkqi2A8Q8o/jH6NPv36Hcyff2c= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230330150607-7195e44fb36b h1:DpqYztNyMocHfqt3tnj9WZmU5zOl4ptmbQSuwLXaDhw= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230330150607-7195e44fb36b/go.mod h1:j2CuU4yppRfeP82jtQ9Og0EPAoA03neRboLDK7m4tQc= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230330150607-7195e44fb36b h1:Qpm5uEZg6d6FA0Qh0xCwnEyO/jN3h8Poe7jUG4hl5d4= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230330150607-7195e44fb36b/go.mod h1:C8LxhCSrMIvk2892MFXHd6Ygyy/cCVK30VOZZVm4KSM= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230330150607-7195e44fb36b h1:3ejJJqDb9Qm6Buxt7mCkySWCuxtSJrfRZVC6n5LPajM= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230330150607-7195e44fb36b/go.mod h1:sf8VADmgVR2MzucAzvUaYsYLUi8S4onGjDNXWp6+iOw= +github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230330150607-7195e44fb36b/go.mod h1:HDEVJ4fMSa8PKXQ5cJgG2PEEYCM9NDxpj7EojkpHatA= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230330150607-7195e44fb36b h1:M19Saufssg/9UbDEL5x2rnQ2MmL+cxCZ4PSsmKbhq+0= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230330150607-7195e44fb36b/go.mod h1:Qixtkhh98MU5XSgj3qwsRRdXX650+J9CmYavg7UHfGc= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230330150607-7195e44fb36b h1:cQytvyEgwC/GCqbE6XQ5hajPItyWydGOSB1vkiYGmGY= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230330150607-7195e44fb36b/go.mod h1:v9q5XN/HFJwSIQ9HiyzSh9Pgpkf0sdmLX2s4wWmub1c= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230330150607-7195e44fb36b h1:qGS03sU7xxElqQRs85DZdHFKL8Uht+35ARXG8uLPafI= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230330150607-7195e44fb36b/go.mod h1:45yXoVo9Jbbpsz92uqBbG2oVBkVEWv+4ROfek4yo0NE= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230330150607-7195e44fb36b h1:GaP2oWuZH3B1GkRwK4k7ofWu7ORwFUrKA3m/dAcH3ec= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230330150607-7195e44fb36b/go.mod h1:X6BH8wZUzqCnAYka7oy7QYoBUcN3xSXV6rZIxdXoArE= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230330150607-7195e44fb36b h1:nYazIGHb1pJxoOshvQ4cknWcyV1n49lUoLxVYPHlTng= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230330150607-7195e44fb36b/go.mod h1:aNNfBLYfQbTrwqWHK9JMaodwbDNG1lELDChC0mhKLJQ= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230330150607-7195e44fb36b h1:YcARjjuYDaJLi/MvJ0KwyLF5EE26XQnqQ8vpW1DxjOs= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230330150607-7195e44fb36b/go.mod h1:MovKp06tUSXe3MnKchEr1D8CdDZgIhYiw6D6sBjZy94= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230330150607-7195e44fb36b h1:aiD7bZyaBL1uM452l8T808OJRfyOhw76gkUrJ0ezJTQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230330150607-7195e44fb36b/go.mod h1:RBaXXXu0TgOgwWU+GKrNbBjVj6I6mZ3Kuwxphmx83hM= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230330150607-7195e44fb36b h1:xDxY5BNEFTWSlbaZXqtgVCdp5LyQs9JI4SvWxksXbXY= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230330150607-7195e44fb36b/go.mod h1:tZLl7PAQI9WT9QcUVeua4aK0EIZE1DZhQorO9WLoRGs= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230330150607-7195e44fb36b h1:BXcYg7ILvfe/5rXOlzS2sw3nHU22KkaUHyo/RkwvDQA= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230330150607-7195e44fb36b/go.mod h1:FmdoDrAFpzYtGWgaPrurpkB+ITnnOV/V/+uoFPovBKA= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230330150607-7195e44fb36b h1:rzyZxuQV6qxXDuEjkpiIq+J/0UillSrE9sDiNGX6OjQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230330150607-7195e44fb36b/go.mod h1:Zgt5E29gT4nxpbFBvx43u3fRNTfMAvqZxchXnjw+gOo= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230330150607-7195e44fb36b h1:6KK8gXoJVJ4kAdpMgufNyZSbdeGXkKWMF13E0Db99F4= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230330150607-7195e44fb36b/go.mod h1:PHFHN0OYvl1mOobtWnD5t83uJuHy4pDEeshl0a/t5Do= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230330150607-7195e44fb36b h1:Gda2vfGXywaMkp/bwu4eUsgm9J14AC2dyDmzchrHKLU= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230330150607-7195e44fb36b/go.mod h1:A6pOnDSKM3jdR7v/EOkKKuHWsR3GGm4T3Vr9jS1U6QA= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230330150607-7195e44fb36b h1:/6jHAfncKKzsEiPYjlrAR0rTGi6kU8gLNfCAoR8oIDk= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230330150607-7195e44fb36b/go.mod h1:K4ChxIQRGSv8E4Cz3XSuZ38G5UwpTb/4p32vGMDpa1k= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230330150607-7195e44fb36b h1:qod5YUshgs1wRsDgqSQwex6Y+LLvTQ+a8JfIcx4PnJY= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230330150607-7195e44fb36b/go.mod h1:5qMnaoxtG8tgh9JRt99mH4aEw1Us6LFFigCQExPUeXQ= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230330150607-7195e44fb36b h1:KKcJt2B6LV4uecSVYZwyRrM9h61obdJn06rFmCbvNvs= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230330150607-7195e44fb36b/go.mod h1:1PgQc8yQxp+tnTD2lzlyNGTngwImNyANUq74eRnHT5U= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230330150607-7195e44fb36b h1:F0mTR63tr6BpgYOwGo/rKu5oR73EoniL6BtZgG6jqTA= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230330150607-7195e44fb36b/go.mod h1:KtKLalpm2l5WOPMqKs6VETKre5j3sPUz0D16MXQd1QI= github.com/openshift/library-go v0.0.0-20230222090221-582055a1d5c4 h1:B9e1Sga7Q6iSI1YgzLgfABo+LDET7HZngJ+tKlrwVSk= github.com/openshift/library-go v0.0.0-20230222090221-582055a1d5c4/go.mod h1:xO4nAf0qa56dgvEJWVD1WuwSJ8JWPU1TYLBQrlutWnE= github.com/openshift/onsi-ginkgo/v2 v2.4.1-0.20221214150008-e73634cb3870 h1:YH3Z3ZWCDWjkAGdZpK5rCm5pRZ4wt0uEx1GwvCiO3+I= diff --git a/packaging/crio.conf.d/microshift_amd64.conf b/packaging/crio.conf.d/microshift_amd64.conf index a8477665c5..f070a97478 100644 --- a/packaging/crio.conf.d/microshift_amd64.conf +++ b/packaging/crio.conf.d/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:4d817698879f98bdb09f2cbfcdd33eddcbf906fc432caeaace27072ae2ab86bf" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c39dfe34ed175b0f816f73fa9f6d51ae972dd9d73122ed3e4c99f7026bd5272d" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/packaging/crio.conf.d/microshift_arm64.conf b/packaging/crio.conf.d/microshift_arm64.conf index 917361c506..5ce75debbd 100644 --- a/packaging/crio.conf.d/microshift_arm64.conf +++ b/packaging/crio.conf.d/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:fe1d1fa6f1515af43bdf7134c9726b4ec96f15afdeac1a29788edaacc972b3ba" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f60a54ff8d67382fa7e89e0a0841e1f6c0e7a68261f94a093c881e39f03979d6" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/pkg/controllers/kube-controller-manager_test.go b/pkg/controllers/kube-controller-manager_test.go index 94b1455b24..da2c9aae2f 100644 --- a/pkg/controllers/kube-controller-manager_test.go +++ b/pkg/controllers/kube-controller-manager_test.go @@ -61,7 +61,7 @@ func TestConfigure(t *testing.T) { "--kube-api-qps=150", fmt.Sprintf("--kubeconfig=%s", cfg.KubeConfigPath(config.KubeControllerManager)), "--leader-elect-renew-deadline=12s", - "--leader-elect-resource-lock=configmapsleases", + "--leader-elect-resource-lock=leases", "--leader-elect-retry-period=3s", "--leader-elect=false", fmt.Sprintf("--root-ca-file=%s", kcmRootCAFile()), diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index dd2534f39c..ef72fa09ea 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,36 +1,46 @@ -# cluster-kube-apiserver-operator embedded-component 3e62b53e39db960ccc16d717d1a25d751d4e9c49 to f2d9ccd2f585c57409257fae99da7f52ed6042cf -8110dfa09769bf3bf7877147512146296de1483c 2023-03-24T17:54:23+01:00 bump(api) -# cluster-kube-controller-manager-operator embedded-component 2a3e578c1007d7534eadffcca2adc979cb712995 to 280c115d63367f4ede8a4e893549cdc5919e8920 -487b8546158cf243b30c1ed8bb5daeb2cf301087 2023-03-22T14:14:21+01:00 fix render test -7dd94053e9f79d445923c679af2c3dfb603e226b 2023-03-22T14:14:19+01:00 bump o/api for the updated featureflags -# cluster-kube-scheduler-operator embedded-component d3978864fb58063235be176c18fe50457b5223f3 to fbc6ef4df8b0d9ea97acf9b0330d44a3a171b4fd -20c9a9af04d84b932b9cecb25a2263960cf72893 2023-03-20T10:11:15-04:00 update vendor folder -4924d0c1a19c3300ce0ed2d06a0c49c6542d757c 2023-03-20T10:11:03-04:00 bump(library-go) -# cluster-network-operator embedded-component 040d5efed272789341b16858f63c2d0bcdb71b50 to ae70394d0198a1d5a310410ba3468f38ce0522c2 -f9c32cf30aa63582adba034c90bf62a4ca0b6176 2023-03-22T13:55:35+00:00 operConfig reconcile can return nil error on failure -# cluster-policy-controller embedded-component ac01e3463245f2dd9312145368d7f4099a8a0bb9 to d02c85ab3203fe22eddcc4694e17504ef34935de -11d8891790e3c92405a3fb7c35b021d15b571053 2023-03-20T14:26:27+01:00 psalabelsyncer: invert the enforce/log logic to default to logging -# machine-config-operator embedded-component 40575b862f7bd42a2c40c8e6b7203cd4c29b0021 to a4e68fb1d5eed30d4c1b6f60e9385baf41a30bb3 -09c94a511e2a6190ad2a64d43ec8f7ff11569be7 2023-03-15T19:57:23+00:00 e2e: add testing for cert rotation -6fcc0ed596861cc38fe36b843993c16efd4961af 2023-03-15T19:57:23+00:00 Remove paused pool kubelet ca alert metrics -70131ba52f71de6ac9634f10cec58c580a440cc4 2023-03-15T19:57:23+00:00 server: add path to also serve the latest kubelet ca -77fd8d39c0e49d05dbf68de9380b668531920940 2023-03-15T19:57:23+00:00 daemon: have a special path to sync in certs -# oc image-amd64 eed143055ede731029931ad204b19cd2f565ef1a to 92b1a3d0e5d092430b523f6541aa0c504b2222b3 -32496b16599a0ee1d834a9d6685aca398d49c79d 2023-03-23T10:44:51+00:00 OCPBUGS-10622: bump repo sclorg/s2i-ruby-container location for newapp -# ovn-kubernetes image-amd64 dd45efd39e5db428d4578ed6787e6c08b79e2df5 to cb89e52240fe7346409589a9acae9c0106d24b03 -8513b38e5a74c0c5f303dca30a27e6cc24bdf89c 2023-03-24T16:52:21+01:00 update to before-kube-1.26 bump -46d2b9e1a902cfde6ed0a85251b336f60b0876b6 2023-03-23T17:26:47+01:00 don't create acl if no namespace address sets are selected. Previously "ip4.dst == {}" match was created, and ovn-controller throws an error on such acl -7ab410d18906602b127ae54fc49fb9e70d80ba03 2023-03-23T17:26:40+01:00 Add PodSelectorAddressSet tests. -efa8741efd682bca78571cc71f0a5cb94e71449b 2023-03-23T17:26:34+01:00 Rework gressPolicy ACLs build: previously all gress policies with at least one selector had peerAddressSet, and empty gress (allow all) was identified by "gp.sizeOfAddressSet() > 0". Now we don't create address sets like that, therefore a new hasPeerSelector field was added to distinguish empty gress from the one that just doesn't have any address sets added yet. -e0c35b2619f4084a0babea4aa554f5018e52ef5a 2023-03-23T17:26:26+01:00 Add PodSelectorAddressSet object, that should be used to manage address sets for pod selector (network policy object is only responsible for local pods and peer namespace-only handlers). The locking mechanism is copied from networkPolicy. -4a03b84b53431d8147818f311bba63ea78d2a6dc 2023-03-23T17:26:19+01:00 Unlock shared default deny port group early, when no db changes required, to unlock other handlers from the same namespace. -06c9270dc3c69e8128d57a42b8def7b51ab1bbf8 2023-03-23T17:25:41+01:00 Add an option to enable scale metrics in kind -6d96be9e761aa544c3500c54508a61c102dbdd77 2023-03-23T17:25:30+01:00 Add MetricMasterSyncDuration metric to track how much it takes for ovn-k master to start watching every resource. Add scale metrics for network policies, rename existing enable-eip-scale-metrics flag to more general enable-scale-metrics, and use it for network policy metric too. -f9632bfa3ca30fd6173f59cb7657bf910dd7719d 2023-03-23T09:40:51+08:00 Fix duplicated metric registration -eb64a87cca1ad699edfb9cda876602ebdeb69d8a 2023-03-22T17:30:51-04:00 Fix egress firewall CRD -dec0b99f54538591d1f8b6461940b609a29dc9d9 2023-03-17T10:53:58+00:00 Updating ovn-kubernetes-base images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/3ea7e6d582117c0c2b118319e4f4a4bd35edce51/images/ovn-kubernetes-base.yml -3baa3d367651fc620dbfa50c82c14c20f988db04 2023-03-08T02:28:51+00:00 Updating ovn-kubernetes-microshift images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/724eedd015d4972b55704e41a4117c533e240935/images/ovn-kubernetes-microshift.yml -# ovn-kubernetes image-arm64 cb89e52240fe7346409589a9acae9c0106d24b03 to 9799fbc9bef06304e8195fbc4b37b2e095ec9325 +# cluster-kube-apiserver-operator embedded-component f2d9ccd2f585c57409257fae99da7f52ed6042cf to 5f038db7df7ade2f3da707394a14e391c693d25c +dc69ddf3b698821326080cecb074c0ed8899cf06 2023-03-28T18:34:20+02:00 PSA Violation alert: add ocp_namespace label +# cluster-kube-controller-manager-operator embedded-component 280c115d63367f4ede8a4e893549cdc5919e8920 to cdde94837bec1810dbad71ca070a84f212de0cbb +f226a31e90685099c832e47856c6ab9b91a7c0c4 2023-03-31T15:07:22+00:00 OCPBUGS-7440: do not degrade KCM when when monitoring stack rollout is in progress +dfaa63e6d0617f195cfc52a637df3681747a3581 2023-03-27T20:26:01+02:00 OCPBUGS-7785: migrate to using lease objects for leader election +# cluster-kube-scheduler-operator embedded-component fbc6ef4df8b0d9ea97acf9b0330d44a3a171b4fd to dc5cba57ddcdb5a4b43240d1c2ab908fa953d887 +7c538dbf1a70bf47279c3d133bdcfe702cca7eb6 2023-03-27T20:31:17+02:00 OCPBUGS-7785: migrate to using lease objects for leader election +# cluster-network-operator embedded-component ae70394d0198a1d5a310410ba3468f38ce0522c2 to 756cae2baa82af3604fbe016eb0f776d8efaa61b +5327d1c6dd1e72fc7687bdca9fe087be9b13a49a 2023-03-27T16:54:09+00:00 use annotation daemonset to update hybrid overlay +d4f451d8ada4a53859bf7f8e92e987d849433bfa 2023-03-27T09:33:07+00:00 Add POD_NAME env to ovnkube-node +# cluster-openshift-controller-manager-operator embedded-component 7867c26e6c91e2cc279317dfc080befe63a60749 to 9a8aba8cad6491a31e743a7e366d758351482d88 +76e46aac4d10280b413ac6e3c69538ec22819657 2023-03-20T10:05:28-04:00 update vendor folder +3e88e932fea15f87c4ba30b4ff858f543d63a530 2023-03-20T10:05:19-04:00 bump(library-go) +# kubernetes embedded-component dc93b13d1f6518d62ea9e3dea64d843c2ce35cbf to 7195e44fb36b487f275becffbf5828e2021f94d4 +0c95851f899bd4be5fcbbd78ef19eec55d91f9d3 2023-03-27T17:20:41+02:00 UPSTREAM: : legacy-cloud-providers: azure: do not detach masters from lb when unready +be9f2c07315cad2be925fb27cb3dfe040dbd4171 2023-03-27T17:18:47+02:00 UPSTREAM: : legacy-cloud-providers: azure: use kube-proxy based health probes by default +# machine-config-operator embedded-component a4e68fb1d5eed30d4c1b6f60e9385baf41a30bb3 to 428c2e0655c6a5fc876dad8864a5451142b5c3e2 +0e1f2424348fb1dd509f9b0f3791d67c12f27e17 2023-03-29T17:44:43+00:00 OCPBUGS-4963: Enable nodeip-configuration for vsphere upi +a0bdf3aa85bef50d7f641d59e505b46b246d789e 2023-03-29T11:02:08+00:00 remove container runtime flag +a1b2afb9ba50b5f629be1d6a8377ee507e3ae1c2 2023-03-10T16:25:36+00:00 OCPBUGS-5872: Wrap podman commands in a while loop +# ovn-kubernetes image-amd64 cb89e52240fe7346409589a9acae9c0106d24b03 to 9d94b5f604f18016e41b2ba507ae3df373800754 +7ba8af501478c9b2b5b0be7b55c5eeabcca97291 2023-03-28T17:16:25-04:00 Fix invalid peer test syntax +f61f2cd55dc003582e1096cb8915a36007539212 2023-03-28T15:15:30-04:00 Add error checking for addEventHandler calls +858872e78aa5a34ef18b89b96df29f0ddb39c1ff 2023-03-28T14:59:25-04:00 Bump K8S_VERSION to 1.26.0 for KIND setup +e582cf5b361d484e8c444800e40c22c8e684f303 2023-03-28T14:59:14-04:00 sets package update +b2bb806212b8f6e1cf8e1fe80b5d44af0b88b758 2023-03-28T14:59:06-04:00 exec.Stream deprecated +f74f2cba7d6163fbc50410e2bb55ba1b31a67ddc 2023-03-28T14:58:54-04:00 Bump K8s vendored libraries to use kube 1.26 +eb246f156fb681f9ddb8797f4f82440c4370316e 2023-03-28T08:15:44+00:00 Defer wait on startOvnKube might prevent panic crash +d2fee85be49ed478a0862daeca0a230833dc70dd 2023-03-28T08:15:43+00:00 Start master metrics server for all master instances +37336490ec3e7b71c45aa7837f3bb1c482e35068 2023-03-28T08:15:43+00:00 Single leader election +363b633d1180c4e43f82fdb49f9b384aee7f9a4e 2023-03-28T08:15:42+00:00 Fix NAD controller Stop +34eb56293928264919eb9e817eddaf62321a9370 2023-03-23T17:39:12+01:00 Optimize egress firewall cleanup to only select switches that have stale acls. +7fb527e1eb9b511981cb51be6b79901e4aedbd2f 2023-03-23T17:38:41+01:00 Batch potentially big transaction on egress firewall ACLs migration. The default transaction timeout is 10 seconds, it can be reached when we delete all egress firewall acls during migration to port groups from switches. 74f95e997d116f572b64c7cf7775d483aeed86d1 2023-03-23T17:14:38+01:00 fix multiple error aggregation: `errors.Wrapf` always returns nil if the first argument is nil. 362fa553d572b418f5b305b9c8fb68eb1a4e13cc 2023-03-23T17:14:26+01:00 Fix egress firewall unit tests gatewayMode setup update "egress firewall with node selector updates during node update" to work for both gateway modes. 2e3d170c179fc806bfebbdaf1bab3f606a562ecf 2023-03-23T17:14:18+01:00 Egress firewall creation error was overridden by the status update error and never returned. That would prevent retry on failure. +# kubernetes image-amd64 dc93b13d1f6518d62ea9e3dea64d843c2ce35cbf to 7195e44fb36b487f275becffbf5828e2021f94d4 +0c95851f899bd4be5fcbbd78ef19eec55d91f9d3 2023-03-27T17:20:41+02:00 UPSTREAM: : legacy-cloud-providers: azure: do not detach masters from lb when unready +be9f2c07315cad2be925fb27cb3dfe040dbd4171 2023-03-27T17:18:47+02:00 UPSTREAM: : legacy-cloud-providers: azure: use kube-proxy based health probes by default +# ovn-kubernetes image-arm64 9799fbc9bef06304e8195fbc4b37b2e095ec9325 to 9b3dfbb7fa73f07e936bf6e610ab31af2db94926 +eb246f156fb681f9ddb8797f4f82440c4370316e 2023-03-28T08:15:44+00:00 Defer wait on startOvnKube might prevent panic crash +d2fee85be49ed478a0862daeca0a230833dc70dd 2023-03-28T08:15:43+00:00 Start master metrics server for all master instances +37336490ec3e7b71c45aa7837f3bb1c482e35068 2023-03-28T08:15:43+00:00 Single leader election +363b633d1180c4e43f82fdb49f9b384aee7f9a4e 2023-03-28T08:15:42+00:00 Fix NAD controller Stop +34eb56293928264919eb9e817eddaf62321a9370 2023-03-23T17:39:12+01:00 Optimize egress firewall cleanup to only select switches that have stale acls. +7fb527e1eb9b511981cb51be6b79901e4aedbd2f 2023-03-23T17:38:41+01:00 Batch potentially big transaction on egress firewall ACLs migration. The default transaction timeout is 10 seconds, it can be reached when we delete all egress firewall acls during migration to port groups from switches. diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 765ea5d74a..1f802be788 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,14 +1,14 @@ https://github.com/openshift/cluster-dns-operator embedded-component d96022a4d0d091955d73e7e99fc8cc81db56c86a https://github.com/openshift/cluster-ingress-operator embedded-component 6aa482c551de22016dc2b6c87ca11ef4ac2be04d -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component f2d9ccd2f585c57409257fae99da7f52ed6042cf -https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 280c115d63367f4ede8a4e893549cdc5919e8920 -https://github.com/openshift/cluster-kube-scheduler-operator embedded-component fbc6ef4df8b0d9ea97acf9b0330d44a3a171b4fd -https://github.com/openshift/cluster-network-operator embedded-component ae70394d0198a1d5a310410ba3468f38ce0522c2 -https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 7867c26e6c91e2cc279317dfc080befe63a60749 +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 5f038db7df7ade2f3da707394a14e391c693d25c +https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component cdde94837bec1810dbad71ca070a84f212de0cbb +https://github.com/openshift/cluster-kube-scheduler-operator embedded-component dc5cba57ddcdb5a4b43240d1c2ab908fa953d887 +https://github.com/openshift/cluster-network-operator embedded-component 756cae2baa82af3604fbe016eb0f776d8efaa61b +https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 9a8aba8cad6491a31e743a7e366d758351482d88 https://github.com/openshift/cluster-policy-controller embedded-component d02c85ab3203fe22eddcc4694e17504ef34935de https://github.com/openshift/etcd embedded-component f70da9d78221bc3e6bf8ac14c0c4ecc106f4f57d -https://github.com/openshift/kubernetes embedded-component dc93b13d1f6518d62ea9e3dea64d843c2ce35cbf -https://github.com/openshift/machine-config-operator embedded-component a4e68fb1d5eed30d4c1b6f60e9385baf41a30bb3 +https://github.com/openshift/kubernetes embedded-component 7195e44fb36b487f275becffbf5828e2021f94d4 +https://github.com/openshift/machine-config-operator embedded-component 428c2e0655c6a5fc876dad8864a5451142b5c3e2 https://github.com/openshift/openshift-controller-manager embedded-component 87de83867ac51730f506138ee790a56ca21d9fc9 https://github.com/openshift/route-controller-manager embedded-component d7a8e22db412b6fabb7028ca0da8de8f3d9ac3c3 https://github.com/openshift/service-ca-operator embedded-component 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a @@ -16,13 +16,13 @@ https://github.com/openshift/oc image-amd64 92b1a3d0e5d092430b523f6541aa0c504b22 https://github.com/openshift/coredns image-amd64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb https://github.com/openshift/router image-amd64 e28644631982fb4596e065d3ae85099f0886829d https://github.com/openshift/kube-rbac-proxy image-amd64 0aa2830ed7359fd8cd0e2f7db0ed96a733c5990e -https://github.com/openshift/ovn-kubernetes image-amd64 cb89e52240fe7346409589a9acae9c0106d24b03 -https://github.com/openshift/kubernetes image-amd64 dc93b13d1f6518d62ea9e3dea64d843c2ce35cbf +https://github.com/openshift/ovn-kubernetes image-amd64 9d94b5f604f18016e41b2ba507ae3df373800754 +https://github.com/openshift/kubernetes image-amd64 7195e44fb36b487f275becffbf5828e2021f94d4 https://github.com/openshift/service-ca-operator image-amd64 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a https://github.com/openshift/oc image-arm64 92b1a3d0e5d092430b523f6541aa0c504b2222b3 https://github.com/openshift/coredns image-arm64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb https://github.com/openshift/router image-arm64 e28644631982fb4596e065d3ae85099f0886829d https://github.com/openshift/kube-rbac-proxy image-arm64 0aa2830ed7359fd8cd0e2f7db0ed96a733c5990e -https://github.com/openshift/ovn-kubernetes image-arm64 9799fbc9bef06304e8195fbc4b37b2e095ec9325 +https://github.com/openshift/ovn-kubernetes image-arm64 9b3dfbb7fa73f07e936bf6e610ab31af2db94926 https://github.com/openshift/kubernetes image-arm64 dc93b13d1f6518d62ea9e3dea64d843c2ce35cbf https://github.com/openshift/service-ca-operator image-arm64 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index cfe7f2e488..4d2fcec894 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.13.0-0.nightly-2023-03-28-014156" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-03-28-131444" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.13.0-0.nightly-2023-04-01-062001" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-03-30-050636" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12" diff --git a/vendor/k8s.io/legacy-cloud-providers/azure/azure.go b/vendor/k8s.io/legacy-cloud-providers/azure/azure.go index 461ef3171c..ab90c5a443 100644 --- a/vendor/k8s.io/legacy-cloud-providers/azure/azure.go +++ b/vendor/k8s.io/legacy-cloud-providers/azure/azure.go @@ -858,7 +858,7 @@ func (az *Cloud) updateNodeCaches(prevNode, newNode *v1.Node) { case hasExcludeBalancerLabel: az.excludeLoadBalancerNodes.Insert(newNode.ObjectMeta.Name) - case !isNodeReady(newNode) && getCloudTaint(newNode.Spec.Taints) == nil: + case !isNodeReady(newNode) && !isNodeMaster(newNode) && getCloudTaint(newNode.Spec.Taints) == nil: // If not in ready state and not a newly created node, add to excludeLoadBalancerNodes cache. // New nodes (tainted with "node.cloudprovider.kubernetes.io/uninitialized") should not be // excluded from load balancers regardless of their state, so as to reduce the number of @@ -1005,6 +1005,17 @@ func isNodeReady(node *v1.Node) bool { return false } +func isNodeMaster(node *v1.Node) bool { + labels := node.GetLabels() + for l := range labels { + if l == "node-role.kubernetes.io/master" || l == "node-role.kubernetes.io/control-plane" { + return true + } + } + + return false +} + func getCloudTaint(taints []v1.Taint) *v1.Taint { for _, taint := range taints { if taint.Key == cloudproviderapi.TaintExternalCloudProvider { diff --git a/vendor/k8s.io/legacy-cloud-providers/azure/azure_loadbalancer.go b/vendor/k8s.io/legacy-cloud-providers/azure/azure_loadbalancer.go index 13246826f6..dadaf174d6 100644 --- a/vendor/k8s.io/legacy-cloud-providers/azure/azure_loadbalancer.go +++ b/vendor/k8s.io/legacy-cloud-providers/azure/azure_loadbalancer.go @@ -123,6 +123,12 @@ const ( serviceUsingDNSKey = "kubernetes-dns-label-service" defaultLoadBalancerSourceRanges = "0.0.0.0/0" + + // NOTE: Please keep the following port in sync with ProxyHealthzPort in k/k pkg/cluster/ports/ports.go + // ports.ProxyHealthzPort was not used here to avoid dependencies to k8s.io/kubernetes in the + // GCE cloud provider which is required as part of the out-of-tree cloud provider efforts. + // TODO: use a shared constant once ports in pkg/cluster/ports are in a common external repo. + lbNodesHealthCheckPort = 10256 ) // GetLoadBalancer returns whether the specified load balancer and its components exist, and @@ -1642,7 +1648,7 @@ func (az *Cloud) reconcileLoadBalancerRule( lbRuleName := az.getLoadBalancerRuleName(service, port.Protocol, port.Port) klog.V(2).Infof("reconcileLoadBalancerRule lb name (%s) rule name (%s)", lbName, lbRuleName) - transportProto, _, probeProto, err := getProtocolsFromKubernetesProtocol(port.Protocol) + transportProto, _, _, err := getProtocolsFromKubernetesProtocol(port.Protocol) if err != nil { return expectedProbes, expectedRules, err } @@ -1670,24 +1676,34 @@ func (az *Cloud) reconcileLoadBalancerRule( }, }) } else if port.Protocol != v1.ProtocolUDP && port.Protocol != v1.ProtocolSCTP { - // we only add the expected probe if we're doing TCP + var actualPath *string + probePort := port.NodePort + if probeProtocol == "" { - probeProtocol = string(*probeProto) + // If no protocol is specified we want to fall back to HTTP + // as we want to leverage kube-proxy's HTTP health endpoint + // unless otherwise specified. + probeProtocol = string(network.ProbeProtocolHTTP) } - var actualPath *string + if !strings.EqualFold(probeProtocol, string(network.ProbeProtocolTCP)) { + // In case this is not TCP, instead of using NodePort, we want to probe against + // kube-proxy's HTTP health endpoint which, unless otherwise specified, + // is available at port lbNodesHealthCheckPort and /healthz path. + probePort = lbNodesHealthCheckPort if requestPath != "" { actualPath = to.StringPtr(requestPath) } else { actualPath = to.StringPtr("/healthz") } } + expectedProbes = append(expectedProbes, network.Probe{ Name: &lbRuleName, ProbePropertiesFormat: &network.ProbePropertiesFormat{ Protocol: network.ProbeProtocol(probeProtocol), RequestPath: actualPath, - Port: to.Int32Ptr(port.NodePort), + Port: to.Int32Ptr(probePort), IntervalInSeconds: to.Int32Ptr(5), NumberOfProbes: to.Int32Ptr(2), }, diff --git a/vendor/modules.txt b/vendor/modules.txt index 82d80ab82c..678249acba 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1362,7 +1362,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230320215851-dc93b13d1f65 +# k8s.io/api v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1418,7 +1418,7 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apiextensions-apiserver v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230320215851-dc93b13d1f65 +# k8s.io/apiextensions-apiserver v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1462,7 +1462,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.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230320215851-dc93b13d1f65 +# k8s.io/apimachinery v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1526,7 +1526,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.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230320215851-dc93b13d1f65 +# k8s.io/apiserver v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/cel @@ -1680,12 +1680,12 @@ k8s.io/apiserver/plugin/pkg/audit/webhook 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/cli-runtime v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230320215851-dc93b13d1f65 +# k8s.io/cli-runtime v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230320215851-dc93b13d1f65 +# k8s.io/client-go v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -2015,7 +2015,7 @@ k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230320215851-dc93b13d1f65 +# k8s.io/cloud-provider v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -2035,14 +2035,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-20230320215851-dc93b13d1f65 +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 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.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230320215851-dc93b13d1f65 +# k8s.io/component-base v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -2075,7 +2075,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.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230320215851-dc93b13d1f65 +# k8s.io/component-helpers v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -2088,7 +2088,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.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230320215851-dc93b13d1f65 +# k8s.io/controller-manager v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -2105,16 +2105,16 @@ 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-20230320215851-dc93b13d1f65 +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1 k8s.io/cri-api/pkg/errors -# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230320215851-dc93b13d1f65 +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 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-20230320215851-dc93b13d1f65 +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/dynamic-resource-allocation/resourceclaim # k8s.io/gengo v0.0.0-20220902162205-c0856e24416d @@ -2133,11 +2133,11 @@ k8s.io/klog/v2/internal/clock k8s.io/klog/v2/internal/dbg k8s.io/klog/v2/internal/serialize k8s.io/klog/v2/internal/severity -# k8s.io/kms v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230320215851-dc93b13d1f65 +# k8s.io/kms v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/kms/apis/v1beta1 k8s.io/kms/apis/v2alpha1 -# k8s.io/kube-aggregator v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230320215851-dc93b13d1f65 +# k8s.io/kube-aggregator v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2168,7 +2168,7 @@ k8s.io/kube-aggregator/pkg/controllers/status 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-20230320215851-dc93b13d1f65 +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 @@ -2201,13 +2201,13 @@ 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-20230320215851-dc93b13d1f65 +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/kube-scheduler/config/v1 k8s.io/kube-scheduler/config/v1beta2 k8s.io/kube-scheduler/config/v1beta3 k8s.io/kube-scheduler/extender/v1 -# k8s.io/kubectl v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230320215851-dc93b13d1f65 +# k8s.io/kubectl v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources @@ -2243,7 +2243,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.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230320215851-dc93b13d1f65 +# k8s.io/kubelet v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 @@ -2260,7 +2260,7 @@ k8s.io/kubelet/pkg/apis/pluginregistration/v1 k8s.io/kubelet/pkg/apis/podresources/v1 k8s.io/kubelet/pkg/apis/podresources/v1alpha1 k8s.io/kubelet/pkg/apis/stats/v1alpha1 -# k8s.io/kubernetes v1.26.1 => github.com/openshift/kubernetes v0.0.0-20230320215851-dc93b13d1f65 +# k8s.io/kubernetes v1.26.1 => github.com/openshift/kubernetes v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -3048,7 +3048,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/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230320215851-dc93b13d1f65 +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/legacy-cloud-providers/aws k8s.io/legacy-cloud-providers/azure @@ -3091,7 +3091,7 @@ k8s.io/legacy-cloud-providers/gce/gcpcredential k8s.io/legacy-cloud-providers/vsphere k8s.io/legacy-cloud-providers/vsphere/vclib k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers -# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230320215851-dc93b13d1f65 +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3106,10 +3106,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-20230320215851-dc93b13d1f65 +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.25.0 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230320215851-dc93b13d1f65 +# k8s.io/pod-security-admission v0.25.0 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230330150607-7195e44fb36b ## explicit; go 1.19 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3252,33 +3252,33 @@ sigs.k8s.io/structured-merge-diff/v4/value ## explicit; go 1.12 sigs.k8s.io/yaml # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.4.1-0.20221214150008-e73634cb3870 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230320215851-dc93b13d1f65 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230320215851-dc93b13d1f65 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230330150607-7195e44fb36b +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230330150607-7195e44fb36b +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230330150607-7195e44fb36b +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230330150607-7195e44fb36b +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230330150607-7195e44fb36b +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230330150607-7195e44fb36b +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230330150607-7195e44fb36b +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230330150607-7195e44fb36b +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230330150607-7195e44fb36b +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230330150607-7195e44fb36b +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230330150607-7195e44fb36b +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230330150607-7195e44fb36b +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230330150607-7195e44fb36b +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230330150607-7195e44fb36b +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230330150607-7195e44fb36b +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230330150607-7195e44fb36b +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230330150607-7195e44fb36b +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230330150607-7195e44fb36b +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230330150607-7195e44fb36b +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230330150607-7195e44fb36b +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230330150607-7195e44fb36b +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230330150607-7195e44fb36b +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230330150607-7195e44fb36b +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230330150607-7195e44fb36b +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230330150607-7195e44fb36b +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230330150607-7195e44fb36b +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230330150607-7195e44fb36b +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230330150607-7195e44fb36b +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230330150607-7195e44fb36b +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230330150607-7195e44fb36b