diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index 052c496418..ff046e328a 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=27 KUBE_GIT_VERSION=v1.27.1 -KUBE_GIT_COMMIT=b4518170e4f4b621ae1e97d5fd178191bf2b285d +KUBE_GIT_COMMIT=ab0b8ee0d340f945f4bb4dabeef1bffa5fe5c6cc KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index babe959e75..127d85a03a 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-arm64-2023-06-27-000451 +OCP_VERSION := 4.14.0-0.nightly-arm64-2023-06-29-004030 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index c10fba8120..0487c36379 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-2023-06-20-065807 +OCP_VERSION := 4.14.0-0.nightly-2023-06-27-233015 diff --git a/assets/components/openshift-router/service-internal.yaml b/assets/components/openshift-router/service-internal.yaml index 79868ea550..daeaeb1ae3 100644 --- a/assets/components/openshift-router/service-internal.yaml +++ b/assets/components/openshift-router/service-internal.yaml @@ -4,6 +4,7 @@ kind: Service apiVersion: v1 spec: type: ClusterIP + internalTrafficPolicy: Cluster ports: - name: http port: 80 diff --git a/assets/controllers/kube-apiserver/defaultconfig.yaml b/assets/controllers/kube-apiserver/defaultconfig.yaml index dbdc7e72c8..e93b3ec541 100644 --- a/assets/controllers/kube-apiserver/defaultconfig.yaml +++ b/assets/controllers/kube-apiserver/defaultconfig.yaml @@ -113,6 +113,10 @@ apiServerArguments: - /etc/kubernetes/static-pod-resources/secrets/etcd-client/tls.key etcd-prefix: - kubernetes.io + etcd-healthcheck-timeout: + - 9s + etcd-readycheck-timeout: + - 9s event-ttl: - 3h goaway-chance: diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index d694b8d6d2..db19fa3e12 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.14.0-0.nightly-arm64-2023-06-27-000451" + "base": "4.14.0-0.nightly-arm64-2023-06-29-004030" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:be82e261316dcb4f8fdfcc1305405eeb0e2b0f27e23d4ffaece5670fcfc29b0b", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:da96fb5507eec63b1114f7263a3fdbc04b8339695a0c37fad3e8dbdcb48c24de", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:be3d50af8744b02abce537ca79b86cae30e0feb259a5b14fd7fca572d01f5810", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e7e2b7def376ba254278527b3af6aada55df5ff812ae02cba0d6a2b90f4d8f22", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fc2b279b251166d1978be5fe6f6a94b613f312c6448380a77fe4b3e43340d71b", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50b7bdc2831594e44388cf78c252bdfbcd29b6cc1f5f32a8f7a658875917ba04", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eb374be3ee4ac94a1ab443bb78f480dd11343040e54c5dca2c478d86059cc93e", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8677e225aa0c3b5723a9f6a98b150741cae39a7ded6118fbd55c1f3ca3cfe047", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:62d33e3cae2df3061b0c59a85f7ffe6b08e296f9c94f9e994b924070a50876ba", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9fef76008831f37231c933a7e523f1f8ba7167ee1a9115db9e3bb77db95e6fae", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2d28679ba71a505a2f905fcbf79f955f790e69d207854f0bbeb54e86d745f157", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d38af8ed6e97ed3b6c9ed14b189a9c7a85a35fd918e39e9d719cf0b11b08aa2f", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8846cd5580cc1a21db010315cc3121a0327ec8f73c56ce2c087c49b929458db9", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f4a852e9f278f8607be23385aea58a1db7d57f8d55546105c136e40c750b4da5", "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 765e781ed7..7e9702b2c7 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.14.0-0.nightly-2023-06-20-065807" + "base": "4.14.0-0.nightly-2023-06-27-233015" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:de0912aefa0ff1242e8ea779c969ac13be72d44b6caed238e6fb4118919bd082", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:db807ead1b7a4b2f591accd082d0329817803f59c657a5b491c9ce64e15cf27d", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d8c228c6089e0e49b0c8ef680cf148d8f655fa9f0595b087ce88873cd6785d08", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:13bedf9b08fd57c09f17307cbb1cd4fbb5c43813014c66ae33902691bbd27aed", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b1fff8a7fbb0b7fef1ef652ffb95bd6fc61e8213338675d46bb455bd5be8bee", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f81e9052b02d019e0c7abd9c050388d1cc9a788cecb6e13e6b27a515f222164b", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b5981b2e712b11e970bdd6554de2d9efc84309ea8be998ab63cce7b809525f5f", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cba7ed34cadb57ab09423273867ccbeb1384aa972bba62351e8aa26d8e20da64", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:127077d6d0f353d038f9e9f39cad0cbbda2b10bf4f24680059b5b7152359fd3f", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:243113aa6ec017e2577e77a51bc3ac7206b24f0bae0f5faf527df4d17cfc4174", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:af13f22ebe9c0560a3c68d91971ad9f5be96fcda968a42d86d9562420ee8ed3c", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5bfc7a60a69092d7b241fb93a2b00f6ecaff9fd1a0af1e277ee3512babdccf47", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:43299e6626796045fcd8843b29b1c679648669bea85925c685144e48f40bd776", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56fd6fd4410bb243c8500e7b88caaee2c07df43af0427ae506bd6a74ffb257ae", "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 ee8b39d14b..9fd615e3c6 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -143,33 +143,33 @@ replace ( go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230323125716-53cdd6b0519f // from etcd go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20230323125716-53cdd6b0519f // from etcd go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20230323125716-53cdd6b0519f // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230616141928-b4518170e4f4 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230616141928-b4518170e4f4 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230627155501-ab0b8ee0d340 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230627155501-ab0b8ee0d340 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes ) diff --git a/etcd/go.sum b/etcd/go.sum index 3ad13b9b57..665f5a4df0 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -371,18 +371,18 @@ github.com/openshift/etcd/raft/v3 v3.5.1-0.20230323125716-53cdd6b0519f h1:rUkH7z github.com/openshift/etcd/raft/v3 v3.5.1-0.20230323125716-53cdd6b0519f/go.mod h1:wL8kkRGx1Hp8FmZUuHfL3K2/OaGIDaXGr1N7i2G07J0= github.com/openshift/etcd/server/v3 v3.5.1-0.20230323125716-53cdd6b0519f h1:zgNwZ2ZOKkB1bhQFe3tvUqCpMbjqmp4U7kY7oXmuS7c= github.com/openshift/etcd/server/v3 v3.5.1-0.20230323125716-53cdd6b0519f/go.mod h1:6/Gfe8XTGXQJgLYQ65oGKMfPivb2EASLUSMSWN9Sroo= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230616141928-b4518170e4f4 h1:Mbmc+B3MqOB98fFclQACrDl283BzqM/BuJoVYx6zqgw= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230616141928-b4518170e4f4/go.mod h1:HS+D2l4KQPtUswcaoAlFe4qPsy2Go7C4xL5rFyxTrnQ= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230616141928-b4518170e4f4 h1:FRVuBL87BPxxhAQ7Y+THInj+LonLVEFk6fV/+mJZbNA= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230616141928-b4518170e4f4/go.mod h1:6tnW/nnIEmt68uWWsNCihIhgtFza8+IUPAylHMjVFiA= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230616141928-b4518170e4f4 h1:iTB9Rd49g58St/mCSnTh5AsaPTV6Ht3SsFDGutkalG8= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230616141928-b4518170e4f4/go.mod h1:KlG3TyDN82d8p0dpJDMyY/s4PZNec0LHAmgoIzVGARE= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230616141928-b4518170e4f4 h1:/eQhC8qk2qWi0LpNlkaTGhgamNmbnG3ONht+Jqvz9Cg= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230616141928-b4518170e4f4/go.mod h1:I0XLN7RRr89r6VksWi0xZ+MJRL/WIKixVSBTXXXX394= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230616141928-b4518170e4f4 h1:aH2ZCI+cduRdKbciKXen+5N1XYIEWceidlFeTM5Zdvg= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230616141928-b4518170e4f4/go.mod h1:wAcKQiyH7O5X535pb0/RamfWxga+4e/opQZJKl2C1c0= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230616141928-b4518170e4f4 h1:E63oUVQ4HG2wHvVd80PPYwILHol7buUGbslS3GCW8mc= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230616141928-b4518170e4f4/go.mod h1:VR1Bz32opPHJ3xZNCoS4FjfUnJYnsgN0cxQAubCHbb4= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230627155501-ab0b8ee0d340 h1:lQ/dZypSZIzmGZT+/LTy2KeXFTohgIXLF8Bu/4R3Np0= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:HS+D2l4KQPtUswcaoAlFe4qPsy2Go7C4xL5rFyxTrnQ= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230627155501-ab0b8ee0d340 h1:BfvZjrgtNS9ky5ce2LVCoypOqg2AOckCnYp23v4LE5A= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:6tnW/nnIEmt68uWWsNCihIhgtFza8+IUPAylHMjVFiA= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230627155501-ab0b8ee0d340 h1:CQ9hu0eYtbZatuDMLomd0tzaGy3QcYpXefxrkCgmgl0= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:KlG3TyDN82d8p0dpJDMyY/s4PZNec0LHAmgoIzVGARE= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230627155501-ab0b8ee0d340 h1:e3OR7E/7TMIxgvM77Sga+Y6yrlA+xxHYikOoOl+uQTA= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:I0XLN7RRr89r6VksWi0xZ+MJRL/WIKixVSBTXXXX394= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230627155501-ab0b8ee0d340 h1:iwBlC6TEcAup61dszd7Qgt3VSXVGimP89YdzSzyJ8+4= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:wAcKQiyH7O5X535pb0/RamfWxga+4e/opQZJKl2C1c0= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230627155501-ab0b8ee0d340 h1:7KpFTjLeeSk39zRx8xzX5KiXKIvzs1cDbct1YZci64E= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:VR1Bz32opPHJ3xZNCoS4FjfUnJYnsgN0cxQAubCHbb4= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230317131656-c62d9de5a460 h1:PftK9Q7BUD+wj8fNvxtJ+RhxYkcTtd8LcAo1Gk1H1HM= 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 5a4e730af1..b7440f6c0c 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -582,7 +582,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/api v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -639,7 +639,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.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/apimachinery v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -690,12 +690,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.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/cli-runtime v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/client-go v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -841,7 +841,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.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/component-base v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -878,7 +878,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.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/kubectl v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -1005,32 +1005,32 @@ sigs.k8s.io/yaml # go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230323125716-53cdd6b0519f # go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20230323125716-53cdd6b0519f # go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20230323125716-53cdd6b0519f -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230627155501-ab0b8ee0d340 diff --git a/go.mod b/go.mod index eb63d4986b..f3192ea4ac 100644 --- a/go.mod +++ b/go.mod @@ -229,34 +229,34 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230317131656-c62d9de5a460 // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230616141928-b4518170e4f4 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230616141928-b4518170e4f4 // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230616141928-b4518170e4f4 // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230616141928-b4518170e4f4 // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230616141928-b4518170e4f4 // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230616141928-b4518170e4f4 // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230616141928-b4518170e4f4 // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230616141928-b4518170e4f4 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230616141928-b4518170e4f4 // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230616141928-b4518170e4f4 // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230616141928-b4518170e4f4 // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230616141928-b4518170e4f4 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230616141928-b4518170e4f4 // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230616141928-b4518170e4f4 // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230616141928-b4518170e4f4 // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230616141928-b4518170e4f4 // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230616141928-b4518170e4f4 // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230616141928-b4518170e4f4 // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230616141928-b4518170e4f4 // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230616141928-b4518170e4f4 // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230616141928-b4518170e4f4 // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230627155501-ab0b8ee0d340 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230627155501-ab0b8ee0d340 // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230627155501-ab0b8ee0d340 // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230627155501-ab0b8ee0d340 // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230627155501-ab0b8ee0d340 // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230627155501-ab0b8ee0d340 // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230627155501-ab0b8ee0d340 // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230627155501-ab0b8ee0d340 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230627155501-ab0b8ee0d340 // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230627155501-ab0b8ee0d340 // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230627155501-ab0b8ee0d340 // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230627155501-ab0b8ee0d340 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230627155501-ab0b8ee0d340 // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230627155501-ab0b8ee0d340 // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230627155501-ab0b8ee0d340 // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230627155501-ab0b8ee0d340 // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230627155501-ab0b8ee0d340 // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230627155501-ab0b8ee0d340 // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230627155501-ab0b8ee0d340 // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230627155501-ab0b8ee0d340 // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230627155501-ab0b8ee0d340 // from kubernetes ) diff --git a/go.sum b/go.sum index bee124fb33..57de233a6a 100644 --- a/go.sum +++ b/go.sum @@ -602,57 +602,57 @@ github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb h1:Nij5OnaECrk github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb/go.mod h1:Rhb3moCqeiTuGHAbXBOlwPubUMlOZEkrEWTRjIF3jzs= github.com/openshift/cluster-policy-controller v0.0.0-20230524145357-cc787e1b1e17 h1:O64VIXF1g9CdA+dIibNVk/aFo4TdLrzjGVT5EYN8sDw= github.com/openshift/cluster-policy-controller v0.0.0-20230524145357-cc787e1b1e17/go.mod h1:aT2kl3fRiSSElTibdfFs3MQnyLtviMcB7lZt9rdy46g= -github.com/openshift/kubernetes v0.0.0-20230616141928-b4518170e4f4 h1:93DgOR6dWIMWilea6+vq67nm8OYhD/JlDbJu0C6IkFI= -github.com/openshift/kubernetes v0.0.0-20230616141928-b4518170e4f4/go.mod h1:dOsYs3YMdOMu4ncJsxyvoD4eHq5/B6YkHFp1ZY4plek= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230616141928-b4518170e4f4 h1:Mbmc+B3MqOB98fFclQACrDl283BzqM/BuJoVYx6zqgw= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230616141928-b4518170e4f4/go.mod h1:HS+D2l4KQPtUswcaoAlFe4qPsy2Go7C4xL5rFyxTrnQ= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230616141928-b4518170e4f4 h1:3Otd2hUwAiJyegpewbh5Y5lDqbv31708zI4stWIhfDA= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230616141928-b4518170e4f4/go.mod h1:hpAC4eOVaEZZk9tLZ38gAlHF2qwgFI+xcFX+pCjYjJ0= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230616141928-b4518170e4f4 h1:FRVuBL87BPxxhAQ7Y+THInj+LonLVEFk6fV/+mJZbNA= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230616141928-b4518170e4f4/go.mod h1:6tnW/nnIEmt68uWWsNCihIhgtFza8+IUPAylHMjVFiA= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230616141928-b4518170e4f4 h1:J37hC8NtyyLovczI9ugjzZoDjTG1GXUDdgFYgXr/ol8= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230616141928-b4518170e4f4/go.mod h1:JC4dA6xOdRtPv8CB8ycP1zRRmgAWtyXWLhjwXKDLt1Y= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230616141928-b4518170e4f4 h1:iTB9Rd49g58St/mCSnTh5AsaPTV6Ht3SsFDGutkalG8= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230616141928-b4518170e4f4/go.mod h1:KlG3TyDN82d8p0dpJDMyY/s4PZNec0LHAmgoIzVGARE= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230616141928-b4518170e4f4 h1:/eQhC8qk2qWi0LpNlkaTGhgamNmbnG3ONht+Jqvz9Cg= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230616141928-b4518170e4f4/go.mod h1:I0XLN7RRr89r6VksWi0xZ+MJRL/WIKixVSBTXXXX394= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230616141928-b4518170e4f4 h1:zSXUegXI/i0zyVxufhyWi+//SMZHstGSG6FKVCcya0Y= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230616141928-b4518170e4f4/go.mod h1:/P4BjJew2WLdnbi3+0tyO8sDLZydilvJ41dTkFLgfIA= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230616141928-b4518170e4f4 h1:3x5tzR2AyV4Qzllonil/H/KttEM3ieHgp7Oc9/2FIDg= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230616141928-b4518170e4f4/go.mod h1:knkmpkfoPcOyPbx6II8E7bPCBPWWb+qTnp9lYeRLmcM= -github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230616141928-b4518170e4f4/go.mod h1:380P61ZbSq+rXgjrZJxMlOaGkGcEX6D+1068u0Y5PiA= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230616141928-b4518170e4f4 h1:aH2ZCI+cduRdKbciKXen+5N1XYIEWceidlFeTM5Zdvg= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230616141928-b4518170e4f4/go.mod h1:wAcKQiyH7O5X535pb0/RamfWxga+4e/opQZJKl2C1c0= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230616141928-b4518170e4f4 h1:VTPmpYtb4Cg+4yHccT2LPcV9xldIJnQoVeJwc4kVekM= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230616141928-b4518170e4f4/go.mod h1:h+VG9kJL2rXABC0yOx5gki+dGMYbadntmeyMviy0sqg= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230616141928-b4518170e4f4 h1:5PbD/iDscgRM+8y/RFfmreaOda9PgST4MroTZqPbSuQ= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230616141928-b4518170e4f4/go.mod h1:vZ9u2TSfQdJzEf1CLpfxGtELRx75PCMXvuBhV3437Mw= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230616141928-b4518170e4f4 h1:ypfO2hXnyvDKx8RFzmHEePlNg644SuFIlfoe2fS+xg4= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230616141928-b4518170e4f4/go.mod h1:NU+xm9Do1kkehQ/P9v7PlkU1nKpWRBGsZI0fiZhdjpA= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230616141928-b4518170e4f4 h1:iBvaeQ89jA4L9SgCntjo9J6OdW3kYVAvIS/nqtnU1Fc= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230616141928-b4518170e4f4/go.mod h1:uTgJpRtV5WrbgrBwtkdJLjDE7LqmLKTyox+GfDljAME= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230616141928-b4518170e4f4 h1:pf9oftL+whujf8AHzKm+UHLRCT+pzSLbtpM0mi1STw4= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230616141928-b4518170e4f4/go.mod h1:aH+7wzuRuYXC6z7CmIPJBxT6zht3KiOF5PC6DCiILR0= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230616141928-b4518170e4f4 h1:D8Hr61dOxVC3TPPo4gSVc6gWoL/m2f9d5MDrbN4tKo0= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230616141928-b4518170e4f4/go.mod h1:koRYt7cYiktjZ8iwukGCc5dUVGyOcavTgKH7Kef/70g= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230616141928-b4518170e4f4 h1:N4vCnRy7Kfal866HT0tIWHNwNPy/Tjp5lZJFWUnN55Y= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230616141928-b4518170e4f4/go.mod h1:W4G6TQNY6iPvvZM8IEzh9RjNQAARyqvnjXUC/xT3xgE= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230616141928-b4518170e4f4 h1:3zV14petE7TvwAZnKeBbuDuwnlAxQSEzkhYZUgGIdMM= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230616141928-b4518170e4f4/go.mod h1:kPirESyKa0ONUvOJqFwUgvUq5M42RuJ/RILdsJg6PeA= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230616141928-b4518170e4f4 h1:lPESsxqhgSugmml1xOGuSEC9X7IMwLuEi094qObEKJM= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230616141928-b4518170e4f4/go.mod h1:shBqEF96lVjyKcgxtOYySo0emacqvwz4nuhU/P7+g04= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230616141928-b4518170e4f4 h1:E63oUVQ4HG2wHvVd80PPYwILHol7buUGbslS3GCW8mc= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230616141928-b4518170e4f4/go.mod h1:VR1Bz32opPHJ3xZNCoS4FjfUnJYnsgN0cxQAubCHbb4= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230616141928-b4518170e4f4 h1:gnwuy+fTvctl24SnIN8Wr+HzHYDZ9i6XXu6FZVmUjcE= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230616141928-b4518170e4f4/go.mod h1:yicHj+CceeKtoQ1SmvBrbdQTBvuisww0e9CzWrd4WV8= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230616141928-b4518170e4f4 h1:EWLMNuPUHht2Y0SiZaGCen6QkZxGzL8g4xQrJyjrBjk= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230616141928-b4518170e4f4/go.mod h1:U4zxFrED8NcXCRBau4PUNnNZacAu0ElxVLYuL/wkqW0= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230616141928-b4518170e4f4 h1:Axj7HLkk5/Gb3IY2TLotuwsGgEVEReY2+QFoqVzSp/0= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230616141928-b4518170e4f4/go.mod h1:bJFJUWsPSj8ps/bUM9Scdnw4h6FWadbe4SRzFVUgdOE= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230616141928-b4518170e4f4 h1:TLff9nMM025eTXihDyg6NzHvcImHQf2ZxwvacGPYEjY= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230616141928-b4518170e4f4/go.mod h1:AWlsrDgQ1Q6k/3ZST9uvU8kuaCegLz73nmLjGBJE0go= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230616141928-b4518170e4f4 h1:iqLHjEaWTjz7dgWRqlzDX0PYTqFmdRse2C5ycmQyRAE= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230616141928-b4518170e4f4/go.mod h1:avu3AaWDIk2l9Ip/rt8oWZmsQ2oYibJzble98CyL9uk= +github.com/openshift/kubernetes v0.0.0-20230627155501-ab0b8ee0d340 h1:pda6eS/T4Aq4l5dfg95uQKsKeEzmQp0n8QyCryctFSI= +github.com/openshift/kubernetes v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:dOsYs3YMdOMu4ncJsxyvoD4eHq5/B6YkHFp1ZY4plek= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230627155501-ab0b8ee0d340 h1:lQ/dZypSZIzmGZT+/LTy2KeXFTohgIXLF8Bu/4R3Np0= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:HS+D2l4KQPtUswcaoAlFe4qPsy2Go7C4xL5rFyxTrnQ= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230627155501-ab0b8ee0d340 h1:X2BPFYkJhp4rngQi5FW4WI7jdgDd4BsqEM6F2FiATyg= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:hpAC4eOVaEZZk9tLZ38gAlHF2qwgFI+xcFX+pCjYjJ0= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230627155501-ab0b8ee0d340 h1:BfvZjrgtNS9ky5ce2LVCoypOqg2AOckCnYp23v4LE5A= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:6tnW/nnIEmt68uWWsNCihIhgtFza8+IUPAylHMjVFiA= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230627155501-ab0b8ee0d340 h1:T7pL0xDQ1O4ilbmSR6s4083KmIkCMLaffYrRG4tSgxs= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:JC4dA6xOdRtPv8CB8ycP1zRRmgAWtyXWLhjwXKDLt1Y= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230627155501-ab0b8ee0d340 h1:CQ9hu0eYtbZatuDMLomd0tzaGy3QcYpXefxrkCgmgl0= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:KlG3TyDN82d8p0dpJDMyY/s4PZNec0LHAmgoIzVGARE= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230627155501-ab0b8ee0d340 h1:e3OR7E/7TMIxgvM77Sga+Y6yrlA+xxHYikOoOl+uQTA= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:I0XLN7RRr89r6VksWi0xZ+MJRL/WIKixVSBTXXXX394= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230627155501-ab0b8ee0d340 h1:iBhfxfMWZvgHhZ7PSzxqqwIiJxX77koIn8Uofla++Zg= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:/P4BjJew2WLdnbi3+0tyO8sDLZydilvJ41dTkFLgfIA= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230627155501-ab0b8ee0d340 h1:+Qvx4QYa5FTcaxXdyIdaOedTBfHDf1sD1VO1De64AyY= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:knkmpkfoPcOyPbx6II8E7bPCBPWWb+qTnp9lYeRLmcM= +github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:380P61ZbSq+rXgjrZJxMlOaGkGcEX6D+1068u0Y5PiA= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230627155501-ab0b8ee0d340 h1:iwBlC6TEcAup61dszd7Qgt3VSXVGimP89YdzSzyJ8+4= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:wAcKQiyH7O5X535pb0/RamfWxga+4e/opQZJKl2C1c0= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230627155501-ab0b8ee0d340 h1:iMyAqKfxlhLDs4bCIYBsPZ5I6U8u870HlSMk0WUNLrU= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:h+VG9kJL2rXABC0yOx5gki+dGMYbadntmeyMviy0sqg= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230627155501-ab0b8ee0d340 h1:YX9AgmGEX1hijt8hcpTMU/u2MGGofMPy2zsmI3Kx4kI= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:vZ9u2TSfQdJzEf1CLpfxGtELRx75PCMXvuBhV3437Mw= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230627155501-ab0b8ee0d340 h1:0XWxsEErpd8+gw8yoi+2Huflcqh/FAHZobQY0GYDjDA= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:NU+xm9Do1kkehQ/P9v7PlkU1nKpWRBGsZI0fiZhdjpA= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230627155501-ab0b8ee0d340 h1:C4nwPvx4cD+zneXLrgSkBUaGTMsgPIeaVM8fSL/t6Go= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:uTgJpRtV5WrbgrBwtkdJLjDE7LqmLKTyox+GfDljAME= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230627155501-ab0b8ee0d340 h1:r31JhVuhXE2U30HlvjJ5ghBt6by2GldCh9EdTqGfpyc= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:aH+7wzuRuYXC6z7CmIPJBxT6zht3KiOF5PC6DCiILR0= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230627155501-ab0b8ee0d340 h1:RGs+uIvov2LNQj4DSdONIxdYGG9+1ZkW8yZ6gd7I6SM= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:koRYt7cYiktjZ8iwukGCc5dUVGyOcavTgKH7Kef/70g= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230627155501-ab0b8ee0d340 h1:mAvJTXTzg7wW0Xf/RPpBpSkwTbA3V74BTtJICFH+SbI= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:W4G6TQNY6iPvvZM8IEzh9RjNQAARyqvnjXUC/xT3xgE= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230627155501-ab0b8ee0d340 h1:19Dix4dyKX/u3k6RFi9g5FFOh1KpqeWpDBKPf0/h6sg= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:kPirESyKa0ONUvOJqFwUgvUq5M42RuJ/RILdsJg6PeA= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230627155501-ab0b8ee0d340 h1:nUBiQ3fPlNSQS/mI4oQZ5MRVh17XrheB5F8vnSN0lLg= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:shBqEF96lVjyKcgxtOYySo0emacqvwz4nuhU/P7+g04= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230627155501-ab0b8ee0d340 h1:7KpFTjLeeSk39zRx8xzX5KiXKIvzs1cDbct1YZci64E= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:VR1Bz32opPHJ3xZNCoS4FjfUnJYnsgN0cxQAubCHbb4= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230627155501-ab0b8ee0d340 h1:unPhUw1ON2ieezpUR0BD0oUOe8frW1i3XjpZbvmUHSY= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:yicHj+CceeKtoQ1SmvBrbdQTBvuisww0e9CzWrd4WV8= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230627155501-ab0b8ee0d340 h1:4EErSfDbzYyBPvui69jWQi51GwnEgXU6b/VMWhmlZFc= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:U4zxFrED8NcXCRBau4PUNnNZacAu0ElxVLYuL/wkqW0= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230627155501-ab0b8ee0d340 h1:BzvU8q03551Q6h7AHAt30heZJVcWJTOSXIDsArCJPz4= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:bJFJUWsPSj8ps/bUM9Scdnw4h6FWadbe4SRzFVUgdOE= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230627155501-ab0b8ee0d340 h1:o72CibuAEfOeGy8Fz+AgWupIbrFp7KkNKO5j6/2RWE0= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:AWlsrDgQ1Q6k/3ZST9uvU8kuaCegLz73nmLjGBJE0go= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230627155501-ab0b8ee0d340 h1:NW5ruMSEWmZ7cn2x3ctlgd1/Vcq5EOE5ciVgoz0TN8c= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230627155501-ab0b8ee0d340/go.mod h1:avu3AaWDIk2l9Ip/rt8oWZmsQ2oYibJzble98CyL9uk= github.com/openshift/library-go v0.0.0-20230503173034-95ca3c14e50a/go.mod h1:PJVatR/oS/EaFciwylyAr9hORSqQHrC+5bXf4L0wsBY= github.com/openshift/library-go v0.0.0-20230516103935-9536341565eb h1:B1VhZf/XTcInahu7XmosGLDGlKgJHj9eYtNBq+tA2dY= github.com/openshift/library-go v0.0.0-20230516103935-9536341565eb/go.mod h1:PJVatR/oS/EaFciwylyAr9hORSqQHrC+5bXf4L0wsBY= diff --git a/packaging/crio.conf.d/microshift_amd64.conf b/packaging/crio.conf.d/microshift_amd64.conf index d718ec323b..f0091ab4c4 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:243113aa6ec017e2577e77a51bc3ac7206b24f0bae0f5faf527df4d17cfc4174" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:43299e6626796045fcd8843b29b1c679648669bea85925c685144e48f40bd776" 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 a6b4b2690e..f521018347 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:9fef76008831f37231c933a7e523f1f8ba7167ee1a9115db9e3bb77db95e6fae" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8846cd5580cc1a21db010315cc3121a0327ec8f73c56ce2c087c49b929458db9" 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 780279c7ae..4bdb48c5fa 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,3 +1,196 @@ -- oc image-arm64 1e09f3e0285c2c0bec04275a86f1d3aadc117328 to 3555360fa1bda2ecf743e3f329a60245d674535d +- cluster-ingress-operator embedded-component b1a6bb5c8b9ee864fd54374bc833fc24b7b935fd to ecb3786b1397cb93865952c98db72d1990587bd0 + - b58456a 2023-06-23T17:20:19-04:00 OCPBUGS-15100: Fix invalid DNS name formatting for GCP + - 6cd3b67 2023-06-06T08:55:25-04:00 Ignore updates for null versus empty ennotations + - 5579aa1 2023-06-06T08:55:22-04:00 Avoid spurious updates for internalTrafficPolicy + - 00e85e1 2023-05-10T11:36:24-04:00 OCPBUGS-13106: Add ingress controller status logging on waitForIngressControllerCondition + +- cluster-kube-apiserver-operator embedded-component a1de1b1cc85ce2d41e918d14534e5187b981819b to 8b642494e3bffc365cb24383b416dc0f530547d9 + - cc3af46 2023-06-27T12:55:52+02:00 Enable "send-retry-after-while-not-ready-once" on SNO + - a9ba13a 2023-06-23T14:31:28-04:00 updates for livez and new startup probe + - 2bf134c 2023-06-23T14:31:42+02:00 api_performance_dashboard: show apiserver_request_total instead of apiserver_dropped_requests + - 548c95b 2023-06-22T10:43:01-04:00 allow extended response time for etcd + - 08f571e 2023-06-22T15:18:12+02:00 api_performance_dashboard: show apiserver_longrunning_requests metric + - 6981e25 2023-06-21T13:35:21-04:00 increase timeout for probes + - 6b35e3f 2023-06-20T18:13:14+02:00 dashboard: use recording rules for most metrics + - 86d866e 2023-06-19T14:04:42+02:00 api_performance_dashboard: show apiserver_longrunning_requests metric + - 1156b3a 2023-06-19T10:06:08+02:00 webhooksupportabilitycontroller: do not use one second timeout when asserting a webhook connection + - c7e2ba8 2023-04-22T08:35:23+02:00 pkg/operator/configobserver: check that the serving certificate reference exists before applying + +- cluster-kube-controller-manager-operator embedded-component 1807a0d1872e8a2a15afc663da269eaacd84fd57 to 5f49f59c88c963d97dd90643e7c9fb7ef1820d0c + - 2fa0be1 2023-06-27T10:25:31+02:00 Sync openshift/api to reduce installerpod configmap based file permissions to 0600 + +- cluster-kube-scheduler-operator embedded-component c2928b4ab9aa2c1e9bcc0989caa1d209b610b863 to db92b6d9fcf410aa24efc4a70c4114925bb7b797 + - 943da47 2023-06-27T11:51:05+02:00 KubeSchedulerDown: set runbook_url annotation + - 4fbf491 2023-06-26T23:18:44+02:00 Sync openshift/api to reduce installerpod configmap based file permissions to 0600 + +- cluster-network-operator embedded-component d1e994081a11db21f2c37731545a53836d7682c7 to 64ab110f331b37f862eefe9d3b99c61445b87890 + - b897b33 2023-06-27T08:51:09+00:00 Add release version annotation to whereabouts-reconciler + - b0a6fff 2023-06-20T14:11:41-07:00 Add Infrastructures permission to CNCC cluster role + - cce5df4 2023-06-20T12:07:51-04:00 Add support for AdminPolicyBasedExternalRoute CRD and controller's RBAC + - e374a7b 2023-06-19T17:06:11+09:00 Add kubernetes.io/os nodeSelector to wherebouts reconciler DS + - 2b4b734 2023-04-27T14:30:11+00:00 Propagate UseMultiNetworkPolicies config option to OVN + - 49ca75b 2023-04-27T14:29:19+00:00 Add multi-networkpolicies to ovn-k rbac + +- kubernetes embedded-component b4518170e4f4b621ae1e97d5fd178191bf2b285d to ab0b8ee0d340f945f4bb4dabeef1bffa5fe5c6cc + - aebb7e12f 2023-06-26T16:57:19-04:00 UPSTREAM: : when only this kube-apiserver can fulfill the kubernetes.default.svc, don't wait for aggregated availability + - b9512d245 2023-06-20T13:55:54-03:00 UPSTREAM: : hack/update-vendor.sh, make update and update image + - d72ca3b59 2023-06-19T10:31:52-03:00 UPSTREAM: : manually resolve conflicts + - 25b4e4319 2023-06-14T09:47:38+00:00 Release commit for Kubernetes v1.27.3 + - e0a2a6efd 2023-06-08T00:09:03-06:00 update-vendor: update vendored go.sums + - 82b2c5aef 2023-06-07T21:34:57-06:00 releng/go: Update images, dependencies and version to Go 1.20.5 + - b30e94b12 2023-06-06T21:10:53+00:00 kube-proxy avoid race condition using LocalModeNodeCIDR + - d59b91d97 2023-06-05T12:01:34-07:00 Add ephemeralcontainer to imagepolicy securityaccount admission plugin + - c345ce91a 2023-05-29T10:43:54+08:00 supported version of etcd 3.5.7-0 for Kubernetes v1.27.0-rc.0 + - 788879887 2023-05-26T12:02:29+00:00 e2e framework retry on Service unavailable errors + - f41a169a3 2023-05-26T10:18:48+00:00 e2e: apply timeout for CSI Storage Capacity test only to node + - e407c2b4b 2023-05-24T09:14:44+02:00 Add DisruptionTarget condition when preempting for critical pod + - d2bd738e2 2023-05-23T00:14:18+08:00 update webhook test to go 1.21 + - 9107eee65 2023-05-18T12:21:40-04:00 Test APIService safe handling at startup + - 0bff4e356 2023-05-18T12:21:40-04:00 Fix waiting for CRD sync at server start + - 1ae728f43 2023-05-18T22:40:50+08:00 kubeadm: fix a bug where the static pod changes detection logic is inconsistent with kubelet + - f404d1c4d 2023-05-17T14:39:11+00:00 Update CHANGELOG/CHANGELOG-1.27.md for v1.27.2 + - 0d5eb41ef 2023-05-11T11:29:04-07:00 kubeadm: Make etcd member removal idempotent + - a64d6600d 2023-05-11T11:29:04-07:00 kubeadm: Add etcd client unit tests + - 38bbd2d54 2023-05-11T11:29:04-07:00 kubeadm: Use internal etcd client through an interface + +- machine-config-operator embedded-component 3d84f653e08d760d446442ddc80c3da21d8d7e59 to fc79ca7b7ccb23ec588aeb4a73901ca0730340b4 + - 192b8029 2023-06-27T08:39:28-04:00 controller: defer update of operator node + - bcd40a10 2023-06-23T16:39:29-04:00 Move all log functions to klog + - 4daf7bfb 2023-06-21T12:31:51+05:30 Minor fix to support `protectKernelDefaults` field in Kubelet Config + - 1500caa2 2023-06-21T06:52:53+03:00 add ipsec extension + - 6442768e 2023-06-15T10:55:31+02:00 Update feature gate in kubelet templates + - b4dbbe5d 2023-06-15T10:22:51+02:00 OCPCLOUD-2010: Re-vendor api and library-go for external platform support + - 98c51fb1 2023-06-06T11:14:36-04:00 bootstrap: Clarify that "root ca" is really "MCS CA" + - 3221924d 2023-06-06T09:54:29-04:00 daemon: removed pending config checks + +- openshift-controller-manager embedded-component 41104bfd3c2a492e4e20516fd7065b9c86e2ad7e to 2caaf6b26c07395566c38e01d6154debb9117ecc + - 633c4af 2023-06-26T10:54:36-04:00 [OCPNODE-1258] update runtime-utils for idms migrations + +- oc image-amd64 feedec57726f8a276ebc3a680441086562a35480 to c078876cc5aa434a02f14c28b8c2a56b9011aa13 + - 614e7e72 2023-06-21T09:08:31-04:00 handle the error case of node retrieval while waiting for reboot + - 6e7acc63 2023-06-21T09:40:41+01:00 Clarify the use of the filter without keep-manifest-list + - 6648f305 2023-06-15T11:56:59+03:00 oc image extract: idms-file flag map to IDMSFile field + - f9fa6f66 2023-05-29T10:08:19+02:00 Fix the output of error prompt - fab51e7e 2023-05-08T13:45:28-05:00 Correct incorrect command in observe command + - e7700e30 2023-03-27T23:59:14+02:00 make registry auth prefence default to podman config locations for + +- ovn-kubernetes image-amd64 5217351470aaa77bcfca04a1b6ee1ebf2bfbe7d9 to fb1c5655ec121f3f08eb0f2013e0d4252f8d982b + - c0a7236 2023-06-21T17:46:19-04:00 Add validation for type cast for pod,namespace and policy in onAdd,onDelete and onUpdate + - 5413a8d 2023-06-21T17:46:19-04:00 Adds cast check when getting object from queue in APB logic + - f68161a 2023-06-21T18:44:10+02:00 EgressIP: do not patch the status if the object no longer exists + - 4759e64 2023-06-21T18:40:15+02:00 EgressIP: do not patch the status if the object no longer exists + - f24f31d 2023-06-21T11:21:30-04:00 Fixes panic with APB sync conntrack + - 6941cd1 2023-06-21T10:59:45-04:00 Remove warning that APB is starting + - 1c9e04f 2023-06-21T10:58:56-04:00 Fixes waiting for informer cache sync with APB resources + - 5743521 2023-06-21T10:19:07-04:00 Fixes race in delete legacy hybrid route policies + - 049d469 2023-06-20T13:22:28-04:00 Disable gofmt check for register.go and factory.go autogenerated files inside go-controller/pkg/crd/ to avoid unwanted errors due to invalid formatting + - 497686c 2023-06-20T11:26:52+02:00 Emit a warning event for duplicated egress IP + - f90d045 2023-06-18T15:00:27-04:00 CARRY: bump dockerfile to golang 1.20 + - 4e8a543 2023-06-15T10:47:35-07:00 update go version for github jobs + - cb5374a 2023-06-15T10:47:35-07:00 rebase_1.27: update lint to v1.52.2 (latest) and fix lint errors + - 3ce2d31 2023-06-15T10:47:35-07:00 rebase_1.27: update OnAdd calls from client-go + - 2c4701d 2023-06-15T10:47:34-07:00 rebase_1.27: update k8s.io modules and vendor + - 2f78a27 2023-06-15T13:42:11+03:00 EgressService: sync node labels + - 2575a60 2023-06-15T10:28:35+03:00 EgressService: Update docs for separated Network and SNAT + - de40f0f 2023-06-15T10:28:22+03:00 EgressService E2E: Support separated Network and SNAT + - b0f66db 2023-06-15T10:28:18+03:00 EgressService: ovnkube-node support separated SNAT and Network + - 94ccdf3 2023-06-15T10:28:01+03:00 EgressService: zone support for separated Network and SNAT + - 07367da 2023-06-15T10:27:25+03:00 EgressService: clustermanager support for separated Network and SNAT + - abb5351 2023-06-15T09:54:31+03:00 EgressService: Update CRD with SNAT and Network separated + - 70918fc 2023-06-14T15:55:08+00:00 Use the old leadership lock name for global zone + - 908d683 2023-06-14T13:15:56+00:00 fake address set: don't check for concurrency on destroy + - 092234d 2023-06-12T19:18:13+02:00 Validate port before deleting conntrack flow + - 36a9193 2023-06-12T11:34:39+02:00 Add NCMWatchFactory + - 747d3b4 2023-06-09T16:38:18-04:00 kind ic: Fix kind deployment failure if cluster name is specified. + - afee2e8 2023-06-09T14:23:18-04:00 Skip APB External Route tests in e2e when IC is enabled + - 29ca926 2023-06-09T14:05:26-04:00 pod annotations: refactor GetPodCIDRsWithFullMask + - 9434ddc 2023-06-09T14:05:26-04:00 pod annotations: refactor GetPodIPsOfNetwork + - a92deee 2023-06-09T14:05:26-04:00 pod annotations, tests: GetPodIPsOfNetwork for secondary network + - f029b4c 2023-06-09T14:05:26-04:00 pod annotations, tests: parametrize GetPodIPsOfNetwork networkInfo + - 5f0e846 2023-06-09T14:05:26-04:00 Fixes usages of get pod IPs + - 13edc85 2023-06-09T13:54:30-04:00 Fix golangci-lint issues + - 91e29d9 2023-06-09T11:37:32-04:00 APB External Route fixes for unit test: * Fixed APB External Route flaky unit test when comparing static hop slices for policy changes by ensuring the comparison is done after the CR has been updated * Removed sorting functions in gatewayInfoList as they were not clear how they would sort the struct and were only used in test scenarios. They have been replaced by the Equal() functions. + - 3888bea 2023-06-08T10:26:14-07:00 fix issue running tests in docker + - 7bd8d5d 2023-06-08T11:41:13-04:00 fix hybrid overlay test flakes by removing periodic syncflows from testing + - e2d9ee7 2023-06-07T11:48:01-04:00 kind: Remove separate cluster manager support. + - 49ae4e3 2023-06-07T16:42:19+02:00 multi-homing, tests: skip NetConfList network configurations + - e881c76 2023-06-07T16:42:19+02:00 multi-homing, tests: test parsing the default network config + - 4c6bc6f 2023-06-07T16:42:19+02:00 multi-homing, tests: add successful scenario + - e7b5dc9 2023-06-07T16:42:19+02:00 multi-homing: remove redundant check + - a111f50 2023-06-07T16:42:19+02:00 multi-homing: fail if NetAttachDef provides ipam key + - 857019f 2023-06-07T08:36:20-04:00 Add EgressService flag to IC templates + - fa5c490 2023-06-07T08:36:20-04:00 Fix CPU Pinning tests in control plane for IC=true + - 77713d2 2023-06-07T08:36:20-04:00 Fix EIP control-plane tests when IC=true + - f49c71c 2023-06-07T08:36:20-04:00 CI: Add lane for kind-dual-stack-conversion with ovn-ic enabled + - f9a7975 2023-06-07T08:36:20-04:00 CI: Test multizone interconnect. + - 981900c 2023-06-07T08:36:20-04:00 e2e cp tests: Strip the leading and trailing qoutes from stdout of a cmd. + - 0742ee4 2023-06-07T08:36:20-04:00 kind: Enhance interconnect support to deploy multiple nodes in a zone. + - 3f96b2f 2023-06-07T08:36:20-04:00 kind: Add support for interconnect and multiple zones support. + - c9dccc44 2023-06-06T08:14:50-04:00 Remove check for removal of egress GW annotation in namespace during tests + - 25d892c 2023-06-05T17:11:48-04:00 Fixes invalid error while getting router NATs + - e62ff50 2023-06-05T12:48:07-05:00 test: use new libovsdb test server CreateTestData() in address set tests + - bc487cb 2023-06-05T12:47:49-05:00 testing: add CreateTestData() method for libovsdb test server + - 4a4046e 2023-06-05T12:47:49-05:00 test: rename libovsdbtest Cleanup -> Context + - a44dc11 2023-06-05T18:49:04+02:00 Add multi-zone support for egressservice + - d93a590 2023-06-05T18:49:04+02:00 Move egressservice allocation to cluster-manager + - 815884a 2023-06-05T18:49:04+02:00 Unify egressservice file naming + - 2560332 2023-06-03T12:24:48-04:00 fedora: Update OVN to 23.06.0-0. + - f543d45 2023-06-02T12:09:04-05:00 apbroute: consolidate some startup code + - 7368222 2023-06-02T18:21:45+02:00 CVE-2022-41723: net/http, golang.org/x/net/http2: avoid quadratic complexity in HPACK decoding + - a1b8aef 2023-06-02T09:35:13+02:00 Stop using a waitgroup in route manager + - 0927ea4 2023-06-01T10:12:27+00:00 Increase unit test timeout to 20m for ovn pkg + - 91e8a3b 2023-06-01T06:19:11+02:00 Fix cleanupStalePodSNATs if no podIPs are found + - 77ba451 2023-05-31T18:06:16+02:00 Extract all namespace pod ips only when creating nsInfo. + - ed147de 2023-05-31T10:40:20+02:00 multi-net, e2e, kind: remove shift instruction + - e579396 2023-05-31T10:40:20+02:00 multi-homing, localnet, tests: configure underlay + - d4a92b5 2023-05-31T10:40:20+02:00 multi-homing, e2e tests: extra interface for the kind deployment + - a747b14 2023-05-31T10:40:20+02:00 e2e, kind: parametrize OCI_BIN when creating secondary interfaces + - 5742aa1 2023-05-30T12:58:46-05:00 code in the AddPod() for hybrid overlay that inits the Node not required + - 6af07aa 2023-05-30T12:58:46-05:00 rename podLister to localPodLister for hybrid overlay + - 28d8241 2023-05-26T16:33:53+02:00 docs, multi-homing, policy: document IPAM-less policies restrictions + - ae94d5b 2023-05-26T13:39:07+02:00 multi-net policies, IPAM less: only warn for IPAMed networks + - dc94736 2023-05-26T13:39:07+02:00 multi-net policies, IPAM less, e2e: add test for IPAMless flat L2 policies + - faa0a7e 2023-05-26T13:39:07+02:00 multi-net policies, IPAM less: allow ipBlock peers + - 8ae10c3 2023-05-26T13:39:07+02:00 multi-net policies, IPAM less: fail when converting invalid policies + - 5acded9 2023-05-26T13:39:07+02:00 e2e: improve the error message of the getNetCIDRSubnet func + - e80027a 2023-05-26T10:23:22+08:00 Use no-uplink gateway bridge in compact-mode e2e test + - 89f953d 2023-05-26T10:23:03+08:00 Allow external gateway bridge without uplink port In local gateway mode + - 41fb665 2023-05-25T14:19:35-04:00 upgrade go and linter versions + - 513482b 2023-05-25T19:25:36+02:00 Initialize EgressIP stopChan in cluster-manager + - 91046e8 2023-05-24T16:27:33-04:00 Summary of changes: * Implements controllers for Admin Policy Based External Route to handle changes to namespaces, pods and admin policy based external route CRs. * Initialize in master node to handle interactions with the north bound DB. Initialize in worker nodes to handle changes to the conntrack (delete ECMP entries when a gateway IP is no longer a valid external gateway IP) * Implements repair() function for the master node. * Integrates with the annotation logic to avoid duplications in cache by sharing the externalGWCache and EXGWCacheMutex objects between the annotation and controller logic. * Updates the annotation logic to ensure the namespace anontation k8s.ovn.org/external-gw-pod-ips is updated when changes occur in a CR instance that coexists in the same namespace and that can impact the list of dynamic gateway IPs. * The implementation no longer relies on namespace annotations, including "k8s.ovn.org/external-gw-pod-ips", instead it uses its own cache structure to identify the valid pod IPs for a given namespace. * Implement E2E tests for admin policy based external route. The tests are a duplication of the existing annotated based logic for external gateways using the CR instead. + - 39bdf00 2023-05-24T14:27:06-04:00 Add Admin Policy Based External Route CRD and related generated code (informer,lister,api) + - df58e4f 2023-05-24T17:50:04+02:00 Add doc changes for IC metrics move + - b74b3aa 2023-05-24T17:47:14+02:00 EIP: Move relevant metrics to CM + - 665b934 2023-05-23T21:28:30+02:00 Split egressip into global and zone controllers + - 744f097 2023-05-23T21:28:30+02:00 Add utility DeleteLogicalRouterStaticRoutesWithPredicateOps + - 79a9b52 2023-05-23T21:28:30+02:00 Add egressIP factory to cluster-manager + - 2356819 2023-05-23T21:28:30+02:00 Add egressip feature enable flag to CM + +- kubernetes image-amd64 b4518170e4f4b621ae1e97d5fd178191bf2b285d to ab0b8ee0d340f945f4bb4dabeef1bffa5fe5c6cc + - aebb7e12f 2023-06-26T16:57:19-04:00 UPSTREAM: : when only this kube-apiserver can fulfill the kubernetes.default.svc, don't wait for aggregated availability + - b9512d245 2023-06-20T13:55:54-03:00 UPSTREAM: : hack/update-vendor.sh, make update and update image + - d72ca3b59 2023-06-19T10:31:52-03:00 UPSTREAM: : manually resolve conflicts + - 25b4e4319 2023-06-14T09:47:38+00:00 Release commit for Kubernetes v1.27.3 + - e0a2a6efd 2023-06-08T00:09:03-06:00 update-vendor: update vendored go.sums + - 82b2c5aef 2023-06-07T21:34:57-06:00 releng/go: Update images, dependencies and version to Go 1.20.5 + - b30e94b12 2023-06-06T21:10:53+00:00 kube-proxy avoid race condition using LocalModeNodeCIDR + - d59b91d97 2023-06-05T12:01:34-07:00 Add ephemeralcontainer to imagepolicy securityaccount admission plugin + - c345ce91a 2023-05-29T10:43:54+08:00 supported version of etcd 3.5.7-0 for Kubernetes v1.27.0-rc.0 + - 788879887 2023-05-26T12:02:29+00:00 e2e framework retry on Service unavailable errors + - f41a169a3 2023-05-26T10:18:48+00:00 e2e: apply timeout for CSI Storage Capacity test only to node + - e407c2b4b 2023-05-24T09:14:44+02:00 Add DisruptionTarget condition when preempting for critical pod + - d2bd738e2 2023-05-23T00:14:18+08:00 update webhook test to go 1.21 + - 9107eee65 2023-05-18T12:21:40-04:00 Test APIService safe handling at startup + - 0bff4e356 2023-05-18T12:21:40-04:00 Fix waiting for CRD sync at server start + - 1ae728f43 2023-05-18T22:40:50+08:00 kubeadm: fix a bug where the static pod changes detection logic is inconsistent with kubelet + - f404d1c4d 2023-05-17T14:39:11+00:00 Update CHANGELOG/CHANGELOG-1.27.md for v1.27.2 + - 0d5eb41ef 2023-05-11T11:29:04-07:00 kubeadm: Make etcd member removal idempotent + - a64d6600d 2023-05-11T11:29:04-07:00 kubeadm: Add etcd client unit tests + - 38bbd2d54 2023-05-11T11:29:04-07:00 kubeadm: Use internal etcd client through an interface + +- oc image-arm64 3555360fa1bda2ecf743e3f329a60245d674535d to c078876cc5aa434a02f14c28b8c2a56b9011aa13 + - 6648f305 2023-06-15T11:56:59+03:00 oc image extract: idms-file flag map to IDMSFile field + +- kubernetes image-arm64 cb4b47e5ddfbaf7844237b2e2eb2b0acfed5f1b5 to ab0b8ee0d340f945f4bb4dabeef1bffa5fe5c6cc + - aebb7e12f 2023-06-26T16:57:19-04:00 UPSTREAM: : when only this kube-apiserver can fulfill the kubernetes.default.svc, don't wait for aggregated availability diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 9b5896473c..e33eec51d8 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 5c85a318807b790705c16816f5022d0cc31148ba -https://github.com/openshift/cluster-ingress-operator embedded-component b1a6bb5c8b9ee864fd54374bc833fc24b7b935fd -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component a1de1b1cc85ce2d41e918d14534e5187b981819b -https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 1807a0d1872e8a2a15afc663da269eaacd84fd57 -https://github.com/openshift/cluster-kube-scheduler-operator embedded-component c2928b4ab9aa2c1e9bcc0989caa1d209b610b863 -https://github.com/openshift/cluster-network-operator embedded-component d1e994081a11db21f2c37731545a53836d7682c7 +https://github.com/openshift/cluster-ingress-operator embedded-component ecb3786b1397cb93865952c98db72d1990587bd0 +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 8b642494e3bffc365cb24383b416dc0f530547d9 +https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 5f49f59c88c963d97dd90643e7c9fb7ef1820d0c +https://github.com/openshift/cluster-kube-scheduler-operator embedded-component db92b6d9fcf410aa24efc4a70c4114925bb7b797 +https://github.com/openshift/cluster-network-operator embedded-component 64ab110f331b37f862eefe9d3b99c61445b87890 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component bab7be17127e3e8a661991d78aecd7d5a0542cec https://github.com/openshift/cluster-policy-controller embedded-component cc787e1b1e177696817b66689a03471914083a67 https://github.com/openshift/etcd embedded-component 53cdd6b0519f0e57da9032b473465799bba4b1a0 -https://github.com/openshift/kubernetes embedded-component b4518170e4f4b621ae1e97d5fd178191bf2b285d -https://github.com/openshift/machine-config-operator embedded-component 3d84f653e08d760d446442ddc80c3da21d8d7e59 -https://github.com/openshift/openshift-controller-manager embedded-component 41104bfd3c2a492e4e20516fd7065b9c86e2ad7e +https://github.com/openshift/kubernetes embedded-component ab0b8ee0d340f945f4bb4dabeef1bffa5fe5c6cc +https://github.com/openshift/machine-config-operator embedded-component fc79ca7b7ccb23ec588aeb4a73901ca0730340b4 +https://github.com/openshift/openshift-controller-manager embedded-component 2caaf6b26c07395566c38e01d6154debb9117ecc https://github.com/openshift/route-controller-manager embedded-component 38d9ec83ce464e9198af05918ab03a7995a11866 https://github.com/openshift/service-ca-operator embedded-component f0bd313003d3d79593b44936fb7cf0bab2a6daae -https://github.com/openshift/oc image-amd64 feedec57726f8a276ebc3a680441086562a35480 +https://github.com/openshift/oc image-amd64 c078876cc5aa434a02f14c28b8c2a56b9011aa13 https://github.com/openshift/coredns image-amd64 a2c62dd3976b27d6a45e273532c63ba914700917 https://github.com/openshift/router image-amd64 0cd9a58dff77127562f7851ccfa5cda79b8cef48 https://github.com/openshift/kube-rbac-proxy image-amd64 86f31e2de5221ed4acd6509fa7a010a286089f1f -https://github.com/openshift/ovn-kubernetes image-amd64 5217351470aaa77bcfca04a1b6ee1ebf2bfbe7d9 -https://github.com/openshift/kubernetes image-amd64 b4518170e4f4b621ae1e97d5fd178191bf2b285d +https://github.com/openshift/ovn-kubernetes image-amd64 fb1c5655ec121f3f08eb0f2013e0d4252f8d982b +https://github.com/openshift/kubernetes image-amd64 ab0b8ee0d340f945f4bb4dabeef1bffa5fe5c6cc https://github.com/openshift/service-ca-operator image-amd64 f0bd313003d3d79593b44936fb7cf0bab2a6daae -https://github.com/openshift/oc image-arm64 3555360fa1bda2ecf743e3f329a60245d674535d +https://github.com/openshift/oc image-arm64 c078876cc5aa434a02f14c28b8c2a56b9011aa13 https://github.com/openshift/coredns image-arm64 a2c62dd3976b27d6a45e273532c63ba914700917 https://github.com/openshift/router image-arm64 0cd9a58dff77127562f7851ccfa5cda79b8cef48 https://github.com/openshift/kube-rbac-proxy image-arm64 86f31e2de5221ed4acd6509fa7a010a286089f1f https://github.com/openshift/ovn-kubernetes image-arm64 fb1c5655ec121f3f08eb0f2013e0d4252f8d982b -https://github.com/openshift/kubernetes image-arm64 cb4b47e5ddfbaf7844237b2e2eb2b0acfed5f1b5 +https://github.com/openshift/kubernetes image-arm64 ab0b8ee0d340f945f4bb4dabeef1bffa5fe5c6cc https://github.com/openshift/service-ca-operator image-arm64 f0bd313003d3d79593b44936fb7cf0bab2a6daae diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index b50b91ace8..25107c585f 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.14.0-0.nightly-2023-06-20-065807" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-06-27-000451" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2023-06-27-233015" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-06-29-004030" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12" diff --git a/scripts/auto-rebase/rebase_patches/0002-disable-APIrequestcount-controller.patch b/scripts/auto-rebase/rebase_patches/0002-disable-APIrequestcount-controller.patch index 4134fdbd2a..239d303065 100644 --- a/scripts/auto-rebase/rebase_patches/0002-disable-APIrequestcount-controller.patch +++ b/scripts/auto-rebase/rebase_patches/0002-disable-APIrequestcount-controller.patch @@ -42,6 +42,6 @@ index 1bf8509b..d402786d 100644 - } - // END HANDLER CHAIN - - openshiftAPIServiceReachabilityCheck := newOpenshiftAPIServiceReachabilityCheck() - oauthAPIServiceReachabilityCheck := newOAuthPIServiceReachabilityCheck() + openshiftAPIServiceReachabilityCheck := newOpenshiftAPIServiceReachabilityCheck(genericConfig.PublicAddress) + oauthAPIServiceReachabilityCheck := newOAuthPIServiceReachabilityCheck(genericConfig.PublicAddress) genericConfig.ReadyzChecks = append(genericConfig.ReadyzChecks, openshiftAPIServiceReachabilityCheck, oauthAPIServiceReachabilityCheck) diff --git a/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/aggregator.go b/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/aggregator.go index 397c151e66..cf2347bfcc 100644 --- a/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/aggregator.go +++ b/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/aggregator.go @@ -27,7 +27,6 @@ import ( "k8s.io/klog/v2" - apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apiextensionsinformers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -117,7 +116,7 @@ func createAggregatorConfig( return aggregatorConfig, nil } -func createAggregatorServer(aggregatorConfig *aggregatorapiserver.Config, delegateAPIServer genericapiserver.DelegationTarget, apiExtensionInformers apiextensionsinformers.SharedInformerFactory) (*aggregatorapiserver.APIAggregator, error) { +func createAggregatorServer(aggregatorConfig *aggregatorapiserver.Config, delegateAPIServer genericapiserver.DelegationTarget, apiExtensionInformers apiextensionsinformers.SharedInformerFactory, crdAPIEnabled bool) (*aggregatorapiserver.APIAggregator, error) { aggregatorServer, err := aggregatorConfig.Complete().NewWithDelegate(delegateAPIServer) if err != nil { return nil, err @@ -147,8 +146,12 @@ func createAggregatorServer(aggregatorConfig *aggregatorapiserver.Config, delega // let the CRD controller process the initial set of CRDs before starting the autoregistration controller. // this prevents the autoregistration controller's initial sync from deleting APIServices for CRDs that still exist. // we only need to do this if CRDs are enabled on this server. We can't use discovery because we are the source for discovery. - if aggregatorConfig.GenericConfig.MergedResourceConfig.ResourceEnabled(apiextensionsv1.SchemeGroupVersion.WithResource("customresourcedefinitions")) { + if crdAPIEnabled { + klog.Infof("waiting for initial CRD sync...") crdRegistrationController.WaitForInitialSync() + klog.Infof("initial CRD sync complete...") + } else { + klog.Infof("CRD API not enabled, starting APIService registration without waiting for initial CRD sync") } autoRegistrationController.Run(5, context.StopCh) }() diff --git a/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go b/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go index 62aae8d90e..aa3a6fb532 100644 --- a/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go +++ b/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go @@ -39,6 +39,7 @@ import ( oteltrace "go.opentelemetry.io/otel/trace" corev1 "k8s.io/api/core/v1" + apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" extensionsapiserver "k8s.io/apiextensions-apiserver/pkg/apiserver" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilerrors "k8s.io/apimachinery/pkg/util/errors" @@ -232,6 +233,7 @@ func CreateServerChain(completedOptions completedServerRunOptions) (*aggregatora if err != nil { return nil, err } + crdAPIEnabled := apiExtensionsConfig.GenericConfig.MergedResourceConfig.ResourceEnabled(apiextensionsv1.SchemeGroupVersion.WithResource("customresourcedefinitions")) notFoundHandler := notfoundhandler.New(kubeAPIServerConfig.GenericConfig.Serializer, genericapifilters.NoMuxAndDiscoveryIncompleteKey) apiExtensionsServer, err := createAPIExtensionsServer(apiExtensionsConfig, genericapiserver.NewEmptyDelegateWithCustomHandler(notFoundHandler)) @@ -249,7 +251,7 @@ func CreateServerChain(completedOptions completedServerRunOptions) (*aggregatora if err != nil { return nil, err } - aggregatorServer, err := createAggregatorServer(aggregatorConfig, kubeAPIServer.GenericAPIServer, apiExtensionsServer.Informers) + aggregatorServer, err := createAggregatorServer(aggregatorConfig, kubeAPIServer.GenericAPIServer, apiExtensionsServer.Informers, crdAPIEnabled) if err != nil { // we don't need special handling for innerStopCh because the aggregator server doesn't create any go routines return nil, err diff --git a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go index 676fe56224..5c0b248668 100644 --- a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go +++ b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go @@ -56,8 +56,8 @@ func OpenShiftKubeAPIServerConfigPatch(genericConfig *genericapiserver.Config, k enablement.SCCAdmissionPlugin.SetExternalKubeInformerFactory(kubeInformers) // END ADMISSION - openshiftAPIServiceReachabilityCheck := newOpenshiftAPIServiceReachabilityCheck() - oauthAPIServiceReachabilityCheck := newOAuthPIServiceReachabilityCheck() + openshiftAPIServiceReachabilityCheck := newOpenshiftAPIServiceReachabilityCheck(genericConfig.PublicAddress) + oauthAPIServiceReachabilityCheck := newOAuthPIServiceReachabilityCheck(genericConfig.PublicAddress) genericConfig.ReadyzChecks = append(genericConfig.ReadyzChecks, openshiftAPIServiceReachabilityCheck, oauthAPIServiceReachabilityCheck) genericConfig.AddPostStartHookOrDie("openshift.io-startkubeinformers", func(context genericapiserver.PostStartHookContext) error { diff --git a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/sdn_readyz_wait.go b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/sdn_readyz_wait.go index 59f5353d29..e89298cdc2 100644 --- a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/sdn_readyz_wait.go +++ b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/sdn_readyz_wait.go @@ -18,22 +18,23 @@ import ( "k8s.io/klog/v2" ) -func newOpenshiftAPIServiceReachabilityCheck() *aggregatedAPIServiceAvailabilityCheck { - return newAggregatedAPIServiceReachabilityCheck("openshift-apiserver", "api") +func newOpenshiftAPIServiceReachabilityCheck(ipForKubernetesDefaultService net.IP) *aggregatedAPIServiceAvailabilityCheck { + return newAggregatedAPIServiceReachabilityCheck(ipForKubernetesDefaultService, "openshift-apiserver", "api") } -func newOAuthPIServiceReachabilityCheck() *aggregatedAPIServiceAvailabilityCheck { - return newAggregatedAPIServiceReachabilityCheck("openshift-oauth-apiserver", "api") +func newOAuthPIServiceReachabilityCheck(ipForKubernetesDefaultService net.IP) *aggregatedAPIServiceAvailabilityCheck { + return newAggregatedAPIServiceReachabilityCheck(ipForKubernetesDefaultService, "openshift-oauth-apiserver", "api") } // if the API service is not found, then this check returns quickly. // if the endpoint is not accessible within 60 seconds, we report ready no matter what // otherwise, wait for up to 60 seconds to be able to reach the apiserver -func newAggregatedAPIServiceReachabilityCheck(namespace, service string) *aggregatedAPIServiceAvailabilityCheck { +func newAggregatedAPIServiceReachabilityCheck(ipForKubernetesDefaultService net.IP, namespace, service string) *aggregatedAPIServiceAvailabilityCheck { return &aggregatedAPIServiceAvailabilityCheck{ - done: make(chan struct{}), - namespace: namespace, - serviceName: service, + done: make(chan struct{}), + ipForKubernetesDefaultService: ipForKubernetesDefaultService, + namespace: namespace, + serviceName: service, } } @@ -41,6 +42,10 @@ type aggregatedAPIServiceAvailabilityCheck struct { // done indicates that this check is complete (success or failure) and the check should return true done chan struct{} + // ipForKubernetesDefaultService is used to determine whether this endpoint is the only one for the kubernetes.default.svc + // if so, it will report reachable immediately because honoring some requests is better than honoring no requests. + ipForKubernetesDefaultService net.IP + // namespace is the namespace hosting the service for the aggregated api namespace string // serviceName is used to get a list of endpoints to directly dial @@ -78,6 +83,32 @@ func (c *aggregatedAPIServiceAvailabilityCheck) checkForConnection(context gener panic(err) } + ctx, cancel := gocontext.WithTimeout(gocontext.TODO(), 30*time.Second) + defer cancel() + + // if the kubernetes.default.svc needs an endpoint and this is the only apiserver than can fulfill it, then we don't + // wait for reachability. We wait for other conditions, but unreachable apiservers correctly 503 for clients. + kubeEndpoints, err := kubeClient.CoreV1().Endpoints("default").Get(ctx, "kubernetes", metav1.GetOptions{}) + switch { + case apierrors.IsNotFound(err): + utilruntime.HandleError(fmt.Errorf("%s did not find a kubernetes.default.svc endpoint", c.Name())) + return + case err != nil: + utilruntime.HandleError(fmt.Errorf("%s unable to read a kubernetes.default.svc endpoint: %w", c.Name(), err)) + return + case len(kubeEndpoints.Subsets) == 0: + utilruntime.HandleError(fmt.Errorf("%s did not find any IPs for kubernetes.default.svc endpoint", c.Name())) + return + case len(kubeEndpoints.Subsets[0].Addresses) == 0: + utilruntime.HandleError(fmt.Errorf("%s did not find any IPs for kubernetes.default.svc endpoint", c.Name())) + return + case len(kubeEndpoints.Subsets[0].Addresses) == 1: + if kubeEndpoints.Subsets[0].Addresses[0].IP == c.ipForKubernetesDefaultService.String() { + utilruntime.HandleError(fmt.Errorf("%s only found this kube-apiserver's IP (%v) in kubernetes.default.svc endpoint", c.Name(), c.ipForKubernetesDefaultService)) + return + } + } + // Start a thread which repeatedly tries to connect to any aggregated apiserver endpoint. // 1. if the aggregated apiserver endpoint doesn't exist, logs a warning and reports ready // 2. if a connection cannot be made, after 60 seconds logs an error and reports ready -- this avoids a rebootstrapping cycle diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/preemption/preemption.go b/vendor/k8s.io/kubernetes/pkg/kubelet/preemption/preemption.go index 5f0fb5e03c..e4d0cbd931 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/preemption/preemption.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/preemption/preemption.go @@ -21,10 +21,13 @@ import ( "math" v1 "k8s.io/api/core/v1" + utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/tools/record" "k8s.io/klog/v2" + podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/api/v1/resource" v1qos "k8s.io/kubernetes/pkg/apis/core/v1/helper/qos" + "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet/events" "k8s.io/kubernetes/pkg/kubelet/eviction" "k8s.io/kubernetes/pkg/kubelet/lifecycle" @@ -103,6 +106,14 @@ func (c *CriticalPodAdmissionHandler) evictPodsToFreeRequests(admitPod *v1.Pod, status.Phase = v1.PodFailed status.Reason = events.PreemptContainer status.Message = message + if utilfeature.DefaultFeatureGate.Enabled(features.PodDisruptionConditions) { + podutil.UpdatePodCondition(status, &v1.PodCondition{ + Type: v1.DisruptionTarget, + Status: v1.ConditionTrue, + Reason: v1.PodReasonTerminationByKubelet, + Message: "Pod was preempted by Kubelet to accommodate a critical pod.", + }) + } }) if err != nil { klog.ErrorS(err, "Failed to evict pod", "pod", klog.KObj(pod)) diff --git a/vendor/k8s.io/kubernetes/pkg/proxy/node.go b/vendor/k8s.io/kubernetes/pkg/proxy/node.go index f2cbf6b1f2..1845818945 100644 --- a/vendor/k8s.io/kubernetes/pkg/proxy/node.go +++ b/vendor/k8s.io/kubernetes/pkg/proxy/node.go @@ -33,6 +33,12 @@ type NodePodCIDRHandler struct { podCIDRs []string } +func NewNodePodCIDRHandler(podCIDRs []string) *NodePodCIDRHandler { + return &NodePodCIDRHandler{ + podCIDRs: podCIDRs, + } +} + var _ config.NodeHandler = &NodePodCIDRHandler{} // OnNodeAdd is a handler for Node creates. diff --git a/vendor/k8s.io/kubernetes/plugin/pkg/admission/imagepolicy/admission.go b/vendor/k8s.io/kubernetes/plugin/pkg/admission/imagepolicy/admission.go index 6fd7f0dfad..f1f88fef3b 100644 --- a/vendor/k8s.io/kubernetes/plugin/pkg/admission/imagepolicy/admission.go +++ b/vendor/k8s.io/kubernetes/plugin/pkg/admission/imagepolicy/admission.go @@ -46,6 +46,7 @@ import ( // PluginName indicates name of admission plugin. const PluginName = "ImagePolicyWebhook" +const ephemeralcontainers = "ephemeralcontainers" // AuditKeyPrefix is used as the prefix for all audit keys handled by this // pluggin. Some well known suffixes are listed below. @@ -132,8 +133,9 @@ func (a *Plugin) webhookError(pod *api.Pod, attributes admission.Attributes, err // Validate makes an admission decision based on the request attributes func (a *Plugin) Validate(ctx context.Context, attributes admission.Attributes, o admission.ObjectInterfaces) (err error) { - // Ignore all calls to subresources or resources other than pods. - if attributes.GetSubresource() != "" || attributes.GetResource().GroupResource() != api.Resource("pods") { + // Ignore all calls to subresources other than ephemeralcontainers or calls to resources other than pods. + subresource := attributes.GetSubresource() + if (subresource != "" && subresource != ephemeralcontainers) || attributes.GetResource().GroupResource() != api.Resource("pods") { return nil } @@ -144,13 +146,21 @@ func (a *Plugin) Validate(ctx context.Context, attributes admission.Attributes, // Build list of ImageReviewContainerSpec var imageReviewContainerSpecs []v1alpha1.ImageReviewContainerSpec - containers := make([]api.Container, 0, len(pod.Spec.Containers)+len(pod.Spec.InitContainers)) - containers = append(containers, pod.Spec.Containers...) - containers = append(containers, pod.Spec.InitContainers...) - for _, c := range containers { - imageReviewContainerSpecs = append(imageReviewContainerSpecs, v1alpha1.ImageReviewContainerSpec{ - Image: c.Image, - }) + if subresource == "" { + containers := make([]api.Container, 0, len(pod.Spec.Containers)+len(pod.Spec.InitContainers)) + containers = append(containers, pod.Spec.Containers...) + containers = append(containers, pod.Spec.InitContainers...) + for _, c := range containers { + imageReviewContainerSpecs = append(imageReviewContainerSpecs, v1alpha1.ImageReviewContainerSpec{ + Image: c.Image, + }) + } + } else if subresource == ephemeralcontainers { + for _, c := range pod.Spec.EphemeralContainers { + imageReviewContainerSpecs = append(imageReviewContainerSpecs, v1alpha1.ImageReviewContainerSpec{ + Image: c.Image, + }) + } } imageReview := v1alpha1.ImageReview{ Spec: v1alpha1.ImageReviewSpec{ diff --git a/vendor/k8s.io/kubernetes/plugin/pkg/admission/serviceaccount/admission.go b/vendor/k8s.io/kubernetes/plugin/pkg/admission/serviceaccount/admission.go index 0110f9e7bf..7b2ee011f4 100644 --- a/vendor/k8s.io/kubernetes/plugin/pkg/admission/serviceaccount/admission.go +++ b/vendor/k8s.io/kubernetes/plugin/pkg/admission/serviceaccount/admission.go @@ -99,7 +99,7 @@ var _ = genericadmissioninitializer.WantsExternalKubeInformerFactory(&Plugin{}) // 5. If MountServiceAccountToken is true, it adds a VolumeMount with the pod's ServiceAccount's api token secret to containers func NewServiceAccount() *Plugin { return &Plugin{ - Handler: admission.NewHandler(admission.Create), + Handler: admission.NewHandler(admission.Create, admission.Update), // TODO: enable this once we've swept secret usage to account for adding secret references to service accounts LimitSecretReferences: false, // Auto mount service account API token secrets @@ -139,7 +139,10 @@ func (s *Plugin) Admit(ctx context.Context, a admission.Attributes, o admission. if shouldIgnore(a) { return nil } - + if a.GetOperation() != admission.Create { + // we only mutate pods during create requests + return nil + } pod := a.GetObject().(*api.Pod) // Don't modify the spec of mirror pods. @@ -156,7 +159,7 @@ func (s *Plugin) Admit(ctx context.Context, a admission.Attributes, o admission. serviceAccount, err := s.getServiceAccount(a.GetNamespace(), pod.Spec.ServiceAccountName) if err != nil { - return admission.NewForbidden(a, fmt.Errorf("error looking up service account %s/%s: %v", a.GetNamespace(), pod.Spec.ServiceAccountName, err)) + return admission.NewForbidden(a, fmt.Errorf("error looking up service account %s/%s: %w", a.GetNamespace(), pod.Spec.ServiceAccountName, err)) } if s.MountServiceAccountToken && shouldAutomount(serviceAccount, pod) { s.mountServiceAccountToken(serviceAccount, pod) @@ -179,6 +182,15 @@ func (s *Plugin) Validate(ctx context.Context, a admission.Attributes, o admissi pod := a.GetObject().(*api.Pod) + if a.GetOperation() == admission.Update && a.GetSubresource() == "ephemeralcontainers" { + return s.limitEphemeralContainerSecretReferences(pod, a) + } + + if a.GetOperation() != admission.Create { + // we only validate pod specs during create requests + return nil + } + // Mirror pods have restrictions on what they can reference if _, isMirrorPod := pod.Annotations[api.MirrorPodAnnotationKey]; isMirrorPod { if len(pod.Spec.ServiceAccountName) != 0 { @@ -204,6 +216,10 @@ func (s *Plugin) Validate(ctx context.Context, a admission.Attributes, o admissi return nil } + // Require container pods to have service accounts + if len(pod.Spec.ServiceAccountName) == 0 { + return admission.NewForbidden(a, fmt.Errorf("no service account specified for pod %s/%s", a.GetNamespace(), pod.Name)) + } // Ensure the referenced service account exists serviceAccount, err := s.getServiceAccount(a.GetNamespace(), pod.Spec.ServiceAccountName) if err != nil { @@ -220,10 +236,7 @@ func (s *Plugin) Validate(ctx context.Context, a admission.Attributes, o admissi } func shouldIgnore(a admission.Attributes) bool { - if a.GetResource().GroupResource() != api.Resource("pods") { - return true - } - if a.GetSubresource() != "" { + if a.GetResource().GroupResource() != api.Resource("pods") || (a.GetSubresource() != "" && a.GetSubresource() != "ephemeralcontainers") { return true } obj := a.GetObject() @@ -349,6 +362,36 @@ func (s *Plugin) limitSecretReferences(serviceAccount *corev1.ServiceAccount, po return nil } +func (s *Plugin) limitEphemeralContainerSecretReferences(pod *api.Pod, a admission.Attributes) error { + // Require ephemeral container pods to have service accounts + if len(pod.Spec.ServiceAccountName) == 0 { + return admission.NewForbidden(a, fmt.Errorf("no service account specified for pod %s/%s", a.GetNamespace(), pod.Name)) + } + // Ensure the referenced service account exists + serviceAccount, err := s.getServiceAccount(a.GetNamespace(), pod.Spec.ServiceAccountName) + if err != nil { + return admission.NewForbidden(a, fmt.Errorf("error looking up service account %s/%s: %w", a.GetNamespace(), pod.Spec.ServiceAccountName, err)) + } + if !s.enforceMountableSecrets(serviceAccount) { + return nil + } + // Ensure all secrets the ephemeral containers reference are allowed by the service account + mountableSecrets := sets.NewString() + for _, s := range serviceAccount.Secrets { + mountableSecrets.Insert(s.Name) + } + for _, container := range pod.Spec.EphemeralContainers { + for _, env := range container.Env { + if env.ValueFrom != nil && env.ValueFrom.SecretKeyRef != nil { + if !mountableSecrets.Has(env.ValueFrom.SecretKeyRef.Name) { + return fmt.Errorf("ephemeral container %s with envVar %s referencing secret.secretName=\"%s\" is not allowed because service account %s does not reference that secret", container.Name, env.Name, env.ValueFrom.SecretKeyRef.Name, serviceAccount.Name) + } + } + } + } + return nil +} + func (s *Plugin) mountServiceAccountToken(serviceAccount *corev1.ServiceAccount, pod *api.Pod) { // Find the volume and volume name for the ServiceAccountTokenSecret if it already exists tokenVolumeName := "" diff --git a/vendor/modules.txt b/vendor/modules.txt index 8598d72843..09af85b922 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1309,7 +1309,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/api v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1366,7 +1366,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.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/apiextensions-apiserver v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1410,7 +1410,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.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/apimachinery v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1475,7 +1475,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.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/apiserver v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/cel @@ -1633,12 +1633,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.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/cli-runtime v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/client-go v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -1975,7 +1975,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-20230616141928-b4518170e4f4 +# k8s.io/cloud-provider v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -1997,14 +1997,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-20230616141928-b4518170e4f4 +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 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.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/component-base v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -2038,7 +2038,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.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/component-helpers v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -2051,7 +2051,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.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/controller-manager v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -2068,16 +2068,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-20230616141928-b4518170e4f4 +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 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-20230616141928-b4518170e4f4 +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 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-20230616141928-b4518170e4f4 +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 k8s.io/dynamic-resource-allocation/resourceclaim # k8s.io/gengo v0.0.0-20220902162205-c0856e24416d @@ -2096,13 +2096,13 @@ 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.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/kms v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 k8s.io/kms/apis/v1beta1 k8s.io/kms/apis/v2 k8s.io/kms/pkg/service k8s.io/kms/pkg/util -# k8s.io/kube-aggregator v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/kube-aggregator v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2133,7 +2133,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-20230616141928-b4518170e4f4 +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f @@ -2166,13 +2166,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-20230616141928-b4518170e4f4 +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 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.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/kubectl v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources @@ -2207,7 +2207,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-20230616141928-b4518170e4f4 +# k8s.io/kubelet v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 @@ -2224,7 +2224,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.27.1 => github.com/openshift/kubernetes v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/kubernetes v1.27.1 => github.com/openshift/kubernetes v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -3029,7 +3029,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-20230616141928-b4518170e4f4 +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 k8s.io/legacy-cloud-providers/azure k8s.io/legacy-cloud-providers/azure/auth @@ -3071,7 +3071,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-20230616141928-b4518170e4f4 +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3086,10 +3086,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-20230616141928-b4518170e4f4 +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/pod-security-admission v0.27.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230627155501-ab0b8ee0d340 ## explicit; go 1.20 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3232,33 +3232,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.6.1-0.20230317131656-c62d9de5a460 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230616141928-b4518170e4f4 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230616141928-b4518170e4f4 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230627155501-ab0b8ee0d340 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230627155501-ab0b8ee0d340