diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index 9657455417..c842e8b036 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=06e8c46c9f0d3f6bfcd1e146c09647e4b634e4eb +KUBE_GIT_COMMIT=dc93b13d1f6518d62ea9e3dea64d843c2ce35cbf KUBE_GIT_TREE_STATE=clean diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 22b30fdac4..4e1b106fb0 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-22-000936" + "base": "4.13.0-0.nightly-arm64-2023-03-25-181910" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:445670bcaf530b0608f2ebba64ec716b1d84840d43149576b68980a689412bc2", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec2a9cb239bbce0ff1bb58e4bbfca7fc86744a63b454509923e6ee5532f61cae", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:818d27868481e940af1a28783d2ab5c5d122ad3baaacd2fb9f6545c4fa0251bb", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:11085faadac204f2eab74f84ca956581a689cf0543ac8f17ad366b941fa19c57", + "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:c2925eb732f1153563c33e0debf142bc7c18fd861367d935242c102a10cbea37", "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:d80ba46dfb5ed65ecb141a063b0fd683a5eb7840559d748d6ace575228c9bad2", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8feb18d7423f4fc6f01203d7fe7c5652324f2b1ec673a3f47b612248ef4977be", + "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", "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 df494dede6..f8d8e8deda 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-19-052243" + "base": "4.13.0-0.nightly-2023-03-23-204038" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c66da0adc83e5e6db1824ff5cf204610d36f29fc0c7a8352b24795f58151eefe", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a604c96952da5e59f104a305e0c8303d474e33ef345b8c534fd677f189d05299", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0743d54d3acaf6558295618248ff446b4352dde0234d52465d7578c7c261e6fd", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5795789f6e56ae0c7644ae2380c6d88d6b2a88d64ab8581064bc746f0a97b52d", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84aba6cc9ed84cd95a85cbc1b240a0db907b4b3a24d556715a8e6fd77065936f", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b3035476ded4209f81be2ede369e88d36bea8d3f03193836bda1d8ef07c7613", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5acaed1deee8b25170f8809fa1094037fea118d2ca0a303c8ad1849170e0cc95", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:28c8cc87355833e4d0a06be3bdbd3f1cfb5b9986e1504d23149df2fdd796557a", "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:9a21858c61e35722a243df3593c0329e90c4f78c334b21177da3a2f94f9c14dc", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f7cb6554c1dc9b5b3b58f162f592062e5c63bf24c5ed90a62074e117be3f743", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bd970d579474f95de533c4eee7d5a28ece5bc4fe655367f15d2cfe4b7467a13f", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:03594cca8fa68b1d406d0d1812d036d5c06d291aee9d3249c423e12394ace800", "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 377281922f..8aaf3223ec 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -137,39 +137,39 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.4.1-0.20221214150008-e73634cb3870 // from kubernetes - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20230125165349-13c18c444a8c // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20230125165349-13c18c444a8c // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20230125165349-13c18c444a8c // from etcd - go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230125165349-13c18c444a8c // from etcd - go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20230125165349-13c18c444a8c // from etcd - go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20230125165349-13c18c444a8c // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230313100333-06e8c46c9f0d // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230313100333-06e8c46c9f0d // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20230322155524-f70da9d78221 // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20230322155524-f70da9d78221 // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20230322155524-f70da9d78221 // from etcd + 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 ) diff --git a/etcd/go.sum b/etcd/go.sum index 0f438e0b20..a83a671226 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -359,30 +359,30 @@ github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn github.com/onsi/gomega v1.23.0 h1:/oxKu9c2HVap+F3PfKort2Hw5DEU+HGlW8n+tguWsys= github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d h1:RR4ah7FfaPR1WePizm0jlrsbmPu91xQZnAsVVreQV1k= github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= -github.com/openshift/etcd/api/v3 v3.5.1-0.20230125165349-13c18c444a8c h1:V681KQQqIHNe46Cx+EIbw04kBeK73fVmjU17/bLSd48= -github.com/openshift/etcd/api/v3 v3.5.1-0.20230125165349-13c18c444a8c/go.mod h1:KFtNaxGDw4Yx/BA4iPPwevUTAuqcsPxzyX8PHydchN8= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20230125165349-13c18c444a8c h1:CznQ70pOj1YwdXyPprLgAILh4TZPcI8IDML6OOXhg2o= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20230125165349-13c18c444a8c/go.mod h1:ggrwbk069qxpKPq8/FKkQ3Xq9y39kbFR4LnKszpRXeQ= -github.com/openshift/etcd/client/v3 v3.5.1-0.20230125165349-13c18c444a8c h1:+1seo/rJ92p92SGlTNJshSvmfY497KLj35J4MzDulJA= -github.com/openshift/etcd/client/v3 v3.5.1-0.20230125165349-13c18c444a8c/go.mod h1:f6GRinRMCsFVv9Ht42EyY7nfsVGwrNO0WEoS2pRKzQk= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230125165349-13c18c444a8c h1:qvRmgvbB+XYn4xlw8hPDNJpecPuQRcHaQmcggIn3uOI= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230125165349-13c18c444a8c/go.mod h1:qATwUzDb6MLyGWq2nUj+jwXqZJcxkCuabh0P7Cuff3k= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20230125165349-13c18c444a8c h1:F2zw47hfDpS5Q+bSD8zN3MCssTDibKsD2nOAqHxINc0= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20230125165349-13c18c444a8c/go.mod h1:wL8kkRGx1Hp8FmZUuHfL3K2/OaGIDaXGr1N7i2G07J0= -github.com/openshift/etcd/server/v3 v3.5.1-0.20230125165349-13c18c444a8c h1:dlpgsW1KSYbbI8pV2T1n38SvXGbxsJwwpHqJ8NHqH4w= -github.com/openshift/etcd/server/v3 v3.5.1-0.20230125165349-13c18c444a8c/go.mod h1:6/Gfe8XTGXQJgLYQ65oGKMfPivb2EASLUSMSWN9Sroo= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230313100333-06e8c46c9f0d h1:O9dKtgn8Ugfhgkg8XerrPkX06rDlEUaUqcy7U9p/piE= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:RTbOBHv2jYAglrayTACr8ehH2HG1tEW8PXS62qjcXsM= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230313100333-06e8c46c9f0d h1:AWVQDZDaTMZlBJg7qs6ti42OFLz8ItAPerZZWWPzX94= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:IgGsaYCHg2HXxQq/DkcLV7Qqb5wXHuiOghXAWNRvTIo= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230313100333-06e8c46c9f0d h1:8QbIbd5UiPzz4HO10qQjoO3QkYv3wxViIx6H2eDlXIM= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:9VL9PumwGZm4ySijjOkqi2A8Q8o/jH6NPv36Hcyff2c= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230313100333-06e8c46c9f0d h1:ecF2n0bTfIPT7f++UVu3YBRyh6nsgNcXbfaUBhIxBzQ= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:j2CuU4yppRfeP82jtQ9Og0EPAoA03neRboLDK7m4tQc= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230313100333-06e8c46c9f0d h1:OxS4PwaQImogppbSFQSAwn98AWw8j/yVa/ARBu6pfYw= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:Qixtkhh98MU5XSgj3qwsRRdXX650+J9CmYavg7UHfGc= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230313100333-06e8c46c9f0d h1:KhvFDpp6dnq7XTmOYQCUrd0s+4tFc+aHOdijRd8Ss9Q= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:PHFHN0OYvl1mOobtWnD5t83uJuHy4pDEeshl0a/t5Do= +github.com/openshift/etcd/api/v3 v3.5.1-0.20230322155524-f70da9d78221 h1:6iHSb9/2IO+KNysJe8f6uaOlgOlottjpWdNmqU1fOD0= +github.com/openshift/etcd/api/v3 v3.5.1-0.20230322155524-f70da9d78221/go.mod h1:KFtNaxGDw4Yx/BA4iPPwevUTAuqcsPxzyX8PHydchN8= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20230322155524-f70da9d78221 h1:GSVuFn24PRFJiteHhfZRuzHIuknW6YYF1GQbpFdiRwo= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20230322155524-f70da9d78221/go.mod h1:ggrwbk069qxpKPq8/FKkQ3Xq9y39kbFR4LnKszpRXeQ= +github.com/openshift/etcd/client/v3 v3.5.1-0.20230322155524-f70da9d78221 h1:QobW0Rx7CQCRtKrdx96mzeQ6dFr/bt9w7PUXSRX5rFw= +github.com/openshift/etcd/client/v3 v3.5.1-0.20230322155524-f70da9d78221/go.mod h1:f6GRinRMCsFVv9Ht42EyY7nfsVGwrNO0WEoS2pRKzQk= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230322155524-f70da9d78221 h1:t4Ou0Z3dAToKlmoi/e7M3a/NIakbPmrxufgUeg5rrcA= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230322155524-f70da9d78221/go.mod h1:qATwUzDb6MLyGWq2nUj+jwXqZJcxkCuabh0P7Cuff3k= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20230322155524-f70da9d78221 h1:Sjmgmr4KVEXb1Z0Vv0yiq4uD33lz/FxzhVhz/8XCJ7Q= +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/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/modules.txt b/etcd/vendor/modules.txt index c8cb62502a..061fd9dd93 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -257,7 +257,7 @@ github.com/xlab/treeprint # go.etcd.io/bbolt v1.3.6 ## explicit; go 1.12 go.etcd.io/bbolt -# go.etcd.io/etcd/api/v3 v3.5.6 => github.com/openshift/etcd/api/v3 v3.5.1-0.20230125165349-13c18c444a8c +# go.etcd.io/etcd/api/v3 v3.5.6 => github.com/openshift/etcd/api/v3 v3.5.1-0.20230322155524-f70da9d78221 ## explicit; go 1.16 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb @@ -266,7 +266,7 @@ go.etcd.io/etcd/api/v3/membershippb go.etcd.io/etcd/api/v3/mvccpb go.etcd.io/etcd/api/v3/v3rpc/rpctypes go.etcd.io/etcd/api/v3/version -# go.etcd.io/etcd/client/pkg/v3 v3.5.6 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20230125165349-13c18c444a8c +# go.etcd.io/etcd/client/pkg/v3 v3.5.6 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20230322155524-f70da9d78221 ## explicit; go 1.16 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil @@ -279,14 +279,14 @@ go.etcd.io/etcd/client/pkg/v3/types # go.etcd.io/etcd/client/v2 v2.305.6 ## explicit; go 1.16 go.etcd.io/etcd/client/v2 -# go.etcd.io/etcd/client/v3 v3.5.6 => github.com/openshift/etcd/client/v3 v3.5.1-0.20230125165349-13c18c444a8c +# go.etcd.io/etcd/client/v3 v3.5.6 => github.com/openshift/etcd/client/v3 v3.5.1-0.20230322155524-f70da9d78221 ## explicit; go 1.16 go.etcd.io/etcd/client/v3 go.etcd.io/etcd/client/v3/concurrency go.etcd.io/etcd/client/v3/credentials go.etcd.io/etcd/client/v3/internal/endpoint go.etcd.io/etcd/client/v3/internal/resolver -# go.etcd.io/etcd/pkg/v3 v3.5.6 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230125165349-13c18c444a8c +# go.etcd.io/etcd/pkg/v3 v3.5.6 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230322155524-f70da9d78221 ## explicit; go 1.16 go.etcd.io/etcd/pkg/v3/adt go.etcd.io/etcd/pkg/v3/contention @@ -303,14 +303,14 @@ go.etcd.io/etcd/pkg/v3/runtime go.etcd.io/etcd/pkg/v3/schedule go.etcd.io/etcd/pkg/v3/traceutil go.etcd.io/etcd/pkg/v3/wait -# go.etcd.io/etcd/raft/v3 v3.5.6 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20230125165349-13c18c444a8c +# go.etcd.io/etcd/raft/v3 v3.5.6 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20230322155524-f70da9d78221 ## explicit; go 1.16 go.etcd.io/etcd/raft/v3 go.etcd.io/etcd/raft/v3/confchange go.etcd.io/etcd/raft/v3/quorum go.etcd.io/etcd/raft/v3/raftpb go.etcd.io/etcd/raft/v3/tracker -# go.etcd.io/etcd/server/v3 v3.5.5 => github.com/openshift/etcd/server/v3 v3.5.1-0.20230125165349-13c18c444a8c +# go.etcd.io/etcd/server/v3 v3.5.5 => github.com/openshift/etcd/server/v3 v3.5.1-0.20230322155524-f70da9d78221 ## explicit; go 1.16 go.etcd.io/etcd/server/v3/auth go.etcd.io/etcd/server/v3/config @@ -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-20230313100333-06e8c46c9f0d +# k8s.io/api v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/apimachinery v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/cli-runtime v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/client-go v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/component-base v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/kubectl v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230320215851-dc93b13d1f65 ## explicit; go 1.19 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -992,38 +992,38 @@ sigs.k8s.io/yaml # github.com/openshift/microshift/pkg/config => ../pkg/config # github.com/openshift/microshift/pkg/util/cryptomaterial => ../pkg/util/cryptomaterial # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.4.1-0.20221214150008-e73634cb3870 -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20230125165349-13c18c444a8c -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20230125165349-13c18c444a8c -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20230125165349-13c18c444a8c -# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230125165349-13c18c444a8c -# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20230125165349-13c18c444a8c -# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20230125165349-13c18c444a8c -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230313100333-06e8c46c9f0d +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20230322155524-f70da9d78221 +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20230322155524-f70da9d78221 +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20230322155524-f70da9d78221 +# 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 diff --git a/go.mod b/go.mod index ff95bf7caa..4591ad7aca 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-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230313100333-06e8c46c9f0d // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230313100333-06e8c46c9f0d // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230313100333-06e8c46c9f0d // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230313100333-06e8c46c9f0d // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230313100333-06e8c46c9f0d // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230313100333-06e8c46c9f0d // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230313100333-06e8c46c9f0d // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230313100333-06e8c46c9f0d // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230313100333-06e8c46c9f0d // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230313100333-06e8c46c9f0d // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230313100333-06e8c46c9f0d // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230313100333-06e8c46c9f0d // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230313100333-06e8c46c9f0d // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230313100333-06e8c46c9f0d // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230313100333-06e8c46c9f0d // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230313100333-06e8c46c9f0d // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230313100333-06e8c46c9f0d // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230313100333-06e8c46c9f0d // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230313100333-06e8c46c9f0d // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230313100333-06e8c46c9f0d // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230313100333-06e8c46c9f0d // 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 ) diff --git a/go.sum b/go.sum index 31467ffb00..9879325e33 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-20230217170320-ac01e3463245 h1:BoNt9Hemwyc32xX+CZZaNGegWEiN7bGTVk4XaRboO8k= github.com/openshift/cluster-policy-controller v0.0.0-20230217170320-ac01e3463245/go.mod h1:vlkRuwyRueLOQ/ZRRle+rCrh+YNoh+pzJm9WaN9e6mU= -github.com/openshift/kubernetes v0.0.0-20230313100333-06e8c46c9f0d h1:Dgt8ixdiZWJ+4gm75/6Jp2QeOjeWPYMIBMvhj74sUYE= -github.com/openshift/kubernetes v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:FFmjFkZxW22qBBjGCdvUj9MzYgHeh1t+7fG3n7162tM= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230313100333-06e8c46c9f0d h1:O9dKtgn8Ugfhgkg8XerrPkX06rDlEUaUqcy7U9p/piE= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:RTbOBHv2jYAglrayTACr8ehH2HG1tEW8PXS62qjcXsM= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230313100333-06e8c46c9f0d h1:hKcX/01NZPOdKRQpkrGaAJjN5w03j2YN4h+o57AIOko= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:U0Mmzj5eyc8IBdGjsF2XR3dBQG0yqvhy468GKZvdfXU= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230313100333-06e8c46c9f0d h1:AWVQDZDaTMZlBJg7qs6ti42OFLz8ItAPerZZWWPzX94= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:IgGsaYCHg2HXxQq/DkcLV7Qqb5wXHuiOghXAWNRvTIo= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230313100333-06e8c46c9f0d h1:EE2mLC5UjhuJqiUziy3uB0ZX30E5V44IwHy1zymkKaA= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:xwqK7Ox7oH/b11ZMPYtqPV/OYt2ZlYZf7XsuukECSc4= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230313100333-06e8c46c9f0d h1:8QbIbd5UiPzz4HO10qQjoO3QkYv3wxViIx6H2eDlXIM= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:9VL9PumwGZm4ySijjOkqi2A8Q8o/jH6NPv36Hcyff2c= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230313100333-06e8c46c9f0d h1:ecF2n0bTfIPT7f++UVu3YBRyh6nsgNcXbfaUBhIxBzQ= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:j2CuU4yppRfeP82jtQ9Og0EPAoA03neRboLDK7m4tQc= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230313100333-06e8c46c9f0d h1:Q3ynj6SKH2+cipW6icrrj7OwWDYDws5DHA27M3GAAyo= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:C8LxhCSrMIvk2892MFXHd6Ygyy/cCVK30VOZZVm4KSM= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230313100333-06e8c46c9f0d h1:ImQSJfQPoIPYyRXqMQopSJqw6dbRsUrLZs16BX0wX9o= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:sf8VADmgVR2MzucAzvUaYsYLUi8S4onGjDNXWp6+iOw= -github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:HDEVJ4fMSa8PKXQ5cJgG2PEEYCM9NDxpj7EojkpHatA= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230313100333-06e8c46c9f0d h1:OxS4PwaQImogppbSFQSAwn98AWw8j/yVa/ARBu6pfYw= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:Qixtkhh98MU5XSgj3qwsRRdXX650+J9CmYavg7UHfGc= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230313100333-06e8c46c9f0d h1:0ffEzdd9FHclp2fUeM+mN5M1wWAsiQVDrvw7nAIHFAQ= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:v9q5XN/HFJwSIQ9HiyzSh9Pgpkf0sdmLX2s4wWmub1c= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230313100333-06e8c46c9f0d h1:0IAgchKDlVwcZ+nsUmqb5/mbVSg7XLa0I9uLfACb6/Y= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:45yXoVo9Jbbpsz92uqBbG2oVBkVEWv+4ROfek4yo0NE= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230313100333-06e8c46c9f0d h1:3K9qiaqZQovXk5/yMQuxVy9A0kdYoOr3w3krzFwACSI= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:X6BH8wZUzqCnAYka7oy7QYoBUcN3xSXV6rZIxdXoArE= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230313100333-06e8c46c9f0d h1:kAwen1UYBzLvSwj9ncIXOS6S4gw2kMpUEPxfebEhOjg= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:aNNfBLYfQbTrwqWHK9JMaodwbDNG1lELDChC0mhKLJQ= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230313100333-06e8c46c9f0d h1:aXAYgO+1OjlaNPMSRqeArTOeUUke/HM7vNRMt+N/bYc= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:MovKp06tUSXe3MnKchEr1D8CdDZgIhYiw6D6sBjZy94= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230313100333-06e8c46c9f0d h1:Kfv9Jj6ecUQyEf1CZo21Omphnt38Qc7OI+8eXeqocjA= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:RBaXXXu0TgOgwWU+GKrNbBjVj6I6mZ3Kuwxphmx83hM= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230313100333-06e8c46c9f0d h1:PuGG6xGmoXqtdeGKqZBdz1op3eXmju5BBHgao1gEf24= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:tZLl7PAQI9WT9QcUVeua4aK0EIZE1DZhQorO9WLoRGs= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230313100333-06e8c46c9f0d h1:N/O7qAJBelkGxA28SmndzB5cQJ/XjVQKT5hQ695/Y+Y= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:FmdoDrAFpzYtGWgaPrurpkB+ITnnOV/V/+uoFPovBKA= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230313100333-06e8c46c9f0d h1:KNsM9ollRlqwj01LDfkiRi3jvzDBaBVBionIzuhqFj4= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:Zgt5E29gT4nxpbFBvx43u3fRNTfMAvqZxchXnjw+gOo= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230313100333-06e8c46c9f0d h1:KhvFDpp6dnq7XTmOYQCUrd0s+4tFc+aHOdijRd8Ss9Q= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:PHFHN0OYvl1mOobtWnD5t83uJuHy4pDEeshl0a/t5Do= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230313100333-06e8c46c9f0d h1:hyZGouKatZ4B2D6cxcOUqq7kuCISAgbcU2V7w+I/stc= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:A6pOnDSKM3jdR7v/EOkKKuHWsR3GGm4T3Vr9jS1U6QA= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230313100333-06e8c46c9f0d h1:AtJIroIWcA6GjwoiMwaKGfbPXtY4v+ys1BojV14ZK/c= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:K4ChxIQRGSv8E4Cz3XSuZ38G5UwpTb/4p32vGMDpa1k= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230313100333-06e8c46c9f0d h1:D8nhhruiCoH1+WBqL09IbYdewChsUpg3DSk5ZMdvlKk= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:5qMnaoxtG8tgh9JRt99mH4aEw1Us6LFFigCQExPUeXQ= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230313100333-06e8c46c9f0d h1:RhgNk8RQhIt1egiIrASCeKsNZ3M5K/en+2LIGeIgE8Q= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:1PgQc8yQxp+tnTD2lzlyNGTngwImNyANUq74eRnHT5U= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230313100333-06e8c46c9f0d h1:3E37ptCqpNMjg+BOXy4tR3NCwIxcmqtjUp9wPKT+Zsg= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230313100333-06e8c46c9f0d/go.mod h1:KtKLalpm2l5WOPMqKs6VETKre5j3sPUz0D16MXQd1QI= +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/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 fd7bf88370..ab7d43af75 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:9a21858c61e35722a243df3593c0329e90c4f78c334b21177da3a2f94f9c14dc" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bd970d579474f95de533c4eee7d5a28ece5bc4fe655367f15d2cfe4b7467a13f" 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 917ec48c41..917361c506 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:d80ba46dfb5ed65ecb141a063b0fd683a5eb7840559d748d6ace575228c9bad2" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe1d1fa6f1515af43bdf7134c9726b4ec96f15afdeac1a29788edaacc972b3ba" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 68e70c2fa5..b051ff83e9 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,3 +1,26 @@ -# kubernetes image-arm64 06e8c46c9f0d3f6bfcd1e146c09647e4b634e4eb to dc93b13d1f6518d62ea9e3dea64d843c2ce35cbf +# cluster-kube-apiserver-operator embedded-component 5cec361179f3658986890a87d0b51f40a1da89ad to 3e62b53e39db960ccc16d717d1a25d751d4e9c49 +1c5fd4bda695466143aedbd0879a3c7817d5190e 2023-03-22T14:10:31+01:00 bump o/api for updated featuregates +4cd9677808d79ec82541c97cc9140f59e87edebb 2023-03-15T14:13:20-04:00 revert dev cert rotation for 4.13 +e85a5c62570176c72e7b0b45e0a4e217c1654105 2023-03-15T14:12:07+01:00 psaconfig: invert the enforce/log logic to default to logging +# cluster-kube-controller-manager-operator embedded-component 4ca346ef97def3697f1aa0368c9b35459b9b2f59 to 2a3e578c1007d7534eadffcca2adc979cb712995 +decb5bb7cb39f9eaa2443d2210a25cbddcae4273 2023-03-20T09:46:22-04:00 update vendor folder +24c84fdcd65444c9fbf2635b1848309abefc6edc 2023-03-20T09:46:10-04:00 bump(library-go) +# etcd embedded-component 13c18c444a8c6a86ccbba16cce664008f5f948bd to f70da9d78221bc3e6bf8ac14c0c4ecc106f4f57d +5c156b653c1f67d0d49d4857fd868f72cc0c854f 2023-01-11T14:39:32-08:00 Update owners +# kubernetes embedded-component 06e8c46c9f0d3f6bfcd1e146c09647e4b634e4eb to dc93b13d1f6518d62ea9e3dea64d843c2ce35cbf 916c65ebea0205d3c18d3701f48cf568ef9e7220 2023-03-17T23:03:18+00:00 UPSTREAM: 115328: annotate early and late requests a6938113b34b64c0626efa322cd4d3c1132d64fb 2023-03-17T23:03:18+00:00 UPSTREAM: : Revert "UPSTREAM: : annotate audit events for requests during unready phase and graceful termination phase" +# router image-amd64 69eda4bd427c3f27d9993afa35461f4fc1dc0357 to e28644631982fb4596e065d3ae85099f0886829d +5381cb80c2905550549406ddba3891bec541fc8e 2023-03-20T12:57:57+00:00 OCPBUGS-10003: Revert "NE-1115: Update haproxy container builds to use haproxy 2.6" +# kubernetes image-amd64 06e8c46c9f0d3f6bfcd1e146c09647e4b634e4eb to dc93b13d1f6518d62ea9e3dea64d843c2ce35cbf +916c65ebea0205d3c18d3701f48cf568ef9e7220 2023-03-17T23:03:18+00:00 UPSTREAM: 115328: annotate early and late requests +a6938113b34b64c0626efa322cd4d3c1132d64fb 2023-03-17T23:03:18+00:00 UPSTREAM: : Revert "UPSTREAM: : annotate audit events for requests during unready phase and graceful termination phase" +# oc image-arm64 eed143055ede731029931ad204b19cd2f565ef1a to 92b1a3d0e5d092430b523f6541aa0c504b2222b3 +32496b16599a0ee1d834a9d6685aca398d49c79d 2023-03-23T10:44:51+00:00 OCPBUGS-10622: bump repo sclorg/s2i-ruby-container location for newapp +# router image-arm64 69eda4bd427c3f27d9993afa35461f4fc1dc0357 to e28644631982fb4596e065d3ae85099f0886829d +5381cb80c2905550549406ddba3891bec541fc8e 2023-03-20T12:57:57+00:00 OCPBUGS-10003: Revert "NE-1115: Update haproxy container builds to use haproxy 2.6" +# ovn-kubernetes image-arm64 dd45efd39e5db428d4578ed6787e6c08b79e2df5 to ebb5dcaf65a49156b7ea220176fa5dd6f3e3f716 +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 diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index d2e1a41b3c..9472176459 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,28 +1,28 @@ 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 5cec361179f3658986890a87d0b51f40a1da89ad -https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 4ca346ef97def3697f1aa0368c9b35459b9b2f59 +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 3e62b53e39db960ccc16d717d1a25d751d4e9c49 +https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 2a3e578c1007d7534eadffcca2adc979cb712995 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component d3978864fb58063235be176c18fe50457b5223f3 https://github.com/openshift/cluster-network-operator embedded-component 040d5efed272789341b16858f63c2d0bcdb71b50 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 7867c26e6c91e2cc279317dfc080befe63a60749 https://github.com/openshift/cluster-policy-controller embedded-component ac01e3463245f2dd9312145368d7f4099a8a0bb9 -https://github.com/openshift/etcd embedded-component 13c18c444a8c6a86ccbba16cce664008f5f948bd -https://github.com/openshift/kubernetes embedded-component 06e8c46c9f0d3f6bfcd1e146c09647e4b634e4eb +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 40575b862f7bd42a2c40c8e6b7203cd4c29b0021 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 https://github.com/openshift/oc image-amd64 eed143055ede731029931ad204b19cd2f565ef1a https://github.com/openshift/coredns image-amd64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb -https://github.com/openshift/router image-amd64 69eda4bd427c3f27d9993afa35461f4fc1dc0357 +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 dd45efd39e5db428d4578ed6787e6c08b79e2df5 -https://github.com/openshift/kubernetes image-amd64 06e8c46c9f0d3f6bfcd1e146c09647e4b634e4eb +https://github.com/openshift/kubernetes image-amd64 dc93b13d1f6518d62ea9e3dea64d843c2ce35cbf https://github.com/openshift/service-ca-operator image-amd64 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a -https://github.com/openshift/oc image-arm64 eed143055ede731029931ad204b19cd2f565ef1a +https://github.com/openshift/oc image-arm64 92b1a3d0e5d092430b523f6541aa0c504b2222b3 https://github.com/openshift/coredns image-arm64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb -https://github.com/openshift/router image-arm64 69eda4bd427c3f27d9993afa35461f4fc1dc0357 +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 dd45efd39e5db428d4578ed6787e6c08b79e2df5 +https://github.com/openshift/ovn-kubernetes image-arm64 ebb5dcaf65a49156b7ea220176fa5dd6f3e3f716 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 e5fe925b3f..e66058ad95 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-19-052243" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-03-22-000936" "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-03-23-204038" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-03-25-181910" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12" diff --git a/vendor/k8s.io/apiserver/pkg/server/config.go b/vendor/k8s.io/apiserver/pkg/server/config.go index 7e34c6da7a..cd4844dced 100644 --- a/vendor/k8s.io/apiserver/pkg/server/config.go +++ b/vendor/k8s.io/apiserver/pkg/server/config.go @@ -958,6 +958,9 @@ func DefaultBuildHandlerChain(apiHandler http.Handler, c *Config) http.Handler { handler = genericapifilters.WithAudit(handler, c.AuditBackend, c.AuditPolicyRuleEvaluator, c.LongRunningFunc) handler = filterlatency.TrackStarted(handler, c.TracerProvider, "audit") + handler = genericfilters.WithShutdownLateAnnotation(handler, c.lifecycleSignals.ShutdownInitiated, c.ShutdownDelayDuration) + handler = genericfilters.WithStartupEarlyAnnotation(handler, c.lifecycleSignals.HasBeenReady) + failedHandler := genericapifilters.Unauthorized(c.Serializer) failedHandler = genericapifilters.WithFailedAuthenticationAudit(failedHandler, c.AuditBackend, c.AuditPolicyRuleEvaluator) diff --git a/vendor/k8s.io/apiserver/pkg/server/filters/with_early_late_annotations.go b/vendor/k8s.io/apiserver/pkg/server/filters/with_early_late_annotations.go new file mode 100644 index 0000000000..8b7bcc421c --- /dev/null +++ b/vendor/k8s.io/apiserver/pkg/server/filters/with_early_late_annotations.go @@ -0,0 +1,183 @@ +/* +Copyright 2023 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package filters + +import ( + "fmt" + "net" + "net/http" + "strings" + "time" + + "k8s.io/apiserver/pkg/audit" + "k8s.io/apiserver/pkg/authentication/user" + "k8s.io/apiserver/pkg/endpoints/request" + clockutils "k8s.io/utils/clock" + netutils "k8s.io/utils/net" +) + +type lifecycleEvent interface { + // Name returns the name of the signal, useful for logging. + Name() string + + // Signaled returns a channel that is closed when the underlying event + // has been signaled. Successive calls to Signaled return the same value. + Signaled() <-chan struct{} + + // SignaledAt returns the time the event was signaled. If SignaledAt is + // invoked before the event is signaled nil will be returned. + SignaledAt() *time.Time +} + +type shouldExemptFunc func(*http.Request) bool + +var ( + // the health probes are not annotated by default + healthProbes = []string{ + "/readyz", + "/healthz", + "/livez", + } +) + +func exemptIfHealthProbe(r *http.Request) bool { + path := "/" + strings.TrimLeft(r.URL.Path, "/") + for _, probe := range healthProbes { + if path == probe { + return true + } + } + return false +} + +// WithShutdownLateAnnotation, if added to the handler chain, tracks the +// incoming request(s) after the apiserver has initiated the graceful +// shutdown, and annoates the audit event for these request(s) with +// diagnostic information. +// This enables us to identify the actor(s)/load balancer(s) that are sending +// requests to the apiserver late during the server termination. +// It should be placed after (in order of execution) the +// 'WithAuthentication' filter. +func WithShutdownLateAnnotation(handler http.Handler, shutdownInitiated lifecycleEvent, delayDuration time.Duration) http.Handler { + return withShutdownLateAnnotation(handler, shutdownInitiated, delayDuration, exemptIfHealthProbe, clockutils.RealClock{}) +} + +// WithStartupEarlyAnnotation annotates the request with an annotation keyed as +// 'apiserver.k8s.io/startup' if the request arrives early (the server is not +// fully initialized yet). It should be placed after (in order of execution) +// the 'WithAuthentication' filter. +func WithStartupEarlyAnnotation(handler http.Handler, hasBeenReady lifecycleEvent) http.Handler { + return withStartupEarlyAnnotation(handler, hasBeenReady, exemptIfHealthProbe) +} + +func withShutdownLateAnnotation(handler http.Handler, shutdownInitiated lifecycleEvent, delayDuration time.Duration, shouldExemptFn shouldExemptFunc, clock clockutils.PassiveClock) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { + select { + case <-shutdownInitiated.Signaled(): + default: + handler.ServeHTTP(w, req) + return + } + + if shouldExemptFn(req) { + handler.ServeHTTP(w, req) + return + } + shutdownInitiatedAt := shutdownInitiated.SignaledAt() + if shutdownInitiatedAt == nil { + handler.ServeHTTP(w, req) + return + } + + elapsedSince := clock.Since(*shutdownInitiatedAt) + // TODO: 80% is the threshold, if requests arrive after 80% of + // shutdown-delay-duration elapses we annotate the request as late=true. + late := lateMsg(delayDuration, elapsedSince, 80) + + // NOTE: some upstream unit tests have authentication disabled and will + // fail if we require the requestor to be present in the request + // context. Fixing those unit tests will increase the chance of merge + // conflict during rebase. + // This also implies that this filter must be placed after (in order of + // execution) the 'WithAuthentication' filter. + self := "self=" + if requestor, exists := request.UserFrom(req.Context()); exists && requestor != nil { + self = fmt.Sprintf("%s%t", self, requestor.GetName() == user.APIServerUser) + } + + audit.AddAuditAnnotation(req.Context(), "apiserver.k8s.io/shutdown", + fmt.Sprintf("%s %s loopback=%t", late, self, isLoopback(req.RemoteAddr))) + + handler.ServeHTTP(w, req) + }) +} + +func lateMsg(delayDuration, elapsedSince time.Duration, threshold float64) string { + if delayDuration == time.Duration(0) { + return fmt.Sprintf("elapsed=%s threshold= late=%t", elapsedSince.Round(time.Second).String(), true) + } + + percentElapsed := (float64(elapsedSince) / float64(delayDuration)) * 100 + return fmt.Sprintf("elapsed=%s threshold=%.2f%% late=%t", + elapsedSince.Round(time.Second).String(), percentElapsed, percentElapsed > threshold) +} + +func withStartupEarlyAnnotation(handler http.Handler, hasBeenReady lifecycleEvent, shouldExemptFn shouldExemptFunc) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { + select { + case <-hasBeenReady.Signaled(): + handler.ServeHTTP(w, req) + return + default: + } + + // NOTE: some upstream unit tests have authentication disabled and will + // fail if we require the requestor to be present in the request + // context. Fixing those unit tests will increase the chance of merge + // conflict during rebase. + // This also implies that this filter must be placed after (in order of + // execution) the 'WithAuthentication' filter. + self := "self=" + if requestor, exists := request.UserFrom(req.Context()); exists && requestor != nil { + if requestor.GetName() == user.APIServerUser { + handler.ServeHTTP(w, req) + return + } + self = fmt.Sprintf("%s%t", self, false) + } + + audit.AddAuditAnnotation(req.Context(), "apiserver.k8s.io/startup", + fmt.Sprintf("early=true %s loopback=%t", self, isLoopback(req.RemoteAddr))) + + handler.ServeHTTP(w, req) + }) +} + +func isLoopback(address string) bool { + host, _, err := net.SplitHostPort(address) + if err != nil { + // if the address is missing a port, SplitHostPort will return an error + // with an empty host, and port value. For such an error, we should + // continue and try to parse the original address. + host = address + } + if ip := netutils.ParseIPSloppy(host); ip != nil { + return ip.IsLoopback() + } + + return false +} diff --git a/vendor/k8s.io/apiserver/pkg/server/lifecycle_signals.go b/vendor/k8s.io/apiserver/pkg/server/lifecycle_signals.go index ce4c1b4a6e..4d299a66c2 100644 --- a/vendor/k8s.io/apiserver/pkg/server/lifecycle_signals.go +++ b/vendor/k8s.io/apiserver/pkg/server/lifecycle_signals.go @@ -18,6 +18,10 @@ package server import ( "sync" + "sync/atomic" + "time" + + utilsclock "k8s.io/utils/clock" ) /* @@ -100,6 +104,10 @@ type lifecycleSignal interface { // Name returns the name of the signal, useful for logging. Name() string + + // SignaledAt returns the time the event was signaled. If SignaledAt is + // invoked before the event is signaled nil will be returned. + SignaledAt() *time.Time } // lifecycleSignals provides an abstraction of the events that @@ -149,23 +157,25 @@ type lifecycleSignals struct { // newLifecycleSignals returns an instance of lifecycleSignals interface to be used // to coordinate lifecycle of the apiserver func newLifecycleSignals() lifecycleSignals { + clock := utilsclock.RealClock{} return lifecycleSignals{ - ShutdownInitiated: newNamedChannelWrapper("ShutdownInitiated"), - AfterShutdownDelayDuration: newNamedChannelWrapper("AfterShutdownDelayDuration"), - PreShutdownHooksStopped: newNamedChannelWrapper("PreShutdownHooksStopped"), - NotAcceptingNewRequest: newNamedChannelWrapper("NotAcceptingNewRequest"), - InFlightRequestsDrained: newNamedChannelWrapper("InFlightRequestsDrained"), - HTTPServerStoppedListening: newNamedChannelWrapper("HTTPServerStoppedListening"), - HasBeenReady: newNamedChannelWrapper("HasBeenReady"), - MuxAndDiscoveryComplete: newNamedChannelWrapper("MuxAndDiscoveryComplete"), + ShutdownInitiated: newNamedChannelWrapper("ShutdownInitiated", clock), + AfterShutdownDelayDuration: newNamedChannelWrapper("AfterShutdownDelayDuration", clock), + PreShutdownHooksStopped: newNamedChannelWrapper("PreShutdownHooksStopped", clock), + NotAcceptingNewRequest: newNamedChannelWrapper("NotAcceptingNewRequest", clock), + InFlightRequestsDrained: newNamedChannelWrapper("InFlightRequestsDrained", clock), + HTTPServerStoppedListening: newNamedChannelWrapper("HTTPServerStoppedListening", clock), + HasBeenReady: newNamedChannelWrapper("HasBeenReady", clock), + MuxAndDiscoveryComplete: newNamedChannelWrapper("MuxAndDiscoveryComplete", clock), } } -func newNamedChannelWrapper(name string) lifecycleSignal { +func newNamedChannelWrapper(name string, clock utilsclock.PassiveClock) lifecycleSignal { return &namedChannelWrapper{ - name: name, - once: sync.Once{}, - ch: make(chan struct{}), + name: name, + once: sync.Once{}, + ch: make(chan struct{}), + clock: clock, } } @@ -173,10 +183,27 @@ type namedChannelWrapper struct { name string once sync.Once ch chan struct{} + + clock utilsclock.PassiveClock + signaledAt atomic.Value } func (e *namedChannelWrapper) Signal() { e.once.Do(func() { + // set the signaledAt value first to support the expected use case: + // + // <-s.Signaled() + // .. + // at := s.SignaledAt() + // + // we guarantee that at will never be nil after the event is signaled, + // it also implies that 'SignaledAt' if used independently outside of + // the above use case, it may return a valid non-empty time (due to + // the delay between setting signaledAt and closing the channel) + // even when the event has not signaled yet. + now := e.clock.Now() + e.signaledAt.Store(&now) + close(e.ch) }) } @@ -188,3 +215,11 @@ func (e *namedChannelWrapper) Signaled() <-chan struct{} { func (e *namedChannelWrapper) Name() string { return e.name } + +func (e *namedChannelWrapper) SignaledAt() *time.Time { + value := e.signaledAt.Load() + if value == nil { + return nil + } + return value.(*time.Time) +} diff --git a/vendor/k8s.io/apiserver/pkg/server/patch_genericapiserver.go b/vendor/k8s.io/apiserver/pkg/server/patch_genericapiserver.go index 46a734b29a..1fe3b7e5ef 100644 --- a/vendor/k8s.io/apiserver/pkg/server/patch_genericapiserver.go +++ b/vendor/k8s.io/apiserver/pkg/server/patch_genericapiserver.go @@ -17,7 +17,6 @@ limitations under the License. package server import ( - "fmt" "net" "net/http" "strings" @@ -27,7 +26,6 @@ import ( "go.uber.org/atomic" corev1 "k8s.io/api/core/v1" - "k8s.io/apiserver/pkg/audit" "k8s.io/klog/v2" netutils "k8s.io/utils/net" ) @@ -82,10 +80,8 @@ func WithLateConnectionFilter(handler http.Handler) http.Handler { if late { if pth := "/" + strings.TrimLeft(r.URL.Path, "/"); pth != "/readyz" && pth != "/healthz" && pth != "/livez" { if isLocal(r) { - audit.AddAuditAnnotation(r.Context(), "openshift.io/during-graceful", fmt.Sprintf("loopback=true,%v,readyz=false", r.URL.Host)) klog.V(4).Infof("Loopback request to %q (user agent %q) through connection created very late in the graceful termination process (more than 80%% has passed). This client probably does not watch /readyz and might get failures when termination is over.", r.URL.Path, r.UserAgent()) } else { - audit.AddAuditAnnotation(r.Context(), "openshift.io/during-graceful", fmt.Sprintf("loopback=false,%v,readyz=false", r.URL.Host)) klog.Warningf("Request to %q (source IP %s, user agent %q) through a connection created very late in the graceful termination process (more than 80%% has passed), possibly a sign for a broken load balancer setup.", r.URL.Path, r.RemoteAddr, r.UserAgent()) // create only one event to avoid event spam. @@ -122,11 +118,9 @@ func WithNonReadyRequestLogging(handler http.Handler, hasBeenReadySignal lifecyc if pth := "/" + strings.TrimLeft(r.URL.Path, "/"); pth != "/readyz" && pth != "/healthz" && pth != "/livez" { if isLocal(r) { if !isKubeApiserverLoopBack(r) { - audit.AddAuditAnnotation(r.Context(), "openshift.io/unready", fmt.Sprintf("loopback=true,%v,readyz=false", r.URL.Host)) klog.V(2).Infof("Loopback request to %q (user agent %q) before server is ready. This client probably does not watch /readyz and might get inconsistent answers.", r.URL.Path, r.UserAgent()) } } else { - audit.AddAuditAnnotation(r.Context(), "openshift.io/unready", fmt.Sprintf("loopback=false,%v,readyz=false", r.URL.Host)) klog.Warningf("Request to %q (source IP %s, user agent %q) before server is ready, possibly a sign for a broken load balancer setup.", r.URL.Path, r.RemoteAddr, r.UserAgent()) // create only one event to avoid event spam. diff --git a/vendor/modules.txt b/vendor/modules.txt index 17d872ad0f..7060320dfa 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-20230313100333-06e8c46c9f0d +# k8s.io/api v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/apiextensions-apiserver v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/apimachinery v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/apiserver v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/cli-runtime v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/client-go v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/cloud-provider v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/component-base v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/component-helpers v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/controller-manager v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/kms v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/kube-aggregator v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/kubectl v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/kubelet v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/kubernetes v1.26.1 => github.com/openshift/kubernetes v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d +# k8s.io/pod-security-admission v0.25.0 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230320215851-dc93b13d1f65 ## 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-20230313100333-06e8c46c9f0d -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230313100333-06e8c46c9f0d -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230313100333-06e8c46c9f0d +# 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