diff --git a/etcd/go.mod b/etcd/go.mod index c4a7f7b8fe..f0a4b3630b 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -39,7 +39,7 @@ require ( github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/selinux v1.10.0 // indirect - github.com/openshift/library-go v0.0.0-20230130232623-47904dd9ff5a // indirect + github.com/openshift/library-go v0.0.0-20230222090221-582055a1d5c4 // indirect github.com/pquerna/cachecontrol v0.1.0 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect @@ -174,33 +174,33 @@ replace ( go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230125165349-13c18c444a8c // from etcd go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20230125165349-13c18c444a8c // from etcd go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20230125165349-13c18c444a8c // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230223163248-89232647de67 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230223163248-89232647de67 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230223163248-89232647de67 // staging kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230302092939-8cfbab7d1c15 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230302092939-8cfbab7d1c15 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes ) diff --git a/etcd/go.sum b/etcd/go.sum index c31c3580b3..276d1b5751 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -394,36 +394,36 @@ github.com/openshift/etcd/raft/v3 v3.5.1-0.20230125165349-13c18c444a8c h1:F2zw47 github.com/openshift/etcd/raft/v3 v3.5.1-0.20230125165349-13c18c444a8c/go.mod h1:wL8kkRGx1Hp8FmZUuHfL3K2/OaGIDaXGr1N7i2G07J0= github.com/openshift/etcd/server/v3 v3.5.1-0.20230125165349-13c18c444a8c h1:dlpgsW1KSYbbI8pV2T1n38SvXGbxsJwwpHqJ8NHqH4w= github.com/openshift/etcd/server/v3 v3.5.1-0.20230125165349-13c18c444a8c/go.mod h1:6/Gfe8XTGXQJgLYQ65oGKMfPivb2EASLUSMSWN9Sroo= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230223163248-89232647de67 h1:jodZbyQh9GPxPR97CE430QxolCRK0mk7oZ70sulRxgI= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230223163248-89232647de67/go.mod h1:SVFZVmcfr/QnDkKqmBvlVlhurEsml57BUNDH+R/CPqk= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230223163248-89232647de67 h1:kO4mM0qG9nkleOgVM+P8j++CWIigGdBkaiOKAjeHxMs= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230223163248-89232647de67/go.mod h1:fcaZu5DOMCvnjHsoJrKV5iQLvaiOTv50bj8okFxwYFw= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230223163248-89232647de67 h1:g8TIpCLp5/kZi6BBGDnY4Wqaw0Rj49QEX9RINciIeD8= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230223163248-89232647de67/go.mod h1:CO72fYg4kCwaSLKgV6oMT9N1k5jhe8ZfxN1Rv7i9aL0= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230223163248-89232647de67 h1:B9MD7YTmV1H6YCyH/xQMBOt92xUvEUr2AIqSPNBKOW0= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230223163248-89232647de67/go.mod h1:salqUyIbJbHU1a9StwrX18tkxIoZejk8BQB9aYNkIPk= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230223163248-89232647de67 h1:XBWzd4WZ5WWElSF5NQIAc0amOIOPdF/1OLERO1fKwjg= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230223163248-89232647de67/go.mod h1:g5iGehpfJ/sjrrPZotg2ndVBM1qrl/xlKDEC6CJwoRo= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230223163248-89232647de67 h1:oI+hUXmAZs5/DhIfBpD2IRZfR47eiKkjYaibFMja+44= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230223163248-89232647de67/go.mod h1:y/nn+aWz2wp+2mklRHKwQb5C36SqiS4mCgw2/C1HRpM= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230223163248-89232647de67 h1:eni4EViEO+I0Kfxyq0NW0C5AxQjGFKfakFsN1TJU1n4= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230223163248-89232647de67/go.mod h1:pfu0i4DFeQXwdlNs9TQpFEUK+8y4I3HSCzqbmQDobJ8= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230223163248-89232647de67 h1:3o/vN/o1/BX0pSXnzxSBFAfs8xO+7YZkfA5x28p1TDI= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230223163248-89232647de67/go.mod h1:+K4RuDOLxtVWiPZfUefwPoYThb9BEmWYp5zId0KFgU0= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230223163248-89232647de67 h1:4RoVjs10TFjwM1hKjMt1mRN/oVInSh6SfAqPLLUG1wM= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230223163248-89232647de67/go.mod h1:IrwH1whPmwqMMBuqU2Gkb2cdmdqTg5zpbYsPC9KF8hY= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230223163248-89232647de67 h1:ClQHFBI/h6g75rl75DYTd87lm3cqkWCcLz7ge5lpTRQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230223163248-89232647de67/go.mod h1:NXsaH8tQ1U2J3w6IW8hNaC4ZQFJvkC2lVoXOXZQ8ii0= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230223163248-89232647de67 h1:bsS++odMO5hvu7njKc3sTt+QqR9mYszQSzvN+uaLLgQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230223163248-89232647de67/go.mod h1:6p383itqHHhUKvZADAr+LDVXOJ4ZWo0tBKVxTjqc9UY= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230223163248-89232647de67 h1:9bgKIabZ59hgFivSWZb+0kPm/MbFcGD3f9JhF7HIbyw= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230223163248-89232647de67/go.mod h1:7VSG6sD9u3yCsNAz3+TYBN6oNXmBmfX32o9piXgdUHQ= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230223163248-89232647de67 h1:vmW1Jb6zsFOuYbCfDsMN5dDS2b6AI+4tjv5wCIaAXvY= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230223163248-89232647de67/go.mod h1:n49VMDfRrPr3RdbpZRjo4yIF65v6ryFoeflGeAFItyc= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230223163248-89232647de67 h1:Bc5AtKJhmjgGUF4Q5NX3LEP2HmU6EnnzvB0o5jnhEA4= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230223163248-89232647de67/go.mod h1:y8fO9+mZJPj9OK26w+MwxW4kUf+bJh1CHsPYvRjwYoA= -github.com/openshift/library-go v0.0.0-20230130232623-47904dd9ff5a h1:OzF7I7mAzO4SBo5eO5CWoCTgMDydN/Tf2/Rq8YbMpT0= -github.com/openshift/library-go v0.0.0-20230130232623-47904dd9ff5a/go.mod h1:xO4nAf0qa56dgvEJWVD1WuwSJ8JWPU1TYLBQrlutWnE= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230302092939-8cfbab7d1c15 h1:c+nqPPaSvk7lFRhRmQDL/vxmpW8H2m2hL74rvCxPfl4= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:SVFZVmcfr/QnDkKqmBvlVlhurEsml57BUNDH+R/CPqk= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230302092939-8cfbab7d1c15 h1:oqlXbqdWoxKXLTnL9hRoB23tIeYkYsxO6GdtQ9rRxtI= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:fcaZu5DOMCvnjHsoJrKV5iQLvaiOTv50bj8okFxwYFw= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230302092939-8cfbab7d1c15 h1:enS7BI2SK2UjkCZtiNu6MJjRKj0UEF/kO1DGzDHipYg= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:jNyfmvBDTiARZON7apOkSQtGCcRZ2a70hPSWo0L3i14= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230302092939-8cfbab7d1c15 h1:ICM1GnWPeSOwVSZhobsLMRfb2XpgrLsvSV9nCUz7V9I= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:salqUyIbJbHU1a9StwrX18tkxIoZejk8BQB9aYNkIPk= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230302092939-8cfbab7d1c15 h1:IEAsee2mr/VYyKf9zUbVwZIbUgdeyrxkC7P7ZP3wOCQ= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:g5iGehpfJ/sjrrPZotg2ndVBM1qrl/xlKDEC6CJwoRo= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230302092939-8cfbab7d1c15 h1:28RQpjUNjCVgBlzfojhAMWB53qqXW89tidJH2Eb8lAg= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:vzGceoKOqVe+9Sw2BUMQeKTzAZuGgecSjORUh6NTopk= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230302092939-8cfbab7d1c15 h1:fk4WBSDxH/rHU6CfJKWo7sNlS/bSOR3zi1NNt9Uw+Gw= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:pfu0i4DFeQXwdlNs9TQpFEUK+8y4I3HSCzqbmQDobJ8= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230302092939-8cfbab7d1c15 h1:RwNgiq32cdr7W5VuQeEZjh0zz51R7OahEduTziz0pVQ= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:+K4RuDOLxtVWiPZfUefwPoYThb9BEmWYp5zId0KFgU0= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230302092939-8cfbab7d1c15 h1:U82y8W/CmR1x49E6vN/MBxSit++UFltlvlO421RQP6k= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:IrwH1whPmwqMMBuqU2Gkb2cdmdqTg5zpbYsPC9KF8hY= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230302092939-8cfbab7d1c15 h1:RG8CBYD0o+3oSn9L/FupTjUEPEad0M7TpcnrPuFibvk= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:NXsaH8tQ1U2J3w6IW8hNaC4ZQFJvkC2lVoXOXZQ8ii0= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230302092939-8cfbab7d1c15 h1:jkcjsPMzmpproMqlPknMr1HtTgYqA3tEL0mp1INAL/U= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:6p383itqHHhUKvZADAr+LDVXOJ4ZWo0tBKVxTjqc9UY= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230302092939-8cfbab7d1c15 h1:duNE3VCIaEaRRYK/xC1jL07e2i44WVwe7EFm9LTDsl4= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:7VSG6sD9u3yCsNAz3+TYBN6oNXmBmfX32o9piXgdUHQ= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230302092939-8cfbab7d1c15 h1:RIlwMvDU1H54g1xkWBNwIiWJQL/OSrQF8kuwsYXjW8Y= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:n49VMDfRrPr3RdbpZRjo4yIF65v6ryFoeflGeAFItyc= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230302092939-8cfbab7d1c15 h1:I6V/P6nSZjSEEOBVkU+cNE2/xErhpo8q8Wnw81vVXz4= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:gULMy2U4u1oEo5m7oPDz2aoZchXwwpK68uppEOnBBJk= +github.com/openshift/library-go v0.0.0-20230222090221-582055a1d5c4 h1:B9e1Sga7Q6iSI1YgzLgfABo+LDET7HZngJ+tKlrwVSk= +github.com/openshift/library-go v0.0.0-20230222090221-582055a1d5c4/go.mod h1:xO4nAf0qa56dgvEJWVD1WuwSJ8JWPU1TYLBQrlutWnE= github.com/openshift/onsi-ginkgo/v2 v2.4.1-0.20221214150008-e73634cb3870 h1:YH3Z3ZWCDWjkAGdZpK5rCm5pRZ4wt0uEx1GwvCiO3+I= 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/go.mod b/go.mod index c9fe3c564c..eaf4f79194 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d github.com/openshift/client-go v0.0.0-20230120202327-72f107311084 github.com/openshift/cluster-policy-controller v0.0.0-20230217170320-ac01e3463245 - github.com/openshift/library-go v0.0.0-20230130232623-47904dd9ff5a + github.com/openshift/library-go v0.0.0-20230222090221-582055a1d5c4 github.com/openshift/route-controller-manager v0.0.0-20230205134410-d7a8e22db412 github.com/pkg/errors v0.9.1 github.com/spf13/cobra v1.6.0 @@ -231,34 +231,34 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.4.1-0.20221214150008-e73634cb3870 // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230223163248-89232647de67 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230223163248-89232647de67 // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230223163248-89232647de67 // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230223163248-89232647de67 // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230223163248-89232647de67 // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230223163248-89232647de67 // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230223163248-89232647de67 // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230223163248-89232647de67 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230223163248-89232647de67 // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230223163248-89232647de67 // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230223163248-89232647de67 // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230223163248-89232647de67 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230223163248-89232647de67 // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230223163248-89232647de67 // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230223163248-89232647de67 // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230223163248-89232647de67 // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230223163248-89232647de67 // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230223163248-89232647de67 // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230223163248-89232647de67 // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230223163248-89232647de67 // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230223163248-89232647de67 // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230302092939-8cfbab7d1c15 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230302092939-8cfbab7d1c15 // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230302092939-8cfbab7d1c15 // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230302092939-8cfbab7d1c15 // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230302092939-8cfbab7d1c15 // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230302092939-8cfbab7d1c15 // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230302092939-8cfbab7d1c15 // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230302092939-8cfbab7d1c15 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230302092939-8cfbab7d1c15 // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230302092939-8cfbab7d1c15 // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230302092939-8cfbab7d1c15 // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230302092939-8cfbab7d1c15 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230302092939-8cfbab7d1c15 // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230302092939-8cfbab7d1c15 // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230302092939-8cfbab7d1c15 // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230302092939-8cfbab7d1c15 // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230302092939-8cfbab7d1c15 // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230302092939-8cfbab7d1c15 // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230302092939-8cfbab7d1c15 // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230302092939-8cfbab7d1c15 // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230302092939-8cfbab7d1c15 // from kubernetes ) diff --git a/go.sum b/go.sum index d840320f95..9428c22704 100644 --- a/go.sum +++ b/go.sum @@ -608,60 +608,59 @@ github.com/openshift/client-go v0.0.0-20230120202327-72f107311084 h1:66uaqNwA+qY github.com/openshift/client-go v0.0.0-20230120202327-72f107311084/go.mod h1:M3h9m001PWac3eAudGG3isUud6yBjr5XpzLYLLTlHKo= github.com/openshift/cluster-policy-controller v0.0.0-20230217170320-ac01e3463245 h1:BoNt9Hemwyc32xX+CZZaNGegWEiN7bGTVk4XaRboO8k= github.com/openshift/cluster-policy-controller v0.0.0-20230217170320-ac01e3463245/go.mod h1:vlkRuwyRueLOQ/ZRRle+rCrh+YNoh+pzJm9WaN9e6mU= -github.com/openshift/kubernetes v0.0.0-20230223163248-89232647de67 h1:dewYsajZF/pAgiTsn7qTCQD7b2mPX6RHdoXRS5UCdFA= -github.com/openshift/kubernetes v0.0.0-20230223163248-89232647de67/go.mod h1:1TasN9CV9saCSh+Nk2dHjqKZc46B2e1yM14mtGKyK+c= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230223163248-89232647de67 h1:jodZbyQh9GPxPR97CE430QxolCRK0mk7oZ70sulRxgI= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230223163248-89232647de67/go.mod h1:SVFZVmcfr/QnDkKqmBvlVlhurEsml57BUNDH+R/CPqk= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230223163248-89232647de67 h1:vH6wwtAYyrods9Tkov8YY/NTDEglxMdYqBE/ikZ4vrE= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230223163248-89232647de67/go.mod h1:cwvC6XCAm5R2g+jlAhmBrZ6/W4WlbwynzMHd/mx4xuM= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230223163248-89232647de67 h1:kO4mM0qG9nkleOgVM+P8j++CWIigGdBkaiOKAjeHxMs= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230223163248-89232647de67/go.mod h1:fcaZu5DOMCvnjHsoJrKV5iQLvaiOTv50bj8okFxwYFw= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230223163248-89232647de67 h1:g8TIpCLp5/kZi6BBGDnY4Wqaw0Rj49QEX9RINciIeD8= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230223163248-89232647de67/go.mod h1:CO72fYg4kCwaSLKgV6oMT9N1k5jhe8ZfxN1Rv7i9aL0= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230223163248-89232647de67 h1:B9MD7YTmV1H6YCyH/xQMBOt92xUvEUr2AIqSPNBKOW0= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230223163248-89232647de67/go.mod h1:salqUyIbJbHU1a9StwrX18tkxIoZejk8BQB9aYNkIPk= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230223163248-89232647de67 h1:XBWzd4WZ5WWElSF5NQIAc0amOIOPdF/1OLERO1fKwjg= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230223163248-89232647de67/go.mod h1:g5iGehpfJ/sjrrPZotg2ndVBM1qrl/xlKDEC6CJwoRo= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230223163248-89232647de67 h1:oI+hUXmAZs5/DhIfBpD2IRZfR47eiKkjYaibFMja+44= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230223163248-89232647de67/go.mod h1:y/nn+aWz2wp+2mklRHKwQb5C36SqiS4mCgw2/C1HRpM= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230223163248-89232647de67 h1:eni4EViEO+I0Kfxyq0NW0C5AxQjGFKfakFsN1TJU1n4= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230223163248-89232647de67/go.mod h1:pfu0i4DFeQXwdlNs9TQpFEUK+8y4I3HSCzqbmQDobJ8= -github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230223163248-89232647de67/go.mod h1:ZjLs0DK9L3Xxjv99ioET5vBULmFymo1Dc1ZzF6G6L6c= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230223163248-89232647de67 h1:3o/vN/o1/BX0pSXnzxSBFAfs8xO+7YZkfA5x28p1TDI= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230223163248-89232647de67/go.mod h1:+K4RuDOLxtVWiPZfUefwPoYThb9BEmWYp5zId0KFgU0= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230223163248-89232647de67 h1:4RoVjs10TFjwM1hKjMt1mRN/oVInSh6SfAqPLLUG1wM= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230223163248-89232647de67/go.mod h1:IrwH1whPmwqMMBuqU2Gkb2cdmdqTg5zpbYsPC9KF8hY= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230223163248-89232647de67 h1:wvNSqeJvcGelybVgZS5fuUjGEOGlnxTACbjIkgat4c8= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230223163248-89232647de67/go.mod h1:AuOKusKtXgnoNwjX3FYoY9nSggJKZBk9TYeUoM5dnws= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230223163248-89232647de67 h1:y6O2w4f6gPaK0zJ+lWD2QEh5I0nz5K/YvRExy+iyNf4= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230223163248-89232647de67/go.mod h1:TVwnVXG26sqo03sNVSJzkjIXBXB1r5KcoNJPliZ7SjM= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230223163248-89232647de67 h1:/CYcEisaj3xhjhTA/rAZK634iqlFa0qOb0T6HCnkwAw= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230223163248-89232647de67/go.mod h1:tK3gKkqt21TbFbG/1xF5M8Q1zWAmuhS6wO3SGZd0nmw= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230223163248-89232647de67 h1:0y3RpX8Y2J1QnzOFhC+hAxYVpYTY2vTRM7iz2XjfsW8= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230223163248-89232647de67/go.mod h1:mgVmrJ+p9PHz4zZwo7XouLoex4tpJz3Rb8uPcw6+IJE= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230223163248-89232647de67 h1:ClQHFBI/h6g75rl75DYTd87lm3cqkWCcLz7ge5lpTRQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230223163248-89232647de67/go.mod h1:NXsaH8tQ1U2J3w6IW8hNaC4ZQFJvkC2lVoXOXZQ8ii0= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230223163248-89232647de67 h1:UxMSfSa6zN8KM519Bo5sI3fK0/FbmZ3B60L4wh6Y7OE= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230223163248-89232647de67/go.mod h1:YEIiQsb6SFoP9Y4gunC2nL+EL/SDEjfg++eDyZDBV18= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230223163248-89232647de67 h1:iA0Z2NZNC9o6DKfdhUOBw7YMKZKaR+33IEn2YpuJyRc= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230223163248-89232647de67/go.mod h1:wfRwoBCCxtoS6dmP/ijU2pC1u1COgMcL2qppCHqCeWg= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230223163248-89232647de67 h1:b0pp/eYVg/KNWg4HUmskyXGqxwnzRjvpbjY8XB6dqf4= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230223163248-89232647de67/go.mod h1:0hEeqiK9VnRfKjEzziZZ/UdzDn2zolWihYE/iWC4wUM= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230223163248-89232647de67 h1:bsS++odMO5hvu7njKc3sTt+QqR9mYszQSzvN+uaLLgQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230223163248-89232647de67/go.mod h1:6p383itqHHhUKvZADAr+LDVXOJ4ZWo0tBKVxTjqc9UY= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230223163248-89232647de67 h1:9bgKIabZ59hgFivSWZb+0kPm/MbFcGD3f9JhF7HIbyw= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230223163248-89232647de67/go.mod h1:7VSG6sD9u3yCsNAz3+TYBN6oNXmBmfX32o9piXgdUHQ= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230223163248-89232647de67 h1:J/9hK40KkOnSw2MzzW+IHAIuI8frMTnDqn90v2Y4E+c= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230223163248-89232647de67/go.mod h1:VD+1/CcB3GhJH1hrDcxv/Idr3wYEN5YURxV/QRrRLJk= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230223163248-89232647de67 h1:s5UgYGleFuVQpDhYxauo2F9glav4K6hdtxGlxSN1zoE= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230223163248-89232647de67/go.mod h1:Yjxnfo5lUPUSBUqfhgoAS19ZFY/JhMC16dgEw0ilIoU= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230223163248-89232647de67 h1:vmW1Jb6zsFOuYbCfDsMN5dDS2b6AI+4tjv5wCIaAXvY= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230223163248-89232647de67/go.mod h1:n49VMDfRrPr3RdbpZRjo4yIF65v6ryFoeflGeAFItyc= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230223163248-89232647de67 h1:Bc5AtKJhmjgGUF4Q5NX3LEP2HmU6EnnzvB0o5jnhEA4= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230223163248-89232647de67/go.mod h1:y8fO9+mZJPj9OK26w+MwxW4kUf+bJh1CHsPYvRjwYoA= -github.com/openshift/library-go v0.0.0-20230127195720-edf819b079cf/go.mod h1:xO4nAf0qa56dgvEJWVD1WuwSJ8JWPU1TYLBQrlutWnE= -github.com/openshift/library-go v0.0.0-20230130232623-47904dd9ff5a h1:OzF7I7mAzO4SBo5eO5CWoCTgMDydN/Tf2/Rq8YbMpT0= -github.com/openshift/library-go v0.0.0-20230130232623-47904dd9ff5a/go.mod h1:xO4nAf0qa56dgvEJWVD1WuwSJ8JWPU1TYLBQrlutWnE= +github.com/openshift/kubernetes v0.0.0-20230302092939-8cfbab7d1c15 h1:wuZkXInrH2bSg8s7zELDDjY9bmIwr9f9HcIciYnY4yM= +github.com/openshift/kubernetes v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:NfvcnEopwvLuieyrYOux/wNqBQjXZWOOHkUOLnryv7c= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230302092939-8cfbab7d1c15 h1:c+nqPPaSvk7lFRhRmQDL/vxmpW8H2m2hL74rvCxPfl4= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:SVFZVmcfr/QnDkKqmBvlVlhurEsml57BUNDH+R/CPqk= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230302092939-8cfbab7d1c15 h1:7OdPhhLkge0HJALHZ2zGkJejchdpssZAvgbpkJspQuI= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:2plf4Jk3CrAregAcsleE5e33pF+6d5jtts0y3Af3VCQ= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230302092939-8cfbab7d1c15 h1:oqlXbqdWoxKXLTnL9hRoB23tIeYkYsxO6GdtQ9rRxtI= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:fcaZu5DOMCvnjHsoJrKV5iQLvaiOTv50bj8okFxwYFw= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230302092939-8cfbab7d1c15 h1:enS7BI2SK2UjkCZtiNu6MJjRKj0UEF/kO1DGzDHipYg= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:jNyfmvBDTiARZON7apOkSQtGCcRZ2a70hPSWo0L3i14= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230302092939-8cfbab7d1c15 h1:ICM1GnWPeSOwVSZhobsLMRfb2XpgrLsvSV9nCUz7V9I= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:salqUyIbJbHU1a9StwrX18tkxIoZejk8BQB9aYNkIPk= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230302092939-8cfbab7d1c15 h1:IEAsee2mr/VYyKf9zUbVwZIbUgdeyrxkC7P7ZP3wOCQ= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:g5iGehpfJ/sjrrPZotg2ndVBM1qrl/xlKDEC6CJwoRo= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230302092939-8cfbab7d1c15 h1:28RQpjUNjCVgBlzfojhAMWB53qqXW89tidJH2Eb8lAg= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:vzGceoKOqVe+9Sw2BUMQeKTzAZuGgecSjORUh6NTopk= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230302092939-8cfbab7d1c15 h1:fk4WBSDxH/rHU6CfJKWo7sNlS/bSOR3zi1NNt9Uw+Gw= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:pfu0i4DFeQXwdlNs9TQpFEUK+8y4I3HSCzqbmQDobJ8= +github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:ZjLs0DK9L3Xxjv99ioET5vBULmFymo1Dc1ZzF6G6L6c= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230302092939-8cfbab7d1c15 h1:RwNgiq32cdr7W5VuQeEZjh0zz51R7OahEduTziz0pVQ= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:+K4RuDOLxtVWiPZfUefwPoYThb9BEmWYp5zId0KFgU0= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230302092939-8cfbab7d1c15 h1:U82y8W/CmR1x49E6vN/MBxSit++UFltlvlO421RQP6k= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:IrwH1whPmwqMMBuqU2Gkb2cdmdqTg5zpbYsPC9KF8hY= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230302092939-8cfbab7d1c15 h1:wEM0AmZfA61frpKiMRZ9cdexzEQqQTgU/MxD/QZNWwc= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:AuOKusKtXgnoNwjX3FYoY9nSggJKZBk9TYeUoM5dnws= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230302092939-8cfbab7d1c15 h1:LNEIRsCROW+zW9UacEyo20Uf6f86Bl88GA2wJiZTSTg= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:TVwnVXG26sqo03sNVSJzkjIXBXB1r5KcoNJPliZ7SjM= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230302092939-8cfbab7d1c15 h1:bc3fvZ22P7UvaoNTjBLu/dXHcVPxfvWv2B8BdHzKkLc= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:tK3gKkqt21TbFbG/1xF5M8Q1zWAmuhS6wO3SGZd0nmw= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230302092939-8cfbab7d1c15 h1:LiQSD9dJGuQMwyFYzu+pATilFb9Z0a00MVcnlhrGZQU= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:mgVmrJ+p9PHz4zZwo7XouLoex4tpJz3Rb8uPcw6+IJE= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230302092939-8cfbab7d1c15 h1:RG8CBYD0o+3oSn9L/FupTjUEPEad0M7TpcnrPuFibvk= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:NXsaH8tQ1U2J3w6IW8hNaC4ZQFJvkC2lVoXOXZQ8ii0= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230302092939-8cfbab7d1c15 h1:WpkIGAVeZBMWouVqXSXOQ7gNPUKVMA7si7p1NbZVO7I= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:fvni2lobYzYfY3SZfM9wXkLXzDVQDXijgNeUX9TmA6Y= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230302092939-8cfbab7d1c15 h1:gpuvwt5bRljqNdKIrj0XZxP1/yEOVbKwA8qMYmorF+k= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:wfRwoBCCxtoS6dmP/ijU2pC1u1COgMcL2qppCHqCeWg= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230302092939-8cfbab7d1c15 h1:FJ7TcFp53EY0RvMcbnMeVOHyUuUBInJ5SCaDcLrU6ss= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:0hEeqiK9VnRfKjEzziZZ/UdzDn2zolWihYE/iWC4wUM= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230302092939-8cfbab7d1c15 h1:jkcjsPMzmpproMqlPknMr1HtTgYqA3tEL0mp1INAL/U= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:6p383itqHHhUKvZADAr+LDVXOJ4ZWo0tBKVxTjqc9UY= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230302092939-8cfbab7d1c15 h1:duNE3VCIaEaRRYK/xC1jL07e2i44WVwe7EFm9LTDsl4= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:7VSG6sD9u3yCsNAz3+TYBN6oNXmBmfX32o9piXgdUHQ= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230302092939-8cfbab7d1c15 h1:K30rs6Ae5ppbqj9j50u1Dz4d0bdZHTvPnt69XBjVbaA= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:VD+1/CcB3GhJH1hrDcxv/Idr3wYEN5YURxV/QRrRLJk= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230302092939-8cfbab7d1c15 h1:ArqpJWKqM/yKFXAMZBoR205yAKJbucLZy/e8i+PjWGI= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:Yjxnfo5lUPUSBUqfhgoAS19ZFY/JhMC16dgEw0ilIoU= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230302092939-8cfbab7d1c15 h1:RIlwMvDU1H54g1xkWBNwIiWJQL/OSrQF8kuwsYXjW8Y= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:n49VMDfRrPr3RdbpZRjo4yIF65v6ryFoeflGeAFItyc= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230302092939-8cfbab7d1c15 h1:I6V/P6nSZjSEEOBVkU+cNE2/xErhpo8q8Wnw81vVXz4= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230302092939-8cfbab7d1c15/go.mod h1:gULMy2U4u1oEo5m7oPDz2aoZchXwwpK68uppEOnBBJk= +github.com/openshift/library-go v0.0.0-20230222090221-582055a1d5c4 h1:B9e1Sga7Q6iSI1YgzLgfABo+LDET7HZngJ+tKlrwVSk= +github.com/openshift/library-go v0.0.0-20230222090221-582055a1d5c4/go.mod h1:xO4nAf0qa56dgvEJWVD1WuwSJ8JWPU1TYLBQrlutWnE= github.com/openshift/onsi-ginkgo/v2 v2.4.1-0.20221214150008-e73634cb3870 h1:YH3Z3ZWCDWjkAGdZpK5rCm5pRZ4wt0uEx1GwvCiO3+I= github.com/openshift/onsi-ginkgo/v2 v2.4.1-0.20221214150008-e73634cb3870/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkAt4OrFo= github.com/openshift/route-controller-manager v0.0.0-20230205134410-d7a8e22db412 h1:VGes5BKdgFXUtaUUcGl8RIC8BLD1e/15bT6Yb3M77Vk= diff --git a/rebase_sh.log b/rebase_sh.log new file mode 100644 index 0000000000..fb1a20835e --- /dev/null +++ b/rebase_sh.log @@ -0,0 +1,612 @@ +# Rebasing to registry.ci.openshift.org/ocp/release:4.13.0-0.nightly-2023-03-05-104719 and registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-03-05-104718 +# Fetching release info for registry.ci.openshift.org/ocp/release:4.13.0-0.nightly-2023-03-05-104719 (amd64) +# Fetching release info for registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-03-05-104718 (arm64) +# Extracting registry.ci.openshift.org/ocp/release:4.13.0-0.nightly-2023-03-05-104719 manifest content +# Cloning registry.ci.openshift.org/ocp/release:4.13.0-0.nightly-2023-03-05-104719 component repos +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-dns-operator/.git/ +HEAD is now at d96022a Merge pull request #355 from Miciah/OCPBUGS-4359-update-node-resolver-dot-sh-check-for-errors-from-append + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-ingress-operator/.git/ +HEAD is now at 6aa482c Merge pull request #860 from Miciah/OCPBUGS-4054-configurable-route-don't-use-NewKindWithCache + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-apiserver-operator/.git/ +HEAD is now at 6ad0a94 Merge pull request #1434 from dobsonj/STOR-1051 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-controller-manager-operator/.git/ +HEAD is now at 4ca346e Merge pull request #701 from ingvagabund/enable-DynamicResourceAllocation-feature-gate-for-tech-preview + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-scheduler-operator/.git/ +HEAD is now at d397886 Merge pull request #463 from ingvagabund/enable-DynamicResourceAllocation-feature-gate-for-tech-preview + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-network-operator/.git/ +HEAD is now at c020811 Merge pull request #1716 from martinkennelly/rework-alerts-post-ic + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-openshift-controller-manager-operator/.git/ +HEAD is now at 7867c26 Merge pull request #273 from tkashem/apf-use-v1beta3 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-policy-controller/.git/ +HEAD is now at ac01e34 Merge pull request #103 from perdasilva/update_psa_dep + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/etcd/.git/ +HEAD is now at 13c18c44 Merge pull request #181 from openshift-bot/art-consistency-openshift-4.13-ose-etcd + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/kubernetes/.git/ +HEAD is now at 8cfbab7d1 Merge pull request #1489 from stlaz/psametrics-non-platform + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/machine-config-operator/.git/ +HEAD is now at a8692a76 Merge pull request #3565 from cybertron/baremetal-v6-primary + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/openshift-controller-manager/.git/ +HEAD is now at 87de838 Merge pull request #248 from richardfontana/add-license + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/route-controller-manager/.git/ +HEAD is now at d7a8e22 Merge pull request #16 from ingvagabund/gomoddep + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/service-ca-operator/.git/ +HEAD is now at 1b89fdc Merge pull request #202 from benluddy/no-stop-error + +# Cloning registry.ci.openshift.org/ocp/release:4.13.0-0.nightly-2023-03-05-104719 image repos +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/oc/.git/ +HEAD is now at 0236210 Merge pull request #1357 from soltysh/microshift_docs + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/coredns/.git/ +HEAD is now at 5560e4a Merge pull request #88 from gcs278/merge-1.10.1 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/router/.git/ +HEAD is now at 69eda4b Merge pull request #451 from gcs278/k8s-1.26-bump + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/kube-rbac-proxy/.git/ +HEAD is now at 0aa2830 Merge pull request #63 from openshift-auth/master + +openssl not from release payload, skipping + +ovn-kubernetes-microshift not from release payload, skipping + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/kubernetes/.git/ +HEAD is now at 8cfbab7d1 Merge pull request #1489 from stlaz/psametrics-non-platform + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/service-ca-operator/.git/ +HEAD is now at 1b89fdc Merge pull request #202 from benluddy/no-stop-error + +topolvm_csi not from release payload, skipping + +topolvm_csi_livenessprobe not from release payload, skipping + +topolvm_csi_provisioner not from release payload, skipping + +topolvm_csi_registrar not from release payload, skipping + +topolvm_csi_resizer not from release payload, skipping + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/oc/.git/ +HEAD is now at 0236210 Merge pull request #1357 from soltysh/microshift_docs + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/coredns/.git/ +HEAD is now at 5560e4a Merge pull request #88 from gcs278/merge-1.10.1 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/router/.git/ +HEAD is now at 69eda4b Merge pull request #451 from gcs278/k8s-1.26-bump + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/kube-rbac-proxy/.git/ +HEAD is now at 0aa2830 Merge pull request #63 from openshift-auth/master + +openssl not from release payload, skipping + +ovn-kubernetes-microshift not from release payload, skipping + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/kubernetes/.git/ +HEAD is now at 8cfbab7d1 Merge pull request #1489 from stlaz/psametrics-non-platform + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/service-ca-operator/.git/ +HEAD is now at 1b89fdc Merge pull request #202 from benluddy/no-stop-error + +topolvm_csi not from release payload, skipping + +topolvm_csi_livenessprobe not from release payload, skipping + +topolvm_csi_provisioner not from release payload, skipping + +topolvm_csi_registrar not from release payload, skipping + +topolvm_csi_resizer not from release payload, skipping + +downloading LVMS operator bundles +/go/src/github.com/openshift/microshift/_output/staging/lvms/amd64 /go/src/github.com/openshift/microshift +extracting lvms operator bundle for "amd64" architecture +/go/src/github.com/openshift/microshift +/go/src/github.com/openshift/microshift/_output/staging/lvms/arm64 /go/src/github.com/openshift/microshift +extracting lvms operator bundle for "arm64" architecture +/go/src/github.com/openshift/microshift +error: branch 'rebase-4.13.0-0.nightly-2023-03-05-104719_amd64-2023-03-05_arm64-2023-03-05' not found. +Switched to a new branch 'rebase-4.13.0-0.nightly-2023-03-05-104719_amd64-2023-03-05_arm64-2023-03-05' +## Updating last_rebase.sh +## Committing changes to last_rebase.sh +[rebase-4.13.0-0.nightly-2023-03-05-104719_amd64-2023-03-05_arm64-2023-03-05 c302125f] update last_rebase.sh + 1 file changed, 1 insertion(+), 1 deletion(-) +cluster-kube-apiserver-operator embedded-component no change + +cluster-kube-controller-manager-operator embedded-component no change + +cluster-kube-scheduler-operator embedded-component no change + +cluster-openshift-controller-manager-operator embedded-component no change + +cluster-policy-controller embedded-component no change + +etcd embedded-component no change + +route-controller-manager embedded-component no change + +service-ca-operator embedded-component no change + +coredns image-amd64 no change + +router image-amd64 no change + +kube-rbac-proxy image-amd64 no change + +service-ca-operator image-amd64 no change + +coredns image-arm64 no change + +router image-arm64 no change + +kube-rbac-proxy image-arm64 no change + +service-ca-operator image-arm64 no change + +## Committing changes to changelog +[rebase-4.13.0-0.nightly-2023-03-05-104719_amd64-2023-03-05_arm64-2023-03-05 2d4b7c88] update changelog + 2 files changed, 159 insertions(+), 127 deletions(-) + rewrite scripts/auto-rebase/changelog.txt (99%) +# Updating microshift/go.mod +go mod edit -require github.com/openshift/cluster-policy-controller@ac01e3463245f2dd9312145368d7f4099a8a0bb9 +go: downloading github.com/ghodss/yaml v1.0.0 +go: downloading k8s.io/klog/v2 v2.80.1 +go: downloading sigs.k8s.io/yaml v1.3.0 +go: downloading github.com/openshift/api v0.0.0-20230208193339-068b2ae5534f +go: downloading github.com/openshift/cluster-policy-controller v0.0.0-20230217170320-ac01e3463245 +go: downloading github.com/openshift/library-go v0.0.0-20230130232623-47904dd9ff5a +go: downloading github.com/openshift/route-controller-manager v0.0.0-20230205134410-d7a8e22db412 +go: downloading go.etcd.io/etcd/client/pkg/v3 v3.5.5 +go: downloading go.etcd.io/etcd/client/v3 v3.5.5 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230223163248-89232647de67 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230223163248-89232647de67 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230223163248-89232647de67 +go: downloading github.com/openshift/kubernetes v0.0.0-20230223163248-89232647de67 +go: downloading github.com/google/go-cmp v0.5.9 +go: downloading github.com/spf13/cobra v1.6.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230223163248-89232647de67 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230223163248-89232647de67 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230223163248-89232647de67 +go: downloading github.com/pkg/errors v0.9.1 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230223163248-89232647de67 +go: downloading github.com/miekg/dns v1.1.35 +go: downloading github.com/vishvananda/netlink v1.1.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230223163248-89232647de67 +go: downloading golang.org/x/sys v0.4.0 +go: downloading github.com/stretchr/testify v1.8.0 +go: downloading github.com/openshift/client-go v0.0.0-20230120202327-72f107311084 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230223163248-89232647de67 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230223163248-89232647de67 +go: downloading github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d +go: downloading k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 +go: downloading github.com/apparentlymart/go-cidr v1.1.0 +go: downloading github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e +go: downloading github.com/mitchellh/go-homedir v1.1.0 +go: downloading github.com/spf13/pflag v1.0.5 +go: downloading gopkg.in/yaml.v2 v2.4.0 +go: downloading github.com/davecgh/go-spew v1.1.1 +go: downloading github.com/go-logr/logr v1.2.3 +go: downloading k8s.io/utils v0.0.0-20221107191617-1a15be271d1d +go: downloading go.uber.org/zap v1.19.0 +go: downloading go.etcd.io/etcd/api/v3 v3.5.5 +go: downloading google.golang.org/grpc v1.49.0 +go: downloading github.com/gogo/protobuf v1.3.2 +go: downloading github.com/google/gofuzz v1.2.0 +go: downloading sigs.k8s.io/structured-merge-diff/v4 v4.2.3 +go: downloading github.com/inconshreveable/mousetrap v1.0.1 +go: downloading github.com/google/uuid v1.1.2 +go: downloading github.com/evanphx/json-patch v4.12.0+incompatible +go: downloading golang.org/x/net v0.5.0 +go: downloading github.com/imdario/mergo v0.3.11 +go: downloading golang.org/x/term v0.4.0 +go: downloading github.com/jonboulle/clockwork v0.2.2 +go: downloading github.com/google/gnostic v0.5.7-v3refs +go: downloading golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 +go: downloading github.com/MakeNowJust/heredoc v1.0.0 +go: downloading github.com/mitchellh/go-wordwrap v1.0.0 +go: downloading github.com/russross/blackfriday/v2 v2.1.0 +go: downloading golang.org/x/crypto v0.1.0 +go: downloading golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 +go: downloading github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae +go: downloading go.opentelemetry.io/otel/trace v1.10.0 +go: downloading go.opentelemetry.io/otel v1.10.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230223163248-89232647de67 +go: downloading github.com/fsnotify/fsnotify v1.6.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230223163248-89232647de67 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230223163248-89232647de67 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230223163248-89232647de67 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230223163248-89232647de67 +go: downloading github.com/coreos/go-systemd/v22 v22.3.2 +go: downloading github.com/google/cadvisor v0.46.0 +go: downloading github.com/opencontainers/runc v1.1.4 +go: downloading go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 +go: downloading go.opentelemetry.io/otel/sdk v1.10.0 +go: downloading go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230223163248-89232647de67 +go: downloading sigs.k8s.io/kube-storage-version-migrator v0.0.4 +go: downloading github.com/pmezard/go-difflib v1.0.0 +go: downloading gopkg.in/yaml.v3 v3.0.1 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230223163248-89232647de67 +go: downloading gopkg.in/inf.v0 v0.9.1 +go: downloading github.com/prometheus/client_golang v1.14.0 +go: downloading github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da +go: downloading github.com/pkg/profile v1.3.0 +go: downloading github.com/sirupsen/logrus v1.8.1 +go: downloading github.com/emicklei/go-restful/v3 v3.9.0 +go: downloading go.uber.org/atomic v1.7.0 +go: downloading github.com/blang/semver/v4 v4.0.0 +go: downloading github.com/prometheus/client_model v0.3.0 +go: downloading github.com/blang/semver v3.5.1+incompatible +go: downloading github.com/prometheus/procfs v0.8.0 +go: downloading github.com/prometheus/common v0.37.0 +go: downloading github.com/golang/protobuf v1.5.2 +go: downloading github.com/coreos/go-semver v0.3.0 +go: downloading google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 +go: downloading go.uber.org/multierr v1.6.0 +go: downloading sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 +go: downloading github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de +go: downloading golang.org/x/text v0.6.0 +go: downloading gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f +go: downloading go.uber.org/goleak v1.1.12 +go: downloading github.com/benbjohnson/clock v1.1.0 +go: downloading sigs.k8s.io/kustomize/api v0.12.1 +go: downloading sigs.k8s.io/kustomize/kyaml v0.13.9 +go: downloading google.golang.org/protobuf v1.28.1 +go: downloading github.com/peterbourgon/diskv v2.0.1+incompatible +go: downloading github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 +go: downloading golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 +go: downloading github.com/openshift/onsi-ginkgo/v2 v2.4.1-0.20221214150008-e73634cb3870 +go: downloading github.com/onsi/gomega v1.23.0 +go: downloading github.com/chai2010/gettext-go v1.0.2 +go: downloading github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d +go: downloading github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae +go: downloading github.com/json-iterator/go v1.1.12 +go: downloading github.com/onsi/ginkgo v1.11.0 +go: downloading go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0 +go: downloading sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 +go: downloading gopkg.in/natefinch/lumberjack.v2 v2.0.0 +go: downloading github.com/openshift/apiserver-library-go v0.0.0-20230120221150-cefee9e0162b +go: downloading gopkg.in/square/go-jose.v2 v2.2.2 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230223163248-89232647de67 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230223163248-89232647de67 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230223163248-89232647de67 +go: downloading github.com/robfig/cron/v3 v3.0.1 +go: downloading github.com/robfig/cron v1.2.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230223163248-89232647de67 +go: downloading github.com/Azure/azure-sdk-for-go v55.0.0+incompatible +go: downloading github.com/Azure/go-autorest/autorest/to v0.4.0 +go: downloading github.com/Azure/go-autorest/autorest v0.11.27 +go: downloading github.com/container-storage-interface/spec v1.7.0 +go: downloading github.com/Azure/go-autorest v14.2.0+incompatible +go: downloading github.com/libopenstorage/openstorage v1.0.0 +go: downloading github.com/opencontainers/selinux v1.10.0 +go: downloading github.com/aws/aws-sdk-go v1.44.116 +go: downloading github.com/Azure/go-autorest/autorest/adal v0.9.20 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230223163248-89232647de67 +go: downloading github.com/golang/mock v1.6.0 +go: downloading github.com/docker/go-units v0.5.0 +go: downloading go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.35.0 +go: downloading github.com/Microsoft/go-winio v0.4.17 +go: downloading go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 +go: downloading go.opentelemetry.io/proto/otlp v0.19.0 +go: downloading github.com/moby/sys/mountinfo v0.6.2 +go: downloading github.com/cyphar/filepath-securejoin v0.2.3 +go: downloading github.com/karrick/godirwalk v1.17.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230223163248-89232647de67 +go: downloading github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 +go: downloading github.com/containerd/typeurl v1.0.2 +go: downloading github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989 +go: downloading github.com/google/cel-go v0.12.6 +go: downloading github.com/NYTimes/gziphandler v1.1.1 +go: downloading github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 +go: downloading github.com/go-openapi/jsonreference v0.20.0 +go: downloading github.com/go-openapi/swag v0.19.14 +go: downloading k8s.io/gengo v0.0.0-20220902162205-c0856e24416d +go: downloading github.com/beorn7/perks v1.0.1 +go: downloading github.com/cespare/xxhash/v2 v2.1.2 +go: downloading github.com/matttproud/golang_protobuf_extensions v1.0.2 +go: downloading github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e +go: downloading github.com/google/btree v1.0.1 +go: downloading github.com/fvbommel/sortorder v1.0.1 +go: downloading github.com/creack/pty v1.1.11 +go: downloading gotest.tools/v3 v3.0.3 +go: downloading github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd +go: downloading github.com/modern-go/reflect2 v1.0.2 +go: downloading github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a +go: downloading github.com/mitchellh/mapstructure v1.4.1 +go: downloading github.com/BurntSushi/toml v0.3.1 +go: downloading github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 +go: downloading go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 +go: downloading github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f +go: downloading go.etcd.io/etcd/server/v3 v3.5.5 +go: downloading github.com/felixge/httpsnoop v1.0.3 +go: downloading go.opentelemetry.io/otel/metric v0.31.0 +go: downloading github.com/hashicorp/golang-lru v0.5.1 +go: downloading github.com/docker/distribution v2.8.1+incompatible +go: downloading github.com/coreos/go-oidc v2.1.0+incompatible +go: downloading gopkg.in/gcfg.v1 v1.2.0 +go: downloading github.com/vmware/govmomi v0.20.3 +go: downloading cloud.google.com/go v0.97.0 +go: downloading github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021 +go: downloading github.com/GoogleCloudPlatform/k8s-cloud-provider v1.18.1-0.20220218231025-f11817397a1b +go: downloading google.golang.org/api v0.60.0 +go: downloading github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb +go: downloading github.com/Azure/go-autorest/autorest/date v0.3.0 +go: downloading github.com/Azure/go-autorest/logger v0.2.1 +go: downloading github.com/Azure/go-autorest/tracing v0.6.0 +go: downloading github.com/golang-jwt/jwt/v4 v4.2.0 +go: downloading github.com/Azure/go-autorest/autorest/mocks v0.4.2 +go: downloading github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e +go: downloading github.com/Microsoft/hcsshim v0.8.22 +go: downloading github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab +go: downloading github.com/lithammer/dedent v1.1.0 +go: downloading github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible +go: downloading github.com/godbus/dbus/v5 v5.0.6 +go: downloading go.opentelemetry.io/contrib/propagators/b3 v1.10.0 +go: downloading go.opentelemetry.io/contrib v0.20.0 +go: downloading github.com/moby/spdystream v0.2.0 +go: downloading github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 +go: downloading github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 +go: downloading github.com/go-logr/stdr v1.2.2 +go: downloading github.com/cenkalti/backoff/v4 v4.1.3 +go: downloading github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 +go: downloading github.com/containerd/ttrpc v1.1.0 +go: downloading github.com/opencontainers/go-digest v1.0.0 +go: downloading github.com/euank/go-kmsg-parser v2.0.0+incompatible +go: downloading github.com/stoewer/go-strcase v1.2.0 +go: downloading github.com/go-openapi/jsonpointer v0.19.5 +go: downloading github.com/mailru/easyjson v0.7.6 +go: downloading golang.org/x/tools v0.2.0 +go: downloading github.com/kr/text v0.2.0 +go: downloading google.golang.org/appengine v1.6.7 +go: downloading github.com/go-errors/errors v1.0.1 +go: downloading github.com/fatih/camelcase v1.0.0 +go: downloading github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230223163248-89232647de67 +go: downloading github.com/grpc-ecosystem/grpc-gateway v1.16.0 +go: downloading github.com/soheilhy/cmux v0.1.5 +go: downloading github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 +go: downloading go.etcd.io/bbolt v1.3.6 +go: downloading go.etcd.io/etcd/pkg/v3 v3.5.5 +go: downloading github.com/pquerna/cachecontrol v0.1.0 +go: downloading github.com/stretchr/objx v0.4.0 +go: downloading gopkg.in/warnings.v0 v0.1.1 +go: downloading github.com/checkpoint-restore/go-criu/v5 v5.3.0 +go: downloading github.com/containerd/console v1.0.3 +go: downloading github.com/mrunalp/fileutils v0.5.0 +go: downloading github.com/docker/docker v20.10.18+incompatible +go: downloading github.com/docker/go-connections v0.4.0 +go: downloading github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 +go: downloading github.com/josharian/intern v1.0.0 +go: downloading github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 +go: downloading github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 +go: downloading github.com/xlab/treeprint v1.1.0 +go: downloading github.com/gorilla/websocket v1.4.2 +go: downloading go.etcd.io/etcd/raft/v3 v3.5.5 +go: downloading github.com/dustin/go-humanize v1.0.0 +go: downloading github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 +go: downloading github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 +go: downloading github.com/go-ldap/ldap/v3 v3.4.3 +go: downloading github.com/jmespath/go-jmespath v0.4.0 +go: downloading go.opencensus.io v0.23.0 +go: downloading github.com/googleapis/gax-go/v2 v2.1.1 +go: downloading github.com/cilium/ebpf v0.7.0 +go: downloading github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 +go: downloading github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 +go: downloading github.com/opencontainers/image-spec v1.0.2 +go: downloading github.com/golang/glog v1.0.0 +go: downloading github.com/form3tech-oss/jwt-go v3.2.3+incompatible +go: downloading go.etcd.io/etcd/client/v2 v2.305.5 +go: downloading github.com/Azure/go-ntlmssp v0.0.0-20211209120228-48547f28849e +go: downloading github.com/go-asn1-ber/asn1-ber v1.5.4 +go: downloading github.com/Azure/go-autorest/autorest/validation v0.1.0 +go: downloading golang.org/x/mod v0.6.0 +go: downloading github.com/gofrs/uuid v4.0.0+incompatible +go: downloading github.com/dnaeon/go-vcr v1.2.0 +go: downloading github.com/containerd/cgroups v1.0.1 +go: downloading go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 +go: downloading github.com/sergi/go-diff v1.1.0 +go: downloading github.com/jmespath/go-jmespath/internal/testify v1.5.1 +go: downloading github.com/frankban/quicktest v1.11.3 +go: downloading github.com/kr/pretty v0.2.1 +go mod edit -require github.com/openshift/route-controller-manager@d7a8e22db412b6fabb7028ca0da8de8f3d9ac3c3 +go mod edit -replace k8s.io/api=github.com/openshift/kubernetes/staging/src/k8s.io/api@8cfbab7d1c15576e72726dea70563f0d65d220eb +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/apiextensions-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/apimachinery=github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiserver@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/cli-runtime=github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/client-go=github.com/openshift/kubernetes/staging/src/k8s.io/client-go@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/cloud-provider=github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/cluster-bootstrap=github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/code-generator=github.com/openshift/kubernetes/staging/src/k8s.io/code-generator@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/component-base=github.com/openshift/kubernetes/staging/src/k8s.io/component-base@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/component-helpers=github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/cri-api=github.com/openshift/kubernetes/staging/src/k8s.io/cri-api@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/csi-translation-lib=github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/dynamic-resource-allocation=github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kms=github.com/openshift/kubernetes/staging/src/k8s.io/kms@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kube-aggregator=github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kube-controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kube-proxy=github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kube-scheduler=github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kubectl=github.com/openshift/kubernetes/staging/src/k8s.io/kubectl@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kubelet=github.com/openshift/kubernetes/staging/src/k8s.io/kubelet@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/legacy-cloud-providers=github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/metrics=github.com/openshift/kubernetes/staging/src/k8s.io/metrics@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/mount-utils=github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/pod-security-admission=github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/sample-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/sample-cli-plugin=github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/sample-controller=github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace github.com/onsi/ginkgo/v2=github.com/openshift/onsi-ginkgo/v2@v2.4.1-0.20221214150008-e73634cb3870 +go mod edit -replace k8s.io/api=github.com/openshift/kubernetes/staging/src/k8s.io/api@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/apiextensions-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/apimachinery=github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiserver@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/cli-runtime=github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/client-go=github.com/openshift/kubernetes/staging/src/k8s.io/client-go@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/cloud-provider=github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/cluster-bootstrap=github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/code-generator=github.com/openshift/kubernetes/staging/src/k8s.io/code-generator@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/component-base=github.com/openshift/kubernetes/staging/src/k8s.io/component-base@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/component-helpers=github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/cri-api=github.com/openshift/kubernetes/staging/src/k8s.io/cri-api@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/csi-translation-lib=github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/dynamic-resource-allocation=github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kms=github.com/openshift/kubernetes/staging/src/k8s.io/kms@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kube-aggregator=github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kube-controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kube-proxy=github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kube-scheduler=github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kubectl=github.com/openshift/kubernetes/staging/src/k8s.io/kubectl@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kubelet=github.com/openshift/kubernetes/staging/src/k8s.io/kubelet@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kubernetes=github.com/openshift/kubernetes@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/legacy-cloud-providers=github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/metrics=github.com/openshift/kubernetes/staging/src/k8s.io/metrics@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/mount-utils=github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/pod-security-admission=github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/sample-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/sample-cli-plugin=github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/sample-controller=github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller@v0.0.0-20230302092939-8cfbab7d1c15 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230302092939-8cfbab7d1c15 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230302092939-8cfbab7d1c15 +go: downloading github.com/openshift/kubernetes v0.0.0-20230302092939-8cfbab7d1c15 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230302092939-8cfbab7d1c15 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230302092939-8cfbab7d1c15 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230302092939-8cfbab7d1c15 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230302092939-8cfbab7d1c15 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230302092939-8cfbab7d1c15 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230302092939-8cfbab7d1c15 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230302092939-8cfbab7d1c15 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230302092939-8cfbab7d1c15 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230302092939-8cfbab7d1c15 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230302092939-8cfbab7d1c15 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230302092939-8cfbab7d1c15 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230302092939-8cfbab7d1c15 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230302092939-8cfbab7d1c15 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230302092939-8cfbab7d1c15 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230302092939-8cfbab7d1c15 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230302092939-8cfbab7d1c15 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230302092939-8cfbab7d1c15 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230302092939-8cfbab7d1c15 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230302092939-8cfbab7d1c15 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230302092939-8cfbab7d1c15 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230302092939-8cfbab7d1c15 +go: downloading github.com/openshift/library-go v0.0.0-20230222090221-582055a1d5c4 +# Updating etcd/go.mod +go mod edit -require github.com/openshift/cluster-policy-controller@ac01e3463245f2dd9312145368d7f4099a8a0bb9 +go: downloading github.com/openshift/etcd/server/v3 v3.5.1-0.20230125165349-13c18c444a8c +go: downloading k8s.io/kubernetes v1.26.1 +go: downloading github.com/openshift/etcd/api/v3 v3.5.1-0.20230125165349-13c18c444a8c +go: downloading github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20230125165349-13c18c444a8c +go: downloading github.com/openshift/etcd/client/v3 v3.5.1-0.20230125165349-13c18c444a8c +go: downloading github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230125165349-13c18c444a8c +go: downloading github.com/openshift/etcd/raft/v3 v3.5.1-0.20230125165349-13c18c444a8c +go: downloading github.com/golang-jwt/jwt/v4 v4.4.2 +go: downloading go.etcd.io/etcd/client/v2 v2.305.6 +go: downloading github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5 +go: downloading github.com/cockroachdb/errors v1.2.4 +go: downloading github.com/getsentry/raven-go v0.2.0 +go: downloading github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f +go: downloading github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 +go mod edit -require github.com/openshift/route-controller-manager@d7a8e22db412b6fabb7028ca0da8de8f3d9ac3c3 +go mod edit -replace k8s.io/api=github.com/openshift/kubernetes/staging/src/k8s.io/api@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/apiextensions-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/apimachinery=github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiserver@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/cli-runtime=github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/client-go=github.com/openshift/kubernetes/staging/src/k8s.io/client-go@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/cloud-provider=github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/cluster-bootstrap=github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/code-generator=github.com/openshift/kubernetes/staging/src/k8s.io/code-generator@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/component-base=github.com/openshift/kubernetes/staging/src/k8s.io/component-base@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/component-helpers=github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/cri-api=github.com/openshift/kubernetes/staging/src/k8s.io/cri-api@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/csi-translation-lib=github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/dynamic-resource-allocation=github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kms=github.com/openshift/kubernetes/staging/src/k8s.io/kms@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kube-aggregator=github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kube-controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kube-proxy=github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kube-scheduler=github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kubectl=github.com/openshift/kubernetes/staging/src/k8s.io/kubectl@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kubelet=github.com/openshift/kubernetes/staging/src/k8s.io/kubelet@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/legacy-cloud-providers=github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/metrics=github.com/openshift/kubernetes/staging/src/k8s.io/metrics@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/mount-utils=github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/pod-security-admission=github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/sample-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/sample-cli-plugin=github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/sample-controller=github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller@v0.0.0-20230302092939-8cfbab7d1c15 +skipping modulepath github.com/openshift/microshift: no or unknown command [] +skipping modulepath github.com/openshift/microshift/pkg/config: no or unknown command [] +skipping modulepath github.com/openshift/microshift/pkg/util/cryptomaterial: no or unknown command [] +go mod edit -replace github.com/onsi/ginkgo/v2=github.com/openshift/onsi-ginkgo/v2@v2.4.1-0.20221214150008-e73634cb3870 +go mod edit -replace go.etcd.io/etcd/api/v3=github.com/openshift/etcd/api/v3@13c18c444a8c6a86ccbba16cce664008f5f948bd +go mod edit -replace go.etcd.io/etcd/client/pkg/v3=github.com/openshift/etcd/client/pkg/v3@v3.5.1-0.20230125165349-13c18c444a8c +go mod edit -replace go.etcd.io/etcd/client/v3=github.com/openshift/etcd/client/v3@v3.5.1-0.20230125165349-13c18c444a8c +go mod edit -replace go.etcd.io/etcd/pkg/v3=github.com/openshift/etcd/pkg/v3@v3.5.1-0.20230125165349-13c18c444a8c +go mod edit -replace go.etcd.io/etcd/raft/v3=github.com/openshift/etcd/raft/v3@v3.5.1-0.20230125165349-13c18c444a8c +go mod edit -replace go.etcd.io/etcd/server/v3=github.com/openshift/etcd/server/v3@v3.5.1-0.20230125165349-13c18c444a8c +go mod edit -replace k8s.io/api=github.com/openshift/kubernetes/staging/src/k8s.io/api@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/apiextensions-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/apimachinery=github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiserver@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/cli-runtime=github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/client-go=github.com/openshift/kubernetes/staging/src/k8s.io/client-go@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/cloud-provider=github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/cluster-bootstrap=github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/code-generator=github.com/openshift/kubernetes/staging/src/k8s.io/code-generator@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/component-base=github.com/openshift/kubernetes/staging/src/k8s.io/component-base@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/component-helpers=github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/cri-api=github.com/openshift/kubernetes/staging/src/k8s.io/cri-api@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/csi-translation-lib=github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/dynamic-resource-allocation=github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kms=github.com/openshift/kubernetes/staging/src/k8s.io/kms@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kube-aggregator=github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kube-controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kube-proxy=github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kube-scheduler=github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kubectl=github.com/openshift/kubernetes/staging/src/k8s.io/kubectl@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/kubelet=github.com/openshift/kubernetes/staging/src/k8s.io/kubelet@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/legacy-cloud-providers=github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/metrics=github.com/openshift/kubernetes/staging/src/k8s.io/metrics@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/mount-utils=github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/pod-security-admission=github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/sample-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/sample-cli-plugin=github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin@v0.0.0-20230302092939-8cfbab7d1c15 +go mod edit -replace k8s.io/sample-controller=github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller@v0.0.0-20230302092939-8cfbab7d1c15 +## Committing changes to microshift/go.mod +[rebase-4.13.0-0.nightly-2023-03-05-104719_amd64-2023-03-05_arm64-2023-03-05 e5ff450d] update microshift/go.mod + 2 files changed, 84 insertions(+), 85 deletions(-) +## Updating microshift/vendor directory +go mod vendor +for p in scripts/auto-rebase/rebase_patches/0001-Fix-CSI-initialization-conflict.patch scripts/auto-rebase/rebase_patches/0020-klog-component-names.patch scripts/auto-rebase/rebase_patches/0003-disable-clusterQuotaMapping-controller.patch scripts/auto-rebase/rebase_patches/0030-kube-controller-manager-command-context.patch scripts/auto-rebase/rebase_patches/0002-disable-APIrequestcount-controller.patch scripts/auto-rebase/rebase_patches/0005-remove-user-informer.patch scripts/auto-rebase/rebase_patches/0010-kube-apiserver-command-context.patch scripts/auto-rebase/rebase_patches/0004-remove-config-informer-and-cpu-partitioning-admission-plugin.patch; do \ + echo "Applying patch $p"; \ + git mailinfo /dev/null /dev/stderr 2<&1- < $p | git apply || exit 1; \ +done +Applying patch scripts/auto-rebase/rebase_patches/0001-Fix-CSI-initialization-conflict.patch +Applying patch scripts/auto-rebase/rebase_patches/0020-klog-component-names.patch +Applying patch scripts/auto-rebase/rebase_patches/0003-disable-clusterQuotaMapping-controller.patch +error: patch failed: vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go:6 +error: vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go: patch does not apply +make: *** [Makefile:234: vendor] Error 1 +Script exited with error. +Script exited with error. diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 2703ef6107..71b32cdcdb 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,115 +1,149 @@ -# cluster-dns-operator embedded-component e17caca25c52b60692925c007b7157ad7f688f81 to ccd55d043b09c64ed4d5d8ed102cc2a0cb09cb3b -0f7a4bfbc3dc1edaa7b32d5ccf2f6988960739c4 2023-02-22T13:56:17+01:00 OCPBUGS-6382: Address CVE-2022-41717 -# cluster-ingress-operator embedded-component ed7b2ccbe91cba42b9198f34c3cdca67c3f0fca5 to 8eb2c667fd31a67d52c4d0ea6c5f014a9fe2ce0d -82c67578f1d1ec69cfd8c88fba1ce2479ffe07ff 2023-02-23T15:33:16-05:00 dns: azure: add unit test for scope -a8ba16a06f9f03c95471fea1c818042a049f9a5a 2023-02-23T15:33:14-05:00 dns: azure: vendor in changes -10af42cec224e89190293a79602b1e182997d8ec 2023-02-23T15:29:42-05:00 dns: azure: use azidentity with an adapter -e8f3f45aec4ee7d1dc602bdd3ba8a3a841ddc336 2023-02-22T17:43:03-05:00 dns/aws: Store target hosted zone id in annotation -71c424dd9d50bb3d38daecb6b3c64f6f8c9271b8 2023-02-22T17:41:10-05:00 Add gateway-service-dns controller -043dc7542bedadf08377b42c1720e9b99cbd5177 2023-02-22T17:35:22-05:00 dns: Reconcile dnsrecords in the operand namespace -18337156bdd5a2c0ff9d4e7f219b8e4fd0105540 2023-02-22T17:35:17-05:00 dns: Don't require an owning ingresscontroller -851568ffbce7621d06653da917deff76ef3313ce 2023-02-22T17:35:11-05:00 dnsrecord: New package for managing DNSRecords -d1ebee332f1e3fe834eee70947caf10971210d5e 2023-02-22T17:35:05-05:00 Rename toYaml to ToYaml and move it to pkg/util -d5eaf71fe849c4f19ae3e0620ebcc9f3c802dc1b 2023-02-22T17:34:59-05:00 ensureWildcardDNSRecord: Delete receiver -3b8efcc3d8d3de9e72ed051cb438db2457e510e2 2023-02-22T17:34:53-05:00 ensureWildcardDNSRecord: Delete ic parameter -05c0bcb4409fcd5c4a7b349bc1961ce61dd346f6 2023-02-22T17:34:46-05:00 Add gatewayclass controller -d7ffd6e7a9cd89805e273b37fff6e6cca6298677 2023-02-21T20:15:58-05:00 Add gatewayapi controller -# cluster-kube-apiserver-operator embedded-component 4134462c6c60429941a309342d027463fe875b38 to 6ad0a9407be5d5229d605665986899be4b531b5e -7c69f56d5f44634d4ffa252ccfc480a185b88032 2023-01-24T15:00:48-07:00 STOR-1051: Allow CSI inline volumes in all SCCs -# cluster-network-operator embedded-component 3b5212db0bbc69f4dadb9fe353e3e5ac7eee3e33 to 4d5a093d41e45def540ffbe4c5dc214550864d53 -cb8d5e179a3c5c205ef57d056e88f1f589764f6b 2022-11-21T10:14:41-05:00 update apf configuration to use v1beta3 -# kubernetes embedded-component 518f3edfe79c93dcc01145153247ebffcd4fe6e6 to 89232647de67ea787d339b1bd7c780a0ed97f3f9 -04ff5090bae1cb181a2464696adde8709cdd0a93 2023-02-22T10:49:29-05:00 UPSTREAM: : node admission plugin for cpu partitioning -78f50d0821f84cdcaac42a69748713c90123f8fd 2023-02-22T10:45:12-05:00 UPSTREAM: : bump(openshift/api,openshift/client-go) -# machine-config-operator embedded-component 8671aa4a777a940b1e45c97b6bd72e26d76acace to c078cdd2614e409faf0e9b13d97c426c065a71da -b5162960131e1eced0fa2af17e10d7800285ec2c 2023-02-23T09:08:14-05:00 resolv-prepender: Chmod before mv, and set SELinux label -375ac973533e00c6bdf15c34494d7d3ddbcc0c7e 2023-02-22T14:57:00-06:00 Fix permissions on resolv.conf -3d2c9220d25fc344a5f4bd79eae646aed08d5a9c 2023-02-22T18:41:46+02:00 OCPBUGS-7896: MCO should not add keepalived pod manifests in case of VSPHERE UPI -7902af5612d10be566ddf8a15bd2040b087dd040 2023-02-22T12:56:31+01:00 Regenerate controllerconfig.crd.yaml -474b6755ef7cb9448e700a87d78b449b18d03896 2023-02-22T12:13:15+01:00 Bump openshift/api to enable DynamicResourceAllocation through TechPreviewNoUpgrade -9eccd87c6198254231fb5d3842a5361e9559b0bd 2023-02-20T16:17:02-06:00 Remove timeout and separate image pull from prepender script -3725f991c90d93dc1a112b0106c03b418d607336 2023-02-17T16:27:35-06:00 Forklift most of resolv-prepender dispatcher script to systemd -ace1d87e143792a4da9bbe2848b222dd88bf7619 2023-02-15T23:30:50+02:00 MGMT-13645: Adding dnsmasq config for sno SNO upgrade from 4.12 to 4.13 rhel9.2 is broken cause of dnsmasq default config -# openshift-controller-manager embedded-component 67fcbf2f6e3d5922a1c451197d497eadddedcb8d to 1c8021fcf40ccdc95a16bd8569b5ce53ecc09f0a -ffcebbe74b001c0eb430ffacc00dac733bf25b9f 2023-02-15T14:12:53-05:00 Revert "remove tech preview feature gate for build csi volumes" -# oc image-amd64 49b1e9f681b3dbdd4f43ca3d288ac64f4c681e2d to 83fd126d7c7c598b1bfa398641d330e24596c2cf -ba4172a0f2e504c62f4fbfc43d2ebac0469c8d35 2023-02-21T17:48:59-05:00 Adding CommitDate to the Changelog json output -ed394856a5c5309b9f58b0b1aa532ba918047329 2023-02-20T15:51:14-08:00 pkg/cli/admin/upgrade/channel: Use PATCH instead of POST for spec updates -# ovn-kubernetes image-amd64 e75917d7dcd961d39b4c7768d88aa5d13ba67eb0 to b244c306b58db1afb6bdd9124bfbcadc7aec8371 -5d3b54a97e904a67194e20282b98f59335f2642d 2023-02-23T09:03:59+01:00 Changes due to `pkg/ovn/controller/services` move -da57d5f0be119598948391308c3cdcd80c56bda8 2023-02-22T19:27:38+01:00 Move OCP hack in its own test file -80e0b66e930bf75ce66bb93d4b0507464d9f8a95 2023-02-22T09:49:10-06:00 rhel9: bump to openvswitch3.1-3.1.0-2.el9fdp -c945e2db5ae835f4138b5c1e0374e3726f84a862 2023-02-20T09:34:02+08:00 Print ovnkube node exit error -7cc073e6bc3b83bf6d577cd37419cb20d36de6ea 2023-02-17T14:55:11+01:00 e2e, flatl2: add a traffic test without IPAM -351ba9d8f5c376c879b75b941989edf5c6d0ac21 2023-02-17T14:55:09+01:00 multi-homing, flatL2: make subnet optional -7bb967c38b2247fadac20de8fdf83e4ab4089da6 2023-02-17T11:34:17+01:00 Flush route cache from all nodes -dfe17dda437adfb5dca17e3399ed599b4a25d809 2023-02-16T15:58:31-05:00 Dockerfile.fedora: bump OVN to 22.12.0-25 and to fedora 37. -0ab5c2dc0904d6afed8cccdfa53141f740f1c335 2023-02-16T11:21:35-05:00 correct cleanup of hybrid overlay annotations -25dc30975cea0d383d0c31a1f5333a716c29c5e5 2023-02-16T16:46:35+01:00 multi-homing: rename waitForNodeLogicalSwitchInCache function -7091592d1ca90b492c1c9daa42b2e11041d6d892 2023-02-15T13:28:01+01:00 EgressIPs: Allow moving IP -2e052072bc288bd16f0ba5fc95ac620bf95b36f8 2023-02-14T16:13:52-05:00 Remove MTU on service routes -b15827df0cb9a35c22ae17f35a9ab7422d7b7eb7 2023-02-13T09:48:42-05:00 Skip dualstack conversion e2e flake test -9a141bb0ef008d4c9be684d201cc188a8e73e44b 2023-02-13T14:20:26+01:00 Service: Avoid rejecting when service is unidled -8fe5f857fd8ca13f5b006957cb269697b79a44cf 2023-02-10T11:53:20+08:00 Enable LDFLAGS for building ovnk binaries other than ovnkube -c7fd02c133233cf940fc7537e481a95700e060a3 2023-02-09T22:19:28+00:00 services controller: renames -f63796ec18450c9a241336f4be01238c5eed9621 2023-02-09T22:19:11+00:00 services controller: fold go-controller/pkg/ovn/loadbalancer into go-controller/pkg/ovn/controller/services -b64d072270a1ce4f865b363f926fa60a54294d7c 2023-02-09T22:16:24+00:00 consts: types.LoadBalancerKindExternalID and types.LoadBalancerOwnerExternalID -36991fb2cac69c8d91e1a63d262badc73fd9a310 2023-02-09T22:16:15+00:00 services controller: remove lb_cache -2000f2e057267414d5c639326e31f5472cb39f06 2023-02-09T22:15:54+00:00 services controller: make ensureLbs use top level cache -624c23ec24d511fc0b42ab7f5f2a29144a98a386 2023-02-09T23:07:16+01:00 Always send packets from OVN to Host -7db9a35bcb73c14440e6676e57947831d31c020a 2023-02-09T21:43:58+01:00 Don't retry fetching pod ips on delete if it failed once. -c05399a5eaea16886dd81f3786ea3e92ece40f2e 2023-02-09T19:36:16+01:00 Expose resource max retry failed metric -97c91c2e6485ddf9157f1fa5f7dd3d973925d5c0 2023-02-08T20:50:06+00:00 services controller: removal of legacy lbs is no longer needed -c0274194ebedb8a60420ce24fe4ad954f5db4cd2 2023-02-08T18:55:53+01:00 multi-homing, e2e: multiple attachments to the same network -399d3ab3521b4764930c38edfd9fb2f1ed607aa6 2023-02-08T10:22:22-05:00 Consolidate dualstack conversion jobs -d6827a6a08f976c1e11ea58cde6d4908422c98ce 2023-02-08T11:20:28+01:00 Use Update() instead of Patch() for concurrent node annotation update with the same key. Default and secondary controllers both update "k8s.ovn.org/node-subnets" annotation on node events. Since annotation value is a string, they will try to push conflicting changes, but if we use Update(), it will return error on resource version mismatch, and changes will be applied sequentially after retry. -3aeda210acfe72646e3071fe5ac78e165bb10954 2023-02-08T11:20:26+01:00 Separate Kube and KubeOVN interfaces to make sure all required clients are always set. Add OVNMasterClientset and OVNNodeClientset in addition to OVNClientset for the same purpose. Define cni.ClientSet and cni.shimClientset for the same purpose. Remove cni.Server.rundir field, since it is only used during initialization, pass it to cni.Server.Start(). -d029343f3c451f5e8377a0f6fd6584cb981e3f17 2023-02-08T10:33:54+01:00 multi-homing, e2e: ensure workloads are scheduled in diff nodes -c778ccec8e5efb5bb3f1cede2ee4ab131b585d78 2023-02-08T10:33:46+01:00 e2e, multi-homing: refactor the test suite -ead05f8f23773bcb7a0b2640e630e53364f8b877 2023-02-07T11:43:34+01:00 Commit egress IP pod config as one libovsdb transaction -9604a9c39affd623143cfc816f54133888497f3d 2023-02-07T11:11:32+01:00 Refactor handleEgressReroutePolicy into separate functions -7c856ae26aea90b8298a8e86bffc79fe101da419 2023-02-07T11:11:31+01:00 Rename MatchIPNetFamily to MatchFirstIPNetFamily -fcb87247fa78be6372d5ff063ab1cd3abb4adc8a 2023-02-01T11:52:18-06:00 config: add unit tests for enable-multi-network -# kubernetes image-amd64 518f3edfe79c93dcc01145153247ebffcd4fe6e6 to 89232647de67ea787d339b1bd7c780a0ed97f3f9 -04ff5090bae1cb181a2464696adde8709cdd0a93 2023-02-22T10:49:29-05:00 UPSTREAM: : node admission plugin for cpu partitioning -78f50d0821f84cdcaac42a69748713c90123f8fd 2023-02-22T10:45:12-05:00 UPSTREAM: : bump(openshift/api,openshift/client-go) -# oc image-arm64 a04d9dc7e12a1d251da3502df69d8dc8a48e18b8 to 83fd126d7c7c598b1bfa398641d330e24596c2cf -ba4172a0f2e504c62f4fbfc43d2ebac0469c8d35 2023-02-21T17:48:59-05:00 Adding CommitDate to the Changelog json output -# ovn-kubernetes image-arm64 e75917d7dcd961d39b4c7768d88aa5d13ba67eb0 to b244c306b58db1afb6bdd9124bfbcadc7aec8371 -5d3b54a97e904a67194e20282b98f59335f2642d 2023-02-23T09:03:59+01:00 Changes due to `pkg/ovn/controller/services` move -da57d5f0be119598948391308c3cdcd80c56bda8 2023-02-22T19:27:38+01:00 Move OCP hack in its own test file -80e0b66e930bf75ce66bb93d4b0507464d9f8a95 2023-02-22T09:49:10-06:00 rhel9: bump to openvswitch3.1-3.1.0-2.el9fdp -c945e2db5ae835f4138b5c1e0374e3726f84a862 2023-02-20T09:34:02+08:00 Print ovnkube node exit error -7cc073e6bc3b83bf6d577cd37419cb20d36de6ea 2023-02-17T14:55:11+01:00 e2e, flatl2: add a traffic test without IPAM -351ba9d8f5c376c879b75b941989edf5c6d0ac21 2023-02-17T14:55:09+01:00 multi-homing, flatL2: make subnet optional -7bb967c38b2247fadac20de8fdf83e4ab4089da6 2023-02-17T11:34:17+01:00 Flush route cache from all nodes -dfe17dda437adfb5dca17e3399ed599b4a25d809 2023-02-16T15:58:31-05:00 Dockerfile.fedora: bump OVN to 22.12.0-25 and to fedora 37. -0ab5c2dc0904d6afed8cccdfa53141f740f1c335 2023-02-16T11:21:35-05:00 correct cleanup of hybrid overlay annotations -25dc30975cea0d383d0c31a1f5333a716c29c5e5 2023-02-16T16:46:35+01:00 multi-homing: rename waitForNodeLogicalSwitchInCache function -7091592d1ca90b492c1c9daa42b2e11041d6d892 2023-02-15T13:28:01+01:00 EgressIPs: Allow moving IP -2e052072bc288bd16f0ba5fc95ac620bf95b36f8 2023-02-14T16:13:52-05:00 Remove MTU on service routes -b15827df0cb9a35c22ae17f35a9ab7422d7b7eb7 2023-02-13T09:48:42-05:00 Skip dualstack conversion e2e flake test -9a141bb0ef008d4c9be684d201cc188a8e73e44b 2023-02-13T14:20:26+01:00 Service: Avoid rejecting when service is unidled -8fe5f857fd8ca13f5b006957cb269697b79a44cf 2023-02-10T11:53:20+08:00 Enable LDFLAGS for building ovnk binaries other than ovnkube -c7fd02c133233cf940fc7537e481a95700e060a3 2023-02-09T22:19:28+00:00 services controller: renames -f63796ec18450c9a241336f4be01238c5eed9621 2023-02-09T22:19:11+00:00 services controller: fold go-controller/pkg/ovn/loadbalancer into go-controller/pkg/ovn/controller/services -b64d072270a1ce4f865b363f926fa60a54294d7c 2023-02-09T22:16:24+00:00 consts: types.LoadBalancerKindExternalID and types.LoadBalancerOwnerExternalID -36991fb2cac69c8d91e1a63d262badc73fd9a310 2023-02-09T22:16:15+00:00 services controller: remove lb_cache -2000f2e057267414d5c639326e31f5472cb39f06 2023-02-09T22:15:54+00:00 services controller: make ensureLbs use top level cache -624c23ec24d511fc0b42ab7f5f2a29144a98a386 2023-02-09T23:07:16+01:00 Always send packets from OVN to Host -7db9a35bcb73c14440e6676e57947831d31c020a 2023-02-09T21:43:58+01:00 Don't retry fetching pod ips on delete if it failed once. -c05399a5eaea16886dd81f3786ea3e92ece40f2e 2023-02-09T19:36:16+01:00 Expose resource max retry failed metric -97c91c2e6485ddf9157f1fa5f7dd3d973925d5c0 2023-02-08T20:50:06+00:00 services controller: removal of legacy lbs is no longer needed -c0274194ebedb8a60420ce24fe4ad954f5db4cd2 2023-02-08T18:55:53+01:00 multi-homing, e2e: multiple attachments to the same network -399d3ab3521b4764930c38edfd9fb2f1ed607aa6 2023-02-08T10:22:22-05:00 Consolidate dualstack conversion jobs -d6827a6a08f976c1e11ea58cde6d4908422c98ce 2023-02-08T11:20:28+01:00 Use Update() instead of Patch() for concurrent node annotation update with the same key. Default and secondary controllers both update "k8s.ovn.org/node-subnets" annotation on node events. Since annotation value is a string, they will try to push conflicting changes, but if we use Update(), it will return error on resource version mismatch, and changes will be applied sequentially after retry. -3aeda210acfe72646e3071fe5ac78e165bb10954 2023-02-08T11:20:26+01:00 Separate Kube and KubeOVN interfaces to make sure all required clients are always set. Add OVNMasterClientset and OVNNodeClientset in addition to OVNClientset for the same purpose. Define cni.ClientSet and cni.shimClientset for the same purpose. Remove cni.Server.rundir field, since it is only used during initialization, pass it to cni.Server.Start(). -d029343f3c451f5e8377a0f6fd6584cb981e3f17 2023-02-08T10:33:54+01:00 multi-homing, e2e: ensure workloads are scheduled in diff nodes -c778ccec8e5efb5bb3f1cede2ee4ab131b585d78 2023-02-08T10:33:46+01:00 e2e, multi-homing: refactor the test suite -ead05f8f23773bcb7a0b2640e630e53364f8b877 2023-02-07T11:43:34+01:00 Commit egress IP pod config as one libovsdb transaction -9604a9c39affd623143cfc816f54133888497f3d 2023-02-07T11:11:32+01:00 Refactor handleEgressReroutePolicy into separate functions -7c856ae26aea90b8298a8e86bffc79fe101da419 2023-02-07T11:11:31+01:00 Rename MatchIPNetFamily to MatchFirstIPNetFamily -fcb87247fa78be6372d5ff063ab1cd3abb4adc8a 2023-02-01T11:52:18-06:00 config: add unit tests for enable-multi-network -# kubernetes image-arm64 518f3edfe79c93dcc01145153247ebffcd4fe6e6 to 89232647de67ea787d339b1bd7c780a0ed97f3f9 -04ff5090bae1cb181a2464696adde8709cdd0a93 2023-02-22T10:49:29-05:00 UPSTREAM: : node admission plugin for cpu partitioning -78f50d0821f84cdcaac42a69748713c90123f8fd 2023-02-22T10:45:12-05:00 UPSTREAM: : bump(openshift/api,openshift/client-go) +# cluster-dns-operator embedded-component ccd55d043b09c64ed4d5d8ed102cc2a0cb09cb3b to d96022a4d0d091955d73e7e99fc8cc81db56c86a +195cabc41851da30d793eadc0720729bd628cdaa 2023-02-01T16:13:26-05:00 update-node-resolver.sh: Check for errors from >> +# cluster-ingress-operator embedded-component 8eb2c667fd31a67d52c4d0ea6c5f014a9fe2ce0d to 6aa482c551de22016dc2b6c87ca11ef4ac2be04d +f7bfa8949af33745f324fb68a71fc190b1c24deb 2023-01-27T15:27:44-05:00 NE-1186: Test_getRR: Fix typo: "excepted" → "expected" +25eee8e06756f411e9eb94c000942751abe920ce 2022-11-23T09:13:37-06:00 configurable-route: Don't use NewKindWithCache +# cluster-network-operator embedded-component 4d5a093d41e45def540ffbe4c5dc214550864d53 to c0208114e49b3ee34bb073ea7d09cf82273573b0 +d0c1518a642b07a8394c79e9e323c641c61659fa 2023-03-02T10:09:15-08:00 Add UTs around expanding clusternetwork CIDR mask +5ea7d9162436d0814c2fff7e66850a9030f5db7b 2023-03-02T10:09:15-08:00 refactor out tests from larger TestIsChangeSafe() +9d1ccf753f6b62460a73a663a042d168dcbccec6 2023-03-02T10:09:14-08:00 allow for expanding clusterNetwork CIDR mask +d91d378516cc89295693e374eaa03b9275e24c35 2023-03-01T10:28:00-05:00 Enables nodeSelector to be used in egress firewall rule +6da63840574bfa8b0abb188a9547adc505c7da30 2023-03-01T13:31:22+00:00 OVN IC: migrate subnet alloc alerts to cluster manager +851a2512479252b5fe2074bb6bebedae345df60d 2023-02-23T16:03:58+01:00 Add ovnk alert for resource retry failure +3a76d935df9fc54215a70a850da8a4dcd4ea0506 2023-02-10T18:41:46-06:00 ovn-kubernetes: use RHEL9-based images +# kubernetes embedded-component 89232647de67ea787d339b1bd7c780a0ed97f3f9 to 8cfbab7d1c15576e72726dea70563f0d65d220eb +5bb8838b4a2408385113ba108465bbcd4d19dd63 2023-02-28T13:17:25+01:00 UPSTREAM: 115968: add SeccompProfile to Pod and Container accessors/mutators +d405dc93fb9145e771d76fc1c8951d345a9e4d41 2023-02-27T11:35:30+01:00 UPSTREAM: : PSa metrics: unset ocp_namespace on non-platform namespaces +9626fc26ae199773b64a36f3bc699c78ca857dc7 2023-02-23T13:30:48-05:00 UPSTREAM: : OCPBUGS-5991: Kube APIServer panics in admission controller +22d484661c514ddc00058c4bc677710cc3c25f15 2023-02-16T13:29:55-05:00 UPSTREAM: : hack/update-vendor.sh, make update and update image +8f94681cd294aa8cfd3407b8191f6c70214973a4 2023-01-18T15:51:24+00:00 Release commit for Kubernetes v1.26.1 +fd2245b845262be666ee56672598981e9487f247 2023-01-12T21:31:37+05:30 pkg/controller/job: re-honor exponential backoff +fcc4ed670c6444aa8e636bd9ee81275a7b4a9817 2023-01-12T14:02:58+01:00 releng: Update images, dependencies and version to Go 1.19.5 +d23d4afdc05d94afcdb11fa7c6470bd6829512db 2023-01-12T10:03:57+01:00 Do not include scheduler name in the preemption event message +242b82c860da1c880c326b70c84cfb4086dddd4d 2023-01-11T23:04:50-08:00 Explicitly call rand.Seed() method +0085f2537be4154a5cce146617026f61c1a94efc 2023-01-10T19:32:26+00:00 Exports WarningPrinter field in DeleteOptions +424b877bd604a29205ba3d2001f6c33dfa646704 2023-01-10T12:22:05-05:00 Improve vendor verification works for each staging repo +5b7b949326199c18039c54c39107d61133fd03e4 2023-01-10T10:10:21+01:00 Do not leak cross namespace pod metadata in preemption events +707031462a2fd9b11c98040001147a011ecdb34f 2023-01-10T10:06:11+01:00 Adjust DisruptionTarget condition message to do not include preemptor pod metadata +91228a5749ca4cc370fb6b0fbea6a2836cc93c10 2023-01-09T19:22:52+00:00 egress_selector.go: register konnectivity-client metrics. +57cea1f4d2dbb86a4df4f2bbf42a7fa75c21d057 2023-01-09T19:22:23+00:00 expose prometheus.Registerer so that we can hook into this from external sources +529e773d9521fc209e93bbf63f90358219aaf725 2023-01-09T19:22:05+00:00 Bump konnectivity-client to v0.0.35 +fc27c43db28014bb185871da7ab14b0b065466f1 2023-01-05T15:17:47-05:00 Cherry pick 114857 to release-1.26 +c25004b88feadf069b3900649703bea00b942526 2023-01-05T12:54:40+05:30 Automated cherry pick of #114602: Removed the reverted changes from Changelogv1.26.md +bfda7f6364105ee28a56e4bd77fcefbd1e22697f 2023-01-04T22:22:11+09:00 Update daemonSet status even if syncDaemonSet fails +640f15b876569613d0c42cd2f311c55a091bcba1 2023-01-04T12:26:06+01:00 Licensing: skip modules with fewer subdirs than mods +da22a8fd21eebc70c241ae23d0b00f6d758c51a1 2023-01-03T21:11:39+00:00 Fix issues in volumesnapshot test for ephemeral storage +cceaf6c3ae51d45e71438c011ac958f00a5f60d1 2023-01-03T16:38:02+01:00 Fix clearing rate limiter in disruption controller +b897fb4fa385881c9719b5f085198234e6dc11f1 2022-12-28T21:28:03+00:00 Add pod to dsw if termination is not completed during reconstruction #issues/113979 +a5c0a5f04681bbcd8b818df3e7c8d968735a8af2 2022-12-22T13:23:24-05:00 Add .go-version file containing build go version +5e22175b1d9b623c3db4d7f61ab881bb17b2795c 2022-12-20T22:08:34+00:00 Resource claims should be a map type +0b0eee5cc61a0db82138fc65f8114a8727be8657 2022-12-16T07:48:00+05:30 Windows Kube-Proxy implementation for internal traffic policy. +cbeb5809b8cf5cfa1d7c076b6305d55ea40e4ae2 2022-12-15T15:16:56-08:00 Fix a regression that scheduler always go through all Filter plugins +bbb5513b3b4c956c486685886634c71ce7c31b9f 2022-12-15T22:21:58+02:00 Fix SPDY proxy authentication with special chars +674db522815df566ffae7fbe8daf5f8e3ced9033 2022-12-15T22:21:58+02:00 Improve error message when proxy connection fails +de757c46a01b1b6236c7d1de273c3f33cf4f6dc5 2022-12-13T10:02:40-08:00 fix double lock and excercise its codepath in tests +180e7dbbd61c1a0a2b4340f682b9a5fc38022ef2 2022-12-13T11:16:35-05:00 Reduce load of Job integration test +e5539672b1394a3cbe0240fa179a38cac5b12433 2022-12-13T20:01:07+05:30 Creating Ingress IP loadbalancer alone when all the endpoints are terminating. KEP1669 +a3c81d8b4da61ebc1e1986a04055788189ee3fcd 2022-12-12T17:05:27+01:00 Deflake a preemption test that may patch Node incorrectly +f8b99b1f09fb5d4d10b15e326c4b242cc705f007 2022-12-11T19:26:01-08:00 Check the correct error in d.downloadAPIs +5108c2dde6deb08939e799e8bfd6bf75f7daa081 2022-12-08T20:50:46+00:00 Update CHANGELOG/CHANGELOG-1.26.md for v1.26.0 +4c5225033fe188d19435cae8c1496d4aef7306ba 2022-12-08T19:51:44+00:00 Release commit for Kubernetes v1.26.1-rc.0 +a9241b145d77337314ffaa6e87b2579f9298ee2f 2022-11-21T17:01:38+05:30 Introducing LoadbalancerPortMapping flags for VipExternalIP +40f01d0c811c49a22b7557f7d8d06e3af6b4cabd 2022-11-17T21:47:35-05:00 Limit request retrying to []byte request bodies +# machine-config-operator embedded-component c078cdd2614e409faf0e9b13d97c426c065a71da to a8692a763fe156990882489908584be2363a3303 +3234b724123aa3fcb1c05b23ace77911e440fae7 2023-02-28T12:50:31-06:00 OPNET-208: Prefer ipv6 on v6-primary dual stack deployments +626a3369ffcaf231be502197620fca575f404d1d 2023-02-27T20:32:46+02:00 Fixing platform path order as platform specific path should be the last +865c41482f96ddb818b17971b44713d6e0a453eb 2023-02-23T14:49:28-05:00 daemon: Added no-op sync while waiting on node reboot +459993144c7a74a6a3217a2d37d2ffc018d03cdd 2023-02-23T13:00:15-05:00 Add back cleanupDuplicateMC +69c98ccbabe8f502cc9b671fd4d5143fb7d2800a 2023-02-21T16:56:41-06:00 added e2e testing to ensure password is updated and confirmed +de59bd288d854c5146243e6f9d46a425a9074e7e 2023-02-17T10:39:47-06:00 set passwordhash enabled, udpated verifyUserFields, reworded comments +# openshift-controller-manager embedded-component 1c8021fcf40ccdc95a16bd8569b5ce53ecc09f0a to 87de83867ac51730f506138ee790a56ca21d9fc9 +a9be5578800a57fb6b1ae0c078c7e4abf1d94db3 2023-01-19T11:41:05-05:00 Add explicit license +# oc image-amd64 83fd126d7c7c598b1bfa398641d330e24596c2cf to 02362102a19e81ebecb90906f41687e4e4350dfe +fe31e03201d00fa3ebe4a66b1f0c8e1ff1c3c43e 2023-02-28T15:53:55+01:00 Microshift command docs +39679d53195c77ff541aeea2717b25bc2a03b3bc 2023-02-27T15:13:52+01:00 groupsync: cache ldap connection instead of spamming the LDAP server with conn/bind +adce7bab1211a4ace5b910359d6203572c013a26 2023-02-27T15:13:52+01:00 bump(library-go): update to LDAP queries library +b186341885cab69f82673153985fb721b9f9ade6 2023-02-21T11:07:44+01:00 Do not set master node selector if there's no masters +# kubernetes image-amd64 89232647de67ea787d339b1bd7c780a0ed97f3f9 to 8cfbab7d1c15576e72726dea70563f0d65d220eb +5bb8838b4a2408385113ba108465bbcd4d19dd63 2023-02-28T13:17:25+01:00 UPSTREAM: 115968: add SeccompProfile to Pod and Container accessors/mutators +d405dc93fb9145e771d76fc1c8951d345a9e4d41 2023-02-27T11:35:30+01:00 UPSTREAM: : PSa metrics: unset ocp_namespace on non-platform namespaces +9626fc26ae199773b64a36f3bc699c78ca857dc7 2023-02-23T13:30:48-05:00 UPSTREAM: : OCPBUGS-5991: Kube APIServer panics in admission controller +22d484661c514ddc00058c4bc677710cc3c25f15 2023-02-16T13:29:55-05:00 UPSTREAM: : hack/update-vendor.sh, make update and update image +8f94681cd294aa8cfd3407b8191f6c70214973a4 2023-01-18T15:51:24+00:00 Release commit for Kubernetes v1.26.1 +fd2245b845262be666ee56672598981e9487f247 2023-01-12T21:31:37+05:30 pkg/controller/job: re-honor exponential backoff +fcc4ed670c6444aa8e636bd9ee81275a7b4a9817 2023-01-12T14:02:58+01:00 releng: Update images, dependencies and version to Go 1.19.5 +d23d4afdc05d94afcdb11fa7c6470bd6829512db 2023-01-12T10:03:57+01:00 Do not include scheduler name in the preemption event message +242b82c860da1c880c326b70c84cfb4086dddd4d 2023-01-11T23:04:50-08:00 Explicitly call rand.Seed() method +0085f2537be4154a5cce146617026f61c1a94efc 2023-01-10T19:32:26+00:00 Exports WarningPrinter field in DeleteOptions +424b877bd604a29205ba3d2001f6c33dfa646704 2023-01-10T12:22:05-05:00 Improve vendor verification works for each staging repo +5b7b949326199c18039c54c39107d61133fd03e4 2023-01-10T10:10:21+01:00 Do not leak cross namespace pod metadata in preemption events +707031462a2fd9b11c98040001147a011ecdb34f 2023-01-10T10:06:11+01:00 Adjust DisruptionTarget condition message to do not include preemptor pod metadata +91228a5749ca4cc370fb6b0fbea6a2836cc93c10 2023-01-09T19:22:52+00:00 egress_selector.go: register konnectivity-client metrics. +57cea1f4d2dbb86a4df4f2bbf42a7fa75c21d057 2023-01-09T19:22:23+00:00 expose prometheus.Registerer so that we can hook into this from external sources +529e773d9521fc209e93bbf63f90358219aaf725 2023-01-09T19:22:05+00:00 Bump konnectivity-client to v0.0.35 +fc27c43db28014bb185871da7ab14b0b065466f1 2023-01-05T15:17:47-05:00 Cherry pick 114857 to release-1.26 +c25004b88feadf069b3900649703bea00b942526 2023-01-05T12:54:40+05:30 Automated cherry pick of #114602: Removed the reverted changes from Changelogv1.26.md +bfda7f6364105ee28a56e4bd77fcefbd1e22697f 2023-01-04T22:22:11+09:00 Update daemonSet status even if syncDaemonSet fails +640f15b876569613d0c42cd2f311c55a091bcba1 2023-01-04T12:26:06+01:00 Licensing: skip modules with fewer subdirs than mods +da22a8fd21eebc70c241ae23d0b00f6d758c51a1 2023-01-03T21:11:39+00:00 Fix issues in volumesnapshot test for ephemeral storage +cceaf6c3ae51d45e71438c011ac958f00a5f60d1 2023-01-03T16:38:02+01:00 Fix clearing rate limiter in disruption controller +b897fb4fa385881c9719b5f085198234e6dc11f1 2022-12-28T21:28:03+00:00 Add pod to dsw if termination is not completed during reconstruction #issues/113979 +a5c0a5f04681bbcd8b818df3e7c8d968735a8af2 2022-12-22T13:23:24-05:00 Add .go-version file containing build go version +5e22175b1d9b623c3db4d7f61ab881bb17b2795c 2022-12-20T22:08:34+00:00 Resource claims should be a map type +0b0eee5cc61a0db82138fc65f8114a8727be8657 2022-12-16T07:48:00+05:30 Windows Kube-Proxy implementation for internal traffic policy. +cbeb5809b8cf5cfa1d7c076b6305d55ea40e4ae2 2022-12-15T15:16:56-08:00 Fix a regression that scheduler always go through all Filter plugins +bbb5513b3b4c956c486685886634c71ce7c31b9f 2022-12-15T22:21:58+02:00 Fix SPDY proxy authentication with special chars +674db522815df566ffae7fbe8daf5f8e3ced9033 2022-12-15T22:21:58+02:00 Improve error message when proxy connection fails +de757c46a01b1b6236c7d1de273c3f33cf4f6dc5 2022-12-13T10:02:40-08:00 fix double lock and excercise its codepath in tests +180e7dbbd61c1a0a2b4340f682b9a5fc38022ef2 2022-12-13T11:16:35-05:00 Reduce load of Job integration test +e5539672b1394a3cbe0240fa179a38cac5b12433 2022-12-13T20:01:07+05:30 Creating Ingress IP loadbalancer alone when all the endpoints are terminating. KEP1669 +a3c81d8b4da61ebc1e1986a04055788189ee3fcd 2022-12-12T17:05:27+01:00 Deflake a preemption test that may patch Node incorrectly +f8b99b1f09fb5d4d10b15e326c4b242cc705f007 2022-12-11T19:26:01-08:00 Check the correct error in d.downloadAPIs +5108c2dde6deb08939e799e8bfd6bf75f7daa081 2022-12-08T20:50:46+00:00 Update CHANGELOG/CHANGELOG-1.26.md for v1.26.0 +4c5225033fe188d19435cae8c1496d4aef7306ba 2022-12-08T19:51:44+00:00 Release commit for Kubernetes v1.26.1-rc.0 +a9241b145d77337314ffaa6e87b2579f9298ee2f 2022-11-21T17:01:38+05:30 Introducing LoadbalancerPortMapping flags for VipExternalIP +40f01d0c811c49a22b7557f7d8d06e3af6b4cabd 2022-11-17T21:47:35-05:00 Limit request retrying to []byte request bodies +# oc image-arm64 83fd126d7c7c598b1bfa398641d330e24596c2cf to 02362102a19e81ebecb90906f41687e4e4350dfe +fe31e03201d00fa3ebe4a66b1f0c8e1ff1c3c43e 2023-02-28T15:53:55+01:00 Microshift command docs +39679d53195c77ff541aeea2717b25bc2a03b3bc 2023-02-27T15:13:52+01:00 groupsync: cache ldap connection instead of spamming the LDAP server with conn/bind +adce7bab1211a4ace5b910359d6203572c013a26 2023-02-27T15:13:52+01:00 bump(library-go): update to LDAP queries library +b186341885cab69f82673153985fb721b9f9ade6 2023-02-21T11:07:44+01:00 Do not set master node selector if there's no masters +# kubernetes image-arm64 89232647de67ea787d339b1bd7c780a0ed97f3f9 to 8cfbab7d1c15576e72726dea70563f0d65d220eb +5bb8838b4a2408385113ba108465bbcd4d19dd63 2023-02-28T13:17:25+01:00 UPSTREAM: 115968: add SeccompProfile to Pod and Container accessors/mutators +d405dc93fb9145e771d76fc1c8951d345a9e4d41 2023-02-27T11:35:30+01:00 UPSTREAM: : PSa metrics: unset ocp_namespace on non-platform namespaces +9626fc26ae199773b64a36f3bc699c78ca857dc7 2023-02-23T13:30:48-05:00 UPSTREAM: : OCPBUGS-5991: Kube APIServer panics in admission controller +22d484661c514ddc00058c4bc677710cc3c25f15 2023-02-16T13:29:55-05:00 UPSTREAM: : hack/update-vendor.sh, make update and update image +8f94681cd294aa8cfd3407b8191f6c70214973a4 2023-01-18T15:51:24+00:00 Release commit for Kubernetes v1.26.1 +fd2245b845262be666ee56672598981e9487f247 2023-01-12T21:31:37+05:30 pkg/controller/job: re-honor exponential backoff +fcc4ed670c6444aa8e636bd9ee81275a7b4a9817 2023-01-12T14:02:58+01:00 releng: Update images, dependencies and version to Go 1.19.5 +d23d4afdc05d94afcdb11fa7c6470bd6829512db 2023-01-12T10:03:57+01:00 Do not include scheduler name in the preemption event message +242b82c860da1c880c326b70c84cfb4086dddd4d 2023-01-11T23:04:50-08:00 Explicitly call rand.Seed() method +0085f2537be4154a5cce146617026f61c1a94efc 2023-01-10T19:32:26+00:00 Exports WarningPrinter field in DeleteOptions +424b877bd604a29205ba3d2001f6c33dfa646704 2023-01-10T12:22:05-05:00 Improve vendor verification works for each staging repo +5b7b949326199c18039c54c39107d61133fd03e4 2023-01-10T10:10:21+01:00 Do not leak cross namespace pod metadata in preemption events +707031462a2fd9b11c98040001147a011ecdb34f 2023-01-10T10:06:11+01:00 Adjust DisruptionTarget condition message to do not include preemptor pod metadata +91228a5749ca4cc370fb6b0fbea6a2836cc93c10 2023-01-09T19:22:52+00:00 egress_selector.go: register konnectivity-client metrics. +57cea1f4d2dbb86a4df4f2bbf42a7fa75c21d057 2023-01-09T19:22:23+00:00 expose prometheus.Registerer so that we can hook into this from external sources +529e773d9521fc209e93bbf63f90358219aaf725 2023-01-09T19:22:05+00:00 Bump konnectivity-client to v0.0.35 +fc27c43db28014bb185871da7ab14b0b065466f1 2023-01-05T15:17:47-05:00 Cherry pick 114857 to release-1.26 +c25004b88feadf069b3900649703bea00b942526 2023-01-05T12:54:40+05:30 Automated cherry pick of #114602: Removed the reverted changes from Changelogv1.26.md +bfda7f6364105ee28a56e4bd77fcefbd1e22697f 2023-01-04T22:22:11+09:00 Update daemonSet status even if syncDaemonSet fails +640f15b876569613d0c42cd2f311c55a091bcba1 2023-01-04T12:26:06+01:00 Licensing: skip modules with fewer subdirs than mods +da22a8fd21eebc70c241ae23d0b00f6d758c51a1 2023-01-03T21:11:39+00:00 Fix issues in volumesnapshot test for ephemeral storage +cceaf6c3ae51d45e71438c011ac958f00a5f60d1 2023-01-03T16:38:02+01:00 Fix clearing rate limiter in disruption controller +b897fb4fa385881c9719b5f085198234e6dc11f1 2022-12-28T21:28:03+00:00 Add pod to dsw if termination is not completed during reconstruction #issues/113979 +a5c0a5f04681bbcd8b818df3e7c8d968735a8af2 2022-12-22T13:23:24-05:00 Add .go-version file containing build go version +5e22175b1d9b623c3db4d7f61ab881bb17b2795c 2022-12-20T22:08:34+00:00 Resource claims should be a map type +0b0eee5cc61a0db82138fc65f8114a8727be8657 2022-12-16T07:48:00+05:30 Windows Kube-Proxy implementation for internal traffic policy. +cbeb5809b8cf5cfa1d7c076b6305d55ea40e4ae2 2022-12-15T15:16:56-08:00 Fix a regression that scheduler always go through all Filter plugins +bbb5513b3b4c956c486685886634c71ce7c31b9f 2022-12-15T22:21:58+02:00 Fix SPDY proxy authentication with special chars +674db522815df566ffae7fbe8daf5f8e3ced9033 2022-12-15T22:21:58+02:00 Improve error message when proxy connection fails +de757c46a01b1b6236c7d1de273c3f33cf4f6dc5 2022-12-13T10:02:40-08:00 fix double lock and excercise its codepath in tests +180e7dbbd61c1a0a2b4340f682b9a5fc38022ef2 2022-12-13T11:16:35-05:00 Reduce load of Job integration test +e5539672b1394a3cbe0240fa179a38cac5b12433 2022-12-13T20:01:07+05:30 Creating Ingress IP loadbalancer alone when all the endpoints are terminating. KEP1669 +a3c81d8b4da61ebc1e1986a04055788189ee3fcd 2022-12-12T17:05:27+01:00 Deflake a preemption test that may patch Node incorrectly +f8b99b1f09fb5d4d10b15e326c4b242cc705f007 2022-12-11T19:26:01-08:00 Check the correct error in d.downloadAPIs +5108c2dde6deb08939e799e8bfd6bf75f7daa081 2022-12-08T20:50:46+00:00 Update CHANGELOG/CHANGELOG-1.26.md for v1.26.0 +4c5225033fe188d19435cae8c1496d4aef7306ba 2022-12-08T19:51:44+00:00 Release commit for Kubernetes v1.26.1-rc.0 +a9241b145d77337314ffaa6e87b2579f9298ee2f 2022-11-21T17:01:38+05:30 Introducing LoadbalancerPortMapping flags for VipExternalIP +40f01d0c811c49a22b7557f7d8d06e3af6b4cabd 2022-11-17T21:47:35-05:00 Limit request retrying to []byte request bodies diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 59e7fcaf39..124b5d6afa 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,28 +1,26 @@ -https://github.com/openshift/cluster-dns-operator embedded-component ccd55d043b09c64ed4d5d8ed102cc2a0cb09cb3b -https://github.com/openshift/cluster-ingress-operator embedded-component 8eb2c667fd31a67d52c4d0ea6c5f014a9fe2ce0d +https://github.com/openshift/cluster-dns-operator embedded-component d96022a4d0d091955d73e7e99fc8cc81db56c86a +https://github.com/openshift/cluster-ingress-operator embedded-component 6aa482c551de22016dc2b6c87ca11ef4ac2be04d https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 6ad0a9407be5d5229d605665986899be4b531b5e https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 4ca346ef97def3697f1aa0368c9b35459b9b2f59 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component d3978864fb58063235be176c18fe50457b5223f3 -https://github.com/openshift/cluster-network-operator embedded-component 4d5a093d41e45def540ffbe4c5dc214550864d53 +https://github.com/openshift/cluster-network-operator embedded-component c0208114e49b3ee34bb073ea7d09cf82273573b0 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 7867c26e6c91e2cc279317dfc080befe63a60749 https://github.com/openshift/cluster-policy-controller embedded-component ac01e3463245f2dd9312145368d7f4099a8a0bb9 https://github.com/openshift/etcd embedded-component 13c18c444a8c6a86ccbba16cce664008f5f948bd -https://github.com/openshift/kubernetes embedded-component 89232647de67ea787d339b1bd7c780a0ed97f3f9 -https://github.com/openshift/machine-config-operator embedded-component c078cdd2614e409faf0e9b13d97c426c065a71da -https://github.com/openshift/openshift-controller-manager embedded-component 1c8021fcf40ccdc95a16bd8569b5ce53ecc09f0a +https://github.com/openshift/kubernetes embedded-component 8cfbab7d1c15576e72726dea70563f0d65d220eb +https://github.com/openshift/machine-config-operator embedded-component a8692a763fe156990882489908584be2363a3303 +https://github.com/openshift/openshift-controller-manager embedded-component 87de83867ac51730f506138ee790a56ca21d9fc9 https://github.com/openshift/route-controller-manager embedded-component d7a8e22db412b6fabb7028ca0da8de8f3d9ac3c3 https://github.com/openshift/service-ca-operator embedded-component 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a -https://github.com/openshift/oc image-amd64 83fd126d7c7c598b1bfa398641d330e24596c2cf +https://github.com/openshift/oc image-amd64 02362102a19e81ebecb90906f41687e4e4350dfe https://github.com/openshift/coredns image-amd64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb https://github.com/openshift/router image-amd64 69eda4bd427c3f27d9993afa35461f4fc1dc0357 https://github.com/openshift/kube-rbac-proxy image-amd64 0aa2830ed7359fd8cd0e2f7db0ed96a733c5990e -https://github.com/openshift/ovn-kubernetes image-amd64 b244c306b58db1afb6bdd9124bfbcadc7aec8371 -https://github.com/openshift/kubernetes image-amd64 89232647de67ea787d339b1bd7c780a0ed97f3f9 +https://github.com/openshift/kubernetes image-amd64 8cfbab7d1c15576e72726dea70563f0d65d220eb https://github.com/openshift/service-ca-operator image-amd64 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a -https://github.com/openshift/oc image-arm64 83fd126d7c7c598b1bfa398641d330e24596c2cf +https://github.com/openshift/oc image-arm64 02362102a19e81ebecb90906f41687e4e4350dfe https://github.com/openshift/coredns image-arm64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb https://github.com/openshift/router image-arm64 69eda4bd427c3f27d9993afa35461f4fc1dc0357 https://github.com/openshift/kube-rbac-proxy image-arm64 0aa2830ed7359fd8cd0e2f7db0ed96a733c5990e -https://github.com/openshift/ovn-kubernetes image-arm64 b244c306b58db1afb6bdd9124bfbcadc7aec8371 -https://github.com/openshift/kubernetes image-arm64 89232647de67ea787d339b1bd7c780a0ed97f3f9 +https://github.com/openshift/kubernetes image-arm64 8cfbab7d1c15576e72726dea70563f0d65d220eb https://github.com/openshift/service-ca-operator image-arm64 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index b526a3d52b..d26e518b25 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.13.0-0.nightly-2023-02-27-101545" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-02-28-171639" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.13.0-0.nightly-2023-03-05-104719" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-03-05-104718" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12" diff --git a/vendor/github.com/openshift/library-go/pkg/apiserver/admission/admissiontimeout/timeoutadmission.go b/vendor/github.com/openshift/library-go/pkg/apiserver/admission/admissiontimeout/timeoutadmission.go index 8667304edf..2f290641c1 100644 --- a/vendor/github.com/openshift/library-go/pkg/apiserver/admission/admissiontimeout/timeoutadmission.go +++ b/vendor/github.com/openshift/library-go/pkg/apiserver/admission/admissiontimeout/timeoutadmission.go @@ -3,6 +3,8 @@ package admissiontimeout import ( "context" "fmt" + "net/http" + "runtime" "time" "k8s.io/apimachinery/pkg/api/errors" @@ -29,17 +31,38 @@ func (p pluginHandlerWithTimeout) Admit(ctx context.Context, a admission.Attribu return nil } - admissionDone := make(chan struct{}) - admissionErr := fmt.Errorf("default to mutation error") + type result struct { + admissionErr error + panicErr error + } + // if a timeout occurs, we don't want the child goroutine to hang forever + resultCh := make(chan result, 1) go func() { - defer utilruntime.HandleCrash() - defer close(admissionDone) - admissionErr = mutatingHandler.Admit(ctx, a, o) + r := result{} + // NOTE: panics don't cross goroutine boundaries, so we have to handle + // the error here, we can't call utilruntime.HandleCrash here, then it + // will cause the apiserver to crash. + // We also need to make sure that the panic is propagated to the caller. + // TODO: use the reusable panic handler once + // https://github.com/kubernetes/kubernetes/pull/115564 merges. + defer func() { + if err := recover(); err != nil { + r.panicErr = fmt.Errorf("admission panic'd: %v", stack(err)) + utilruntime.HandleError(r.panicErr) + } + resultCh <- r + }() + + r.admissionErr = mutatingHandler.Admit(ctx, a, o) }() select { - case <-admissionDone: - return admissionErr + case r := <-resultCh: + if r.panicErr != nil { + // this panic will propagate to net/http + panic(r.panicErr.(interface{})) + } + return r.admissionErr case <-time.After(p.timeout): return errors.NewInternalError(fmt.Errorf("admission plugin %q failed to complete mutation in %v", p.name, p.timeout)) } @@ -51,18 +74,53 @@ func (p pluginHandlerWithTimeout) Validate(ctx context.Context, a admission.Attr return nil } - admissionDone := make(chan struct{}) - admissionErr := fmt.Errorf("default to validation error") + type result struct { + admissionErr error + panicErr error + } + // if a timeout occurs, we don't want the child goroutine to hang forever + resultCh := make(chan result, 1) go func() { - defer utilruntime.HandleCrash() - defer close(admissionDone) - admissionErr = validatingHandler.Validate(ctx, a, o) + r := result{} + // NOTE: panics don't cross goroutine boundaries, so we have to handle + // the error here, we can't call utilruntime.HandleCrash here, then it + // will cause the apiserver to crash. + // We also need to make sure that the panic is propagated to the caller. + // TODO: use the reusable panic handler once + // https://github.com/kubernetes/kubernetes/pull/115564 merges. + defer func() { + if err := recover(); err != nil { + r.panicErr = fmt.Errorf("admission panic'd: %v", stack(err)) + utilruntime.HandleError(r.panicErr) + } + resultCh <- r + }() + + r.admissionErr = validatingHandler.Validate(ctx, a, o) }() select { - case <-admissionDone: - return admissionErr + case r := <-resultCh: + if r.panicErr != nil { + // this panic will propagate to net/http + panic(r.panicErr.(interface{})) + } + return r.admissionErr case <-time.After(p.timeout): return errors.NewInternalError(fmt.Errorf("admission plugin %q failed to complete validation in %v", p.name, p.timeout)) } } + +func stack(recovered interface{}) interface{} { + // do not wrap the sentinel ErrAbortHandler panic value + if recovered == http.ErrAbortHandler { + return recovered + } + + // Same as stdlib http server code. Manually allocate stack + // trace buffer size to prevent excessively large logs + const size = 64 << 10 + buf := make([]byte, size) + buf = buf[:runtime.Stack(buf, false)] + return fmt.Sprintf("%v\n%s", recovered, buf) +} diff --git a/vendor/k8s.io/api/core/v1/generated.proto b/vendor/k8s.io/api/core/v1/generated.proto index 854bcdeba0..9264bfd98b 100644 --- a/vendor/k8s.io/api/core/v1/generated.proto +++ b/vendor/k8s.io/api/core/v1/generated.proto @@ -4514,7 +4514,8 @@ message ResourceRequirements { // // This field is immutable. // - // +listType=set + // +listType=map + // +listMapKey=name // +featureGate=DynamicResourceAllocation // +optional repeated ResourceClaim claims = 3; diff --git a/vendor/k8s.io/api/core/v1/types.go b/vendor/k8s.io/api/core/v1/types.go index 87230fd918..4be1df0c1d 100644 --- a/vendor/k8s.io/api/core/v1/types.go +++ b/vendor/k8s.io/api/core/v1/types.go @@ -2322,7 +2322,8 @@ type ResourceRequirements struct { // // This field is immutable. // - // +listType=set + // +listType=map + // +listMapKey=name // +featureGate=DynamicResourceAllocation // +optional Claims []ResourceClaim `json:"claims,omitempty" protobuf:"bytes,3,opt,name=claims"` diff --git a/vendor/k8s.io/apimachinery/pkg/util/httpstream/spdy/roundtripper.go b/vendor/k8s.io/apimachinery/pkg/util/httpstream/spdy/roundtripper.go index ea0481799b..27c3d2d564 100644 --- a/vendor/k8s.io/apimachinery/pkg/util/httpstream/spdy/roundtripper.go +++ b/vendor/k8s.io/apimachinery/pkg/util/httpstream/spdy/roundtripper.go @@ -184,12 +184,15 @@ func (s *SpdyRoundTripper) dialWithHttpProxy(req *http.Request, proxyURL *url.UR //nolint:staticcheck // SA1019 ignore deprecated httputil.NewProxyClientConn proxyClientConn := httputil.NewProxyClientConn(proxyDialConn, nil) - _, err = proxyClientConn.Do(&proxyReq) + response, err := proxyClientConn.Do(&proxyReq) //nolint:staticcheck // SA1019 ignore deprecated httputil.ErrPersistEOF: it might be // returned from the invocation of proxyClientConn.Do if err != nil && err != httputil.ErrPersistEOF { return nil, err } + if response != nil && response.StatusCode >= 300 || response.StatusCode < 200 { + return nil, fmt.Errorf("CONNECT request to %s returned response: %s", proxyURL.Redacted(), response.Status) + } rwc, _ := proxyClientConn.Hijack() @@ -294,9 +297,10 @@ func (s *SpdyRoundTripper) proxyAuth(proxyURL *url.URL) string { if proxyURL == nil || proxyURL.User == nil { return "" } - credentials := proxyURL.User.String() - encodedAuth := base64.StdEncoding.EncodeToString([]byte(credentials)) - return fmt.Sprintf("Basic %s", encodedAuth) + username := proxyURL.User.Username() + password, _ := proxyURL.User.Password() + auth := username + ":" + password + return "Basic " + base64.StdEncoding.EncodeToString([]byte(auth)) } // RoundTrip executes the Request and upgrades it. After a successful upgrade, diff --git a/vendor/k8s.io/apiserver/pkg/server/egressselector/egress_selector.go b/vendor/k8s.io/apiserver/pkg/server/egressselector/egress_selector.go index 661c5ad9a7..6d27633971 100644 --- a/vendor/k8s.io/apiserver/pkg/server/egressselector/egress_selector.go +++ b/vendor/k8s.io/apiserver/pkg/server/egressselector/egress_selector.go @@ -36,6 +36,7 @@ import ( utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apiserver/pkg/apis/apiserver" egressmetrics "k8s.io/apiserver/pkg/server/egressselector/metrics" + compbasemetrics "k8s.io/component-base/metrics" "k8s.io/component-base/tracing" "k8s.io/klog/v2" client "sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client" @@ -43,6 +44,10 @@ import ( var directDialer utilnet.DialFunc = http.DefaultTransport.(*http.Transport).DialContext +func init() { + client.Metrics.RegisterMetrics(compbasemetrics.NewKubeRegistry().Registerer()) +} + // EgressSelector is the map of network context type to context dialer, for network egress. type EgressSelector struct { egressToDialer map[EgressType]utilnet.DialFunc diff --git a/vendor/k8s.io/client-go/applyconfigurations/internal/internal.go b/vendor/k8s.io/client-go/applyconfigurations/internal/internal.go index afad3b12e1..4f3636b27d 100644 --- a/vendor/k8s.io/client-go/applyconfigurations/internal/internal.go +++ b/vendor/k8s.io/client-go/applyconfigurations/internal/internal.go @@ -6553,6 +6553,8 @@ var schemaYAML = typed.YAMLObject(`types: elementType: namedType: io.k8s.api.core.v1.ResourceClaim elementRelationship: associative + keys: + - name - name: limits type: map: diff --git a/vendor/k8s.io/client-go/discovery/discovery_client.go b/vendor/k8s.io/client-go/discovery/discovery_client.go index 9025e888ec..43906190fb 100644 --- a/vendor/k8s.io/client-go/discovery/discovery_client.go +++ b/vendor/k8s.io/client-go/discovery/discovery_client.go @@ -196,7 +196,7 @@ func (d *DiscoveryClient) GroupsAndMaybeResources() (*metav1.APIGroupList, map[s } // Discovery groups and (possibly) resources downloaded from /apis. apiGroups, apiResources, aerr := d.downloadAPIs() - if err != nil { + if aerr != nil { return nil, nil, aerr } // Merge apis groups into the legacy groups. diff --git a/vendor/k8s.io/client-go/rest/request.go b/vendor/k8s.io/client-go/rest/request.go index 560f73f002..96e725692d 100644 --- a/vendor/k8s.io/client-go/rest/request.go +++ b/vendor/k8s.io/client-go/rest/request.go @@ -34,6 +34,7 @@ import ( "time" "golang.org/x/net/http2" + "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -116,8 +117,11 @@ type Request struct { subresource string // output - err error - body io.Reader + err error + + // only one of body / bodyBytes may be set. requests using body are not retriable. + body io.Reader + bodyBytes []byte retryFn requestRetryFunc } @@ -443,12 +447,15 @@ func (r *Request) Body(obj interface{}) *Request { return r } glogBody("Request Body", data) - r.body = bytes.NewReader(data) + r.body = nil + r.bodyBytes = data case []byte: glogBody("Request Body", t) - r.body = bytes.NewReader(t) + r.body = nil + r.bodyBytes = t case io.Reader: r.body = t + r.bodyBytes = nil case runtime.Object: // callers may pass typed interface pointers, therefore we must check nil with reflection if reflect.ValueOf(t).IsNil() { @@ -465,7 +472,8 @@ func (r *Request) Body(obj interface{}) *Request { return r } glogBody("Request Body", data) - r.body = bytes.NewReader(data) + r.body = nil + r.bodyBytes = data r.SetHeader("Content-Type", r.c.content.ContentType) default: r.err = fmt.Errorf("unknown type used for body: %+v", obj) @@ -825,9 +833,6 @@ func (r *Request) Stream(ctx context.Context) (io.ReadCloser, error) { if err != nil { return nil, err } - if r.body != nil { - req.Body = io.NopCloser(r.body) - } resp, err := client.Do(req) updateURLMetrics(ctx, r, resp, err) retry.After(ctx, r, resp, err) @@ -889,8 +894,20 @@ func (r *Request) requestPreflightCheck() error { } func (r *Request) newHTTPRequest(ctx context.Context) (*http.Request, error) { + var body io.Reader + switch { + case r.body != nil && r.bodyBytes != nil: + return nil, fmt.Errorf("cannot set both body and bodyBytes") + case r.body != nil: + body = r.body + case r.bodyBytes != nil: + // Create a new reader specifically for this request. + // Giving each request a dedicated reader allows retries to avoid races resetting the request body. + body = bytes.NewReader(r.bodyBytes) + } + url := r.URL().String() - req, err := http.NewRequest(r.verb, url, r.body) + req, err := http.NewRequest(r.verb, url, body) if err != nil { return nil, err } diff --git a/vendor/k8s.io/client-go/rest/with_retry.go b/vendor/k8s.io/client-go/rest/with_retry.go index b04e3e9eff..207060a5cc 100644 --- a/vendor/k8s.io/client-go/rest/with_retry.go +++ b/vendor/k8s.io/client-go/rest/with_retry.go @@ -153,6 +153,11 @@ func (r *withRetry) IsNextRetry(ctx context.Context, restReq *Request, httpReq * return false } + if restReq.body != nil { + // we have an opaque reader, we can't safely reset it + return false + } + r.attempts++ r.retryAfter = &RetryAfter{Attempt: r.attempts} if r.attempts > r.maxRetries { @@ -209,18 +214,6 @@ func (r *withRetry) Before(ctx context.Context, request *Request) error { return nil } - // At this point we've made atleast one attempt, post which the response - // body should have been fully read and closed in order for it to be safe - // to reset the request body before we reconnect, in order for us to reuse - // the same TCP connection. - if seeker, ok := request.body.(io.Seeker); ok && request.body != nil { - if _, err := seeker.Seek(0, io.SeekStart); err != nil { - err = fmt.Errorf("failed to reset the request body while retrying a request: %v", err) - r.trackPreviousError(err) - return err - } - } - // if we are here, we have made attempt(s) at least once before. if request.backoff != nil { delay := request.backoff.CalculateBackoff(url) diff --git a/vendor/k8s.io/component-base/metrics/registry.go b/vendor/k8s.io/component-base/metrics/registry.go index af7d1b8bff..9a7138c11f 100644 --- a/vendor/k8s.io/component-base/metrics/registry.go +++ b/vendor/k8s.io/component-base/metrics/registry.go @@ -157,6 +157,10 @@ type KubeRegistry interface { Reset() // RegisterMetaMetrics registers metrics about the number of registered metrics. RegisterMetaMetrics() + // Registerer exposes the underlying prometheus registerer + Registerer() prometheus.Registerer + // Gatherer exposes the underlying prometheus gatherer + Gatherer() prometheus.Gatherer } // kubeRegistry is a wrapper around a prometheus registry-type object. Upon initialization @@ -188,6 +192,16 @@ func (kr *kubeRegistry) Register(c Registerable) error { return nil } +// Registerer exposes the underlying prometheus.Registerer +func (kr *kubeRegistry) Registerer() prometheus.Registerer { + return kr.PromRegistry +} + +// Gatherer exposes the underlying prometheus.Gatherer +func (kr *kubeRegistry) Gatherer() prometheus.Gatherer { + return kr.PromRegistry +} + // MustRegister works like Register but registers any number of // Collectors and panics upon the first registration that causes an // error. diff --git a/vendor/k8s.io/kube-aggregator/pkg/apiserver/handler_discovery.go b/vendor/k8s.io/kube-aggregator/pkg/apiserver/handler_discovery.go index 401c42c3aa..860806e689 100644 --- a/vendor/k8s.io/kube-aggregator/pkg/apiserver/handler_discovery.go +++ b/vendor/k8s.io/kube-aggregator/pkg/apiserver/handler_discovery.go @@ -226,9 +226,6 @@ func (dm *discoveryManager) fetchFreshDiscoveryForService(gv metav1.GroupVersion switch writer.respCode { case http.StatusNotModified: - dm.resultsLock.Lock() - defer dm.resultsLock.Unlock() - // Keep old entry, update timestamp cached = cachedResult{ discovery: cached.discovery, diff --git a/vendor/k8s.io/kubectl/pkg/cmd/delete/delete.go b/vendor/k8s.io/kubectl/pkg/cmd/delete/delete.go index 2c1887e6ac..ad04de65bc 100644 --- a/vendor/k8s.io/kubectl/pkg/cmd/delete/delete.go +++ b/vendor/k8s.io/kubectl/pkg/cmd/delete/delete.go @@ -134,7 +134,7 @@ type DeleteOptions struct { Result *resource.Result genericclioptions.IOStreams - warningPrinter *printers.WarningPrinter + WarningPrinter *printers.WarningPrinter } func NewCmdDelete(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.Command { @@ -232,7 +232,10 @@ func (o *DeleteOptions) Complete(f cmdutil.Factory, args []string, cmd *cobra.Co } } - o.warningPrinter = printers.NewWarningPrinter(o.ErrOut, printers.WarningPrinterOptions{Color: term.AllowsColorOutput(o.ErrOut)}) + // Set default WarningPrinter if not already set. + if o.WarningPrinter == nil { + o.WarningPrinter = printers.NewWarningPrinter(o.ErrOut, printers.WarningPrinterOptions{Color: term.AllowsColorOutput(o.ErrOut)}) + } return nil } @@ -248,13 +251,13 @@ func (o *DeleteOptions) Validate() error { if o.DeleteAll && len(o.FieldSelector) > 0 { return fmt.Errorf("cannot set --all and --field-selector at the same time") } - if o.warningPrinter == nil { - return fmt.Errorf("warningPrinter can not be used without initialization") + if o.WarningPrinter == nil { + return fmt.Errorf("WarningPrinter can not be used without initialization") } switch { case o.GracePeriod == 0 && o.ForceDeletion: - o.warningPrinter.Print("Immediate deletion does not wait for confirmation that the running resource has been terminated. The resource may continue to run on the cluster indefinitely.") + o.WarningPrinter.Print("Immediate deletion does not wait for confirmation that the running resource has been terminated. The resource may continue to run on the cluster indefinitely.") case o.GracePeriod > 0 && o.ForceDeletion: return fmt.Errorf("--force and --grace-period greater than 0 cannot be specified together") } @@ -318,7 +321,7 @@ func (o *DeleteOptions) DeleteResult(r *resource.Result) error { options.PropagationPolicy = &o.CascadingStrategy if warnClusterScope && info.Mapping.Scope.Name() == meta.RESTScopeNameRoot { - o.warningPrinter.Print("deleting cluster-scoped resources, not scoped to the provided namespace") + o.WarningPrinter.Print("deleting cluster-scoped resources, not scoped to the provided namespace") warnClusterScope = false } 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 a4ef2fbb3c..07e120d787 100644 --- a/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go +++ b/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go @@ -170,7 +170,7 @@ cluster's shared state through which all other components interact.`, } // add feature enablement metrics utilfeature.DefaultMutableFeatureGate.AddMetrics() - return Run(completedOptions, cmd.Context().Done()) + return Run(completedOptions, genericapiserver.SetupSignalHandlerIgnoringFurtherSignals()) }, Args: func(cmd *cobra.Command, args []string) error { for _, arg := range args { diff --git a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go index c281a5bfe8..acb364d1e8 100644 --- a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go +++ b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go @@ -35,6 +35,7 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/wait" genericfeatures "k8s.io/apiserver/pkg/features" + "k8s.io/apiserver/pkg/server" "k8s.io/apiserver/pkg/server/healthz" "k8s.io/apiserver/pkg/server/mux" utilfeature "k8s.io/apiserver/pkg/util/feature" @@ -153,7 +154,8 @@ controller, and serviceaccounts controller.`, // add feature enablement metrics utilfeature.DefaultMutableFeatureGate.AddMetrics() - return Run(c.Complete(), cmd.Context().Done()) + stopCh := server.SetupSignalHandler() + return Run(c.Complete(), stopCh) }, Args: func(cmd *cobra.Command, args []string) error { for _, arg := range args { diff --git a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go index 510c99f923..1b6e863c10 100644 --- a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go +++ b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go @@ -12,6 +12,7 @@ import ( "github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccadmission" authorizationrestrictusers "k8s.io/kubernetes/openshift-kube-apiserver/admission/authorization/restrictusers" quotaclusterresourceoverride "k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/clusterresourceoverride" + "k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/managednode" "k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/managementcpusoverride" quotarunonceduration "k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/runonceduration" "k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/customresourcevalidationregistration" @@ -30,6 +31,7 @@ func RegisterOpenshiftKubeAdmissionPlugins(plugins *admission.Plugins) { imagepolicy.Register(plugins) ingressadmission.Register(plugins) managementcpusoverride.Register(plugins) + managednode.Register(plugins) projectnodeenv.Register(plugins) quotaclusterresourceoverride.Register(plugins) quotaclusterresourcequota.Register(plugins) @@ -71,6 +73,7 @@ var ( "route.openshift.io/IngressAdmission", hostassignment.PluginName, // "route.openshift.io/RouteHostAssignment" csiinlinevolumesecurity.PluginName, // "storage.openshift.io/CSIInlineVolumeSecurity" + managednode.PluginName, // "autoscaling.openshift.io/ManagedNode" } // openshiftAdmissionPluginsForKubeAfterResourceQuota are the plugins to add after ResourceQuota plugin 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..45baad88b8 100644 --- a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go +++ b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go @@ -6,17 +6,36 @@ import ( "github.com/openshift/apiserver-library-go/pkg/admission/imagepolicy" "github.com/openshift/apiserver-library-go/pkg/admission/imagepolicy/imagereferencemutators" + "github.com/openshift/apiserver-library-go/pkg/admission/quota/clusterresourcequota" "github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccadmission" + apiclientv1 "github.com/openshift/client-go/apiserver/clientset/versioned/typed/apiserver/v1" + configclient "github.com/openshift/client-go/config/clientset/versioned" + configv1informer "github.com/openshift/client-go/config/informers/externalversions" + quotaclient "github.com/openshift/client-go/quota/clientset/versioned" + quotainformer "github.com/openshift/client-go/quota/informers/externalversions" + quotav1informer "github.com/openshift/client-go/quota/informers/externalversions/quota/v1" securityv1client "github.com/openshift/client-go/security/clientset/versioned" securityv1informer "github.com/openshift/client-go/security/informers/externalversions" + userclient "github.com/openshift/client-go/user/clientset/versioned" + userinformer "github.com/openshift/client-go/user/informers/externalversions" "github.com/openshift/library-go/pkg/apiserver/admission/admissionrestconfig" "github.com/openshift/library-go/pkg/apiserver/apiserverconfig" + "github.com/openshift/library-go/pkg/quota/clusterquotamapping" "k8s.io/apiserver/pkg/admission" + "k8s.io/apiserver/pkg/quota/v1/generic" genericapiserver "k8s.io/apiserver/pkg/server" clientgoinformers "k8s.io/client-go/informers" + corev1informers "k8s.io/client-go/informers/core/v1" "k8s.io/client-go/rest" + "k8s.io/client-go/tools/cache" + "k8s.io/kubernetes/openshift-kube-apiserver/admission/authorization/restrictusers" + "k8s.io/kubernetes/openshift-kube-apiserver/admission/authorization/restrictusers/usercache" + "k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/managednode" + "k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/managementcpusoverride" "k8s.io/kubernetes/openshift-kube-apiserver/admission/scheduler/nodeenv" "k8s.io/kubernetes/openshift-kube-apiserver/enablement" + "k8s.io/kubernetes/openshift-kube-apiserver/filters/apirequestcount" + "k8s.io/kubernetes/pkg/quota/v1/install" // magnet to get authorizer package in hack/update-vendor.sh _ "github.com/openshift/library-go/pkg/authorization/hardcodedauthorizer" @@ -41,12 +60,25 @@ func OpenShiftKubeAPIServerConfigPatch(genericConfig *genericapiserver.Config, k genericConfig.LongRunningFunc = apiserverconfig.IsLongRunningRequest // ADMISSION + clusterQuotaMappingController := newClusterQuotaMappingController(kubeInformers.Core().V1().Namespaces(), openshiftInformers.OpenshiftQuotaInformers.Quota().V1().ClusterResourceQuotas()) + genericConfig.AddPostStartHookOrDie("quota.openshift.io-clusterquotamapping", func(context genericapiserver.PostStartHookContext) error { + go clusterQuotaMappingController.Run(5, context.StopCh) + return nil + }) *pluginInitializers = append(*pluginInitializers, imagepolicy.NewInitializer(imagereferencemutators.KubeImageMutators{}, enablement.OpenshiftConfig().ImagePolicyConfig.InternalRegistryHostname), + restrictusers.NewInitializer(openshiftInformers.getOpenshiftUserInformers()), sccadmission.NewInitializer(openshiftInformers.getOpenshiftSecurityInformers().Security().V1().SecurityContextConstraints()), + clusterresourcequota.NewInitializer( + openshiftInformers.getOpenshiftQuotaInformers().Quota().V1().ClusterResourceQuotas(), + clusterQuotaMappingController.GetClusterQuotaMapper(), + generic.NewRegistry(install.NewQuotaConfigurationForAdmission().Evaluators()), + ), nodeenv.NewInitializer(enablement.OpenshiftConfig().ProjectConfig.DefaultNodeSelector), admissionrestconfig.NewInitializer(*rest.CopyConfig(genericConfig.LoopbackClientConfig)), + managementcpusoverride.NewInitializer(openshiftInformers.getOpenshiftInfraInformers().Config().V1().Infrastructures()), + managednode.NewInitializer(openshiftInformers.getOpenshiftInfraInformers().Config().V1().Infrastructures()), ) // This is needed in order to have the correct initializers for the SCC admission plugin which is used to mutate @@ -56,6 +88,26 @@ func OpenShiftKubeAPIServerConfigPatch(genericConfig *genericapiserver.Config, k enablement.SCCAdmissionPlugin.SetExternalKubeInformerFactory(kubeInformers) // END ADMISSION + // HANDLER CHAIN (with oauth server and web console) + apiserverClient, err := apiclientv1.NewForConfig(makeJSONRESTConfig(genericConfig.LoopbackClientConfig)) + if err != nil { + return err + } + apiRequestCountController := apirequestcount.NewController(apiserverClient.APIRequestCounts(), nodeFor()) + genericConfig.AddPostStartHook("openshift.io-api-request-count-filter", func(context genericapiserver.PostStartHookContext) error { + go apiRequestCountController.Start(context.StopCh) + return nil + }) + genericConfig.BuildHandlerChainFunc, err = BuildHandlerChain( + enablement.OpenshiftConfig().AuthConfig.OAuthMetadataFile, + kubeInformers.Core().V1().ConfigMaps(), + apiRequestCountController, + ) + if err != nil { + return err + } + // END HANDLER CHAIN + openshiftAPIServiceReachabilityCheck := newOpenshiftAPIServiceReachabilityCheck() oauthAPIServiceReachabilityCheck := newOAuthPIServiceReachabilityCheck() genericConfig.ReadyzChecks = append(genericConfig.ReadyzChecks, openshiftAPIServiceReachabilityCheck, oauthAPIServiceReachabilityCheck) @@ -97,30 +149,69 @@ func newInformers(loopbackClientConfig *rest.Config) (*kubeAPIServerInformers, e // ClusterResourceQuota is served using CRD resource any status update must use JSON jsonLoopbackClientConfig := makeJSONRESTConfig(loopbackClientConfig) + quotaClient, err := quotaclient.NewForConfig(jsonLoopbackClientConfig) + if err != nil { + return nil, err + } securityClient, err := securityv1client.NewForConfig(jsonLoopbackClientConfig) if err != nil { return nil, err } + userClient, err := userclient.NewForConfig(loopbackClientConfig) + if err != nil { + return nil, err + } + configClient, err := configclient.NewForConfig(loopbackClientConfig) + if err != nil { + return nil, err + } // TODO find a single place to create and start informers. During the 1.7 rebase this will come more naturally in a config object, // before then we should try to eliminate our direct to storage access. It's making us do weird things. const defaultInformerResyncPeriod = 10 * time.Minute ret := &kubeAPIServerInformers{ + OpenshiftQuotaInformers: quotainformer.NewSharedInformerFactory(quotaClient, defaultInformerResyncPeriod), OpenshiftSecurityInformers: securityv1informer.NewSharedInformerFactory(securityClient, defaultInformerResyncPeriod), + OpenshiftUserInformers: userinformer.NewSharedInformerFactory(userClient, defaultInformerResyncPeriod), + OpenshiftConfigInformers: configv1informer.NewSharedInformerFactory(configClient, defaultInformerResyncPeriod), + } + if err := ret.OpenshiftUserInformers.User().V1().Groups().Informer().AddIndexers(cache.Indexers{ + usercache.ByUserIndexName: usercache.ByUserIndexKeys, + }); err != nil { + return nil, err } return ret, nil } type kubeAPIServerInformers struct { + OpenshiftQuotaInformers quotainformer.SharedInformerFactory OpenshiftSecurityInformers securityv1informer.SharedInformerFactory + OpenshiftUserInformers userinformer.SharedInformerFactory + OpenshiftConfigInformers configv1informer.SharedInformerFactory } +func (i *kubeAPIServerInformers) getOpenshiftQuotaInformers() quotainformer.SharedInformerFactory { + return i.OpenshiftQuotaInformers +} func (i *kubeAPIServerInformers) getOpenshiftSecurityInformers() securityv1informer.SharedInformerFactory { return i.OpenshiftSecurityInformers } +func (i *kubeAPIServerInformers) getOpenshiftUserInformers() userinformer.SharedInformerFactory { + return i.OpenshiftUserInformers +} +func (i *kubeAPIServerInformers) getOpenshiftInfraInformers() configv1informer.SharedInformerFactory { + return i.OpenshiftConfigInformers +} func (i *kubeAPIServerInformers) Start(stopCh <-chan struct{}) { + i.OpenshiftQuotaInformers.Start(stopCh) i.OpenshiftSecurityInformers.Start(stopCh) + i.OpenshiftUserInformers.Start(stopCh) + i.OpenshiftConfigInformers.Start(stopCh) +} + +func newClusterQuotaMappingController(nsInternalInformer corev1informers.NamespaceInformer, clusterQuotaInformer quotav1informer.ClusterResourceQuotaInformer) *clusterquotamapping.ClusterQuotaMappingController { + return clusterquotamapping.NewClusterQuotaMappingController(nsInternalInformer, clusterQuotaInformer) } diff --git a/vendor/k8s.io/kubernetes/pkg/controller/daemon/daemon_controller.go b/vendor/k8s.io/kubernetes/pkg/controller/daemon/daemon_controller.go index 3d35977a97..e03928b013 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/daemon/daemon_controller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/daemon/daemon_controller.go @@ -898,6 +898,32 @@ func (dsc *DaemonSetsController) podsShouldBeOnNode( return nodesNeedingDaemonPods, podsToDelete } +func (dsc *DaemonSetsController) updateDaemonSet(ctx context.Context, ds *apps.DaemonSet, nodeList []*v1.Node, hash, key string, old []*apps.ControllerRevision) error { + err := dsc.manage(ctx, ds, nodeList, hash) + if err != nil { + return err + } + + // Process rolling updates if we're ready. + if dsc.expectations.SatisfiedExpectations(key) { + switch ds.Spec.UpdateStrategy.Type { + case apps.OnDeleteDaemonSetStrategyType: + case apps.RollingUpdateDaemonSetStrategyType: + err = dsc.rollingUpdate(ctx, ds, nodeList, hash) + } + if err != nil { + return err + } + } + + err = dsc.cleanupHistory(ctx, ds, old) + if err != nil { + return fmt.Errorf("failed to clean up revisions of DaemonSet: %w", err) + } + + return nil +} + // manage manages the scheduling and running of Pods of ds on nodes. // After figuring out which nodes should run a Pod of ds but not yet running one and // which nodes should not run a Pod of ds but currently running one, it calls function @@ -1147,7 +1173,7 @@ func (dsc *DaemonSetsController) updateDaemonSetStatus(ctx context.Context, ds * err = storeDaemonSetStatus(ctx, dsc.kubeClient.AppsV1().DaemonSets(ds.Namespace), ds, desiredNumberScheduled, currentNumberScheduled, numberMisscheduled, numberReady, updatedNumberScheduled, numberAvailable, numberUnavailable, updateObservedGen) if err != nil { - return fmt.Errorf("error storing status for daemon set %#v: %v", ds, err) + return fmt.Errorf("error storing status for daemon set %#v: %w", ds, err) } // Resync the DaemonSet after MinReadySeconds as a last line of defense to guard against clock-skew. @@ -1221,29 +1247,21 @@ func (dsc *DaemonSetsController) syncDaemonSet(ctx context.Context, key string) return dsc.updateDaemonSetStatus(ctx, ds, nodeList, hash, false) } - err = dsc.manage(ctx, ds, nodeList, hash) - if err != nil { + err = dsc.updateDaemonSet(ctx, ds, nodeList, hash, dsKey, old) + statusErr := dsc.updateDaemonSetStatus(ctx, ds, nodeList, hash, true) + switch { + case err != nil && statusErr != nil: + // If there was an error, and we failed to update status, + // log it and return the original error. + klog.ErrorS(statusErr, "Failed to update status", "daemonSet", klog.KObj(ds)) return err + case err != nil: + return err + case statusErr != nil: + return statusErr } - // Process rolling updates if we're ready. - if dsc.expectations.SatisfiedExpectations(dsKey) { - switch ds.Spec.UpdateStrategy.Type { - case apps.OnDeleteDaemonSetStrategyType: - case apps.RollingUpdateDaemonSetStrategyType: - err = dsc.rollingUpdate(ctx, ds, nodeList, hash) - } - if err != nil { - return err - } - } - - err = dsc.cleanupHistory(ctx, ds, old) - if err != nil { - return fmt.Errorf("failed to clean up revisions of DaemonSet: %v", err) - } - - return dsc.updateDaemonSetStatus(ctx, ds, nodeList, hash, true) + return nil } // NodeShouldRunDaemonPod checks a set of preconditions against a (node,daemonset) and returns a diff --git a/vendor/k8s.io/kubernetes/pkg/controller/job/job_controller.go b/vendor/k8s.io/kubernetes/pkg/controller/job/job_controller.go index 81416671ce..c0d508e27b 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/job/job_controller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/job/job_controller.go @@ -304,8 +304,10 @@ func (jm *Controller) updatePod(old, cur interface{}) { return } - // the only time we want the backoff to kick-in, is when the pod failed - immediate := curPod.Status.Phase != v1.PodFailed + // the only time we want the backoff to kick-in, is when the pod failed for the first time. + // we don't want to re-calculate backoff for an update event when the tracking finalizer + // for a failed pod is removed. + immediate := !(curPod.Status.Phase == v1.PodFailed && oldPod.Status.Phase != v1.PodFailed) // Don't check if oldPod has the finalizer, as during ownership transfer // finalizers might be re-added and removed again in behalf of the new owner. @@ -498,7 +500,9 @@ func (jm *Controller) enqueueControllerDelayed(obj interface{}, immediate bool, backoff := delay if !immediate { - backoff = getBackoff(jm.queue, key) + if calculatedBackoff := getBackoff(jm.queue, key); calculatedBackoff > 0 { + backoff = calculatedBackoff + } } // TODO: Handle overlapping controllers better. Either disallow them at admission time or @@ -872,6 +876,12 @@ func (jm *Controller) syncJob(ctx context.Context, key string) (forget bool, rEr job.Status.Ready = ready err = jm.trackJobStatusAndRemoveFinalizers(ctx, &job, pods, prevSucceededIndexes, *uncounted, expectedRmFinalizers, finishedCondition, needsStatusUpdate) if err != nil { + if apierrors.IsConflict(err) { + // we probably have a stale informer cache + // so don't return an error to avoid backoff + jm.enqueueController(&job, false) + return false, nil + } return false, fmt.Errorf("tracking status: %w", err) } jobFinished := IsJobFinished(&job) @@ -879,7 +889,9 @@ func (jm *Controller) syncJob(ctx context.Context, key string) (forget bool, rEr // returning an error will re-enqueue Job after the backoff period return forget, fmt.Errorf("failed pod(s) detected for job key %q", key) } - forget = true + if suspendCondChanged { + forget = true + } return forget, manageJobErr } // Legacy path: tracking without finalizers. @@ -913,7 +925,9 @@ func (jm *Controller) syncJob(ctx context.Context, key string) (forget bool, rEr return forget, fmt.Errorf("failed pod(s) detected for job key %q", key) } - forget = true + if suspendCondChanged { + forget = true + } } return forget, manageJobErr diff --git a/vendor/k8s.io/kubernetes/pkg/generated/openapi/zz_generated.openapi.go b/vendor/k8s.io/kubernetes/pkg/generated/openapi/zz_generated.openapi.go index 7664323f8e..9a00db9a2c 100644 --- a/vendor/k8s.io/kubernetes/pkg/generated/openapi/zz_generated.openapi.go +++ b/vendor/k8s.io/kubernetes/pkg/generated/openapi/zz_generated.openapi.go @@ -25052,7 +25052,10 @@ func schema_k8sio_api_core_v1_ResourceRequirements(ref common.ReferenceCallback) "claims": { VendorExtensible: spec.VendorExtensible{ Extensions: spec.Extensions{ - "x-kubernetes-list-type": "set", + "x-kubernetes-list-map-keys": []interface{}{ + "name", + }, + "x-kubernetes-list-type": "map", }, }, SchemaProps: spec.SchemaProps{ diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go b/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go index a18df61916..a1c2f03440 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go @@ -205,10 +205,18 @@ func (dswp *desiredStateOfWorldPopulator) findAndAddNewPods() { } for _, pod := range dswp.podManager.GetPods() { - if dswp.podStateProvider.ShouldPodContainersBeTerminating(pod.UID) { + // Keep consistency of adding pod during reconstruction + if dswp.hasAddedPods && dswp.podStateProvider.ShouldPodContainersBeTerminating(pod.UID) { // Do not (re)add volumes for pods that can't also be starting containers continue } + + if !dswp.hasAddedPods && dswp.podStateProvider.ShouldPodRuntimeBeRemoved(pod.UID) { + // When kubelet restarts, we need to add pods to dsw if there is a possibility + // that the container may still be running + continue + } + dswp.processPodVolumes(pod, mountedVolumesForPod) } } diff --git a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/preemption/preemption.go b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/preemption/preemption.go index 32e1e1ba74..26a5c20541 100644 --- a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/preemption/preemption.go +++ b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/preemption/preemption.go @@ -362,7 +362,7 @@ func (ev *Evaluator) prepareCandidate(ctx context.Context, c Candidate, pod *v1. WithType(v1.DisruptionTarget). WithStatus(v1.ConditionTrue). WithReason("PreemptionByKubeScheduler"). - WithMessage(fmt.Sprintf("Kube-scheduler: preempting to accommodate a higher priority pod: %s", klog.KObj(pod))). + WithMessage(fmt.Sprintf("%s: preempting to accommodate a higher priority pod", pod.Spec.SchedulerName)). WithLastTransitionTime(metav1.Now()), ) @@ -378,8 +378,7 @@ func (ev *Evaluator) prepareCandidate(ctx context.Context, c Candidate, pod *v1. return } } - fh.EventRecorder().Eventf(victim, pod, v1.EventTypeNormal, "Preempted", "Preempting", "Preempted by %v/%v on node %v", - pod.Namespace, pod.Name, c.Name()) + fh.EventRecorder().Eventf(victim, pod, v1.EventTypeNormal, "Preempted", "Preempting", "Preempted by a pod on node %v", c.Name()) } fh.Parallelizer().Until(ctx, len(c.Victims().Pods), preemptPod, ev.PluginName) diff --git a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/runtime/framework.go b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/runtime/framework.go index 53e270c2ab..3a17cb28dd 100644 --- a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/runtime/framework.go +++ b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/runtime/framework.go @@ -730,11 +730,10 @@ func (f *frameworkImpl) RunFilterPlugins( if !pluginStatus.IsUnschedulable() { // Filter plugins are not supposed to return any status other than // Success or Unschedulable. - errStatus := framework.AsStatus(fmt.Errorf("running %q filter plugin: %w", pl.Name(), pluginStatus.AsError())).WithFailedPlugin(pl.Name()) - return map[string]*framework.Status{pl.Name(): errStatus} + pluginStatus = framework.AsStatus(fmt.Errorf("running %q filter plugin: %w", pl.Name(), pluginStatus.AsError())) } pluginStatus.SetFailedPlugin(pl.Name()) - statuses[pl.Name()] = pluginStatus + return map[string]*framework.Status{pl.Name(): pluginStatus} } } diff --git a/vendor/k8s.io/kubernetes/pkg/securitycontext/accessors.go b/vendor/k8s.io/kubernetes/pkg/securitycontext/accessors.go index 283181a779..ca787ee545 100644 --- a/vendor/k8s.io/kubernetes/pkg/securitycontext/accessors.go +++ b/vendor/k8s.io/kubernetes/pkg/securitycontext/accessors.go @@ -31,6 +31,7 @@ type PodSecurityContextAccessor interface { RunAsUser() *int64 RunAsGroup() *int64 RunAsNonRoot() *bool + SeccompProfile() *api.SeccompProfile SupplementalGroups() []int64 FSGroup() *int64 } @@ -46,6 +47,7 @@ type PodSecurityContextMutator interface { SetRunAsUser(*int64) SetRunAsGroup(*int64) SetRunAsNonRoot(*bool) + SetSeccompProfile(*api.SeccompProfile) SetSupplementalGroups([]int64) SetFSGroup(*int64) @@ -171,6 +173,19 @@ func (w *podSecurityContextWrapper) SetRunAsNonRoot(v *bool) { w.ensurePodSC() w.podSC.RunAsNonRoot = v } +func (w *podSecurityContextWrapper) SeccompProfile() *api.SeccompProfile { + if w.podSC == nil { + return nil + } + return w.podSC.SeccompProfile +} +func (w *podSecurityContextWrapper) SetSeccompProfile(p *api.SeccompProfile) { + if w.podSC == nil && p == nil { + return + } + w.ensurePodSC() + w.podSC.SeccompProfile = p +} func (w *podSecurityContextWrapper) SupplementalGroups() []int64 { if w.podSC == nil { return nil @@ -211,6 +226,7 @@ type ContainerSecurityContextAccessor interface { RunAsGroup() *int64 RunAsNonRoot() *bool ReadOnlyRootFilesystem() *bool + SeccompProfile() *api.SeccompProfile AllowPrivilegeEscalation() *bool } @@ -227,6 +243,7 @@ type ContainerSecurityContextMutator interface { SetRunAsGroup(*int64) SetRunAsNonRoot(*bool) SetReadOnlyRootFilesystem(*bool) + SetSeccompProfile(*api.SeccompProfile) SetAllowPrivilegeEscalation(*bool) } @@ -357,6 +374,20 @@ func (w *containerSecurityContextWrapper) SetReadOnlyRootFilesystem(v *bool) { w.ensureContainerSC() w.containerSC.ReadOnlyRootFilesystem = v } +func (w *containerSecurityContextWrapper) SeccompProfile() *api.SeccompProfile { + if w.containerSC == nil { + return nil + } + return w.containerSC.SeccompProfile +} +func (w *containerSecurityContextWrapper) SetSeccompProfile(p *api.SeccompProfile) { + if w.containerSC == nil && p == nil { + return + } + w.ensureContainerSC() + w.containerSC.SeccompProfile = p +} + func (w *containerSecurityContextWrapper) AllowPrivilegeEscalation() *bool { if w.containerSC == nil { return nil @@ -464,6 +495,14 @@ func (w *effectiveContainerSecurityContextWrapper) SetReadOnlyRootFilesystem(v * w.containerSC.SetReadOnlyRootFilesystem(v) } } +func (w *effectiveContainerSecurityContextWrapper) SeccompProfile() *api.SeccompProfile { + return w.containerSC.SeccompProfile() +} +func (w *effectiveContainerSecurityContextWrapper) SetSeccompProfile(p *api.SeccompProfile) { + if !reflect.DeepEqual(w.SeccompProfile(), p) { + w.containerSC.SetSeccompProfile(p) + } +} func (w *effectiveContainerSecurityContextWrapper) AllowPrivilegeEscalation() *bool { return w.containerSC.AllowPrivilegeEscalation() } diff --git a/vendor/k8s.io/pod-security-admission/metrics/metrics.go b/vendor/k8s.io/pod-security-admission/metrics/metrics.go index f72ad848ae..948911e596 100644 --- a/vendor/k8s.io/pod-security-admission/metrics/metrics.go +++ b/vendor/k8s.io/pod-security-admission/metrics/metrics.go @@ -104,7 +104,8 @@ func (r *PrometheusRecorder) RecordEvaluation(decision Decision, policy api.Leve strings.HasPrefix(namespace, "openshift-") || strings.HasPrefix(namespace, "kube-") || namespace == "default") { - namespace = "non-platform" + // remove non-OpenShift platform namespace names to prevent cardinality explosion + namespace = "" } el := evaluationsLabels{ diff --git a/vendor/modules.txt b/vendor/modules.txt index 9f34e521e1..4fbd942cda 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -821,7 +821,7 @@ github.com/openshift/cluster-policy-controller/pkg/security/controller github.com/openshift/cluster-policy-controller/pkg/security/mcs github.com/openshift/cluster-policy-controller/pkg/security/uidallocator github.com/openshift/cluster-policy-controller/pkg/version -# github.com/openshift/library-go v0.0.0-20230130232623-47904dd9ff5a +# github.com/openshift/library-go v0.0.0-20230222090221-582055a1d5c4 ## explicit; go 1.19 github.com/openshift/library-go/pkg/apiserver/admission/admissionrestconfig github.com/openshift/library-go/pkg/apiserver/admission/admissiontimeout @@ -1362,7 +1362,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230223163248-89232647de67 +# k8s.io/api v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230302092939-8cfbab7d1c15 ## explicit; go 1.19 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1418,7 +1418,7 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apiextensions-apiserver v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230223163248-89232647de67 +# k8s.io/apiextensions-apiserver v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230302092939-8cfbab7d1c15 ## explicit; go 1.19 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1462,7 +1462,7 @@ k8s.io/apiextensions-apiserver/pkg/generated/openapi k8s.io/apiextensions-apiserver/pkg/registry/customresource k8s.io/apiextensions-apiserver/pkg/registry/customresource/tableconvertor k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition -# k8s.io/apimachinery v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230223163248-89232647de67 +# k8s.io/apimachinery v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230302092939-8cfbab7d1c15 ## explicit; go 1.19 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1526,7 +1526,7 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230223163248-89232647de67 +# k8s.io/apiserver v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230302092939-8cfbab7d1c15 ## explicit; go 1.19 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/cel @@ -1680,12 +1680,12 @@ k8s.io/apiserver/plugin/pkg/audit/webhook k8s.io/apiserver/plugin/pkg/authenticator/token/oidc k8s.io/apiserver/plugin/pkg/authenticator/token/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook -# k8s.io/cli-runtime v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230223163248-89232647de67 +# k8s.io/cli-runtime v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230302092939-8cfbab7d1c15 ## explicit; go 1.19 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230223163248-89232647de67 +# k8s.io/client-go v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230302092939-8cfbab7d1c15 ## explicit; go 1.19 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -2015,7 +2015,7 @@ k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230223163248-89232647de67 +# k8s.io/cloud-provider v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230302092939-8cfbab7d1c15 ## explicit; go 1.19 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -2035,14 +2035,14 @@ k8s.io/cloud-provider/service/helpers k8s.io/cloud-provider/volume k8s.io/cloud-provider/volume/errors k8s.io/cloud-provider/volume/helpers -# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230223163248-89232647de67 +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230302092939-8cfbab7d1c15 ## explicit; go 1.19 k8s.io/cluster-bootstrap/token/api k8s.io/cluster-bootstrap/token/jws k8s.io/cluster-bootstrap/token/util k8s.io/cluster-bootstrap/util/secrets k8s.io/cluster-bootstrap/util/tokens -# k8s.io/component-base v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230223163248-89232647de67 +# k8s.io/component-base v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230302092939-8cfbab7d1c15 ## explicit; go 1.19 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -2075,7 +2075,7 @@ k8s.io/component-base/tracing k8s.io/component-base/tracing/api/v1 k8s.io/component-base/version k8s.io/component-base/version/verflag -# k8s.io/component-helpers v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230223163248-89232647de67 +# k8s.io/component-helpers v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230302092939-8cfbab7d1c15 ## explicit; go 1.19 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -2088,7 +2088,7 @@ k8s.io/component-helpers/scheduling/corev1 k8s.io/component-helpers/scheduling/corev1/nodeaffinity k8s.io/component-helpers/storage/ephemeral k8s.io/component-helpers/storage/volume -# k8s.io/controller-manager v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230223163248-89232647de67 +# k8s.io/controller-manager v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230302092939-8cfbab7d1c15 ## explicit; go 1.19 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -2105,16 +2105,16 @@ k8s.io/controller-manager/pkg/informerfactory k8s.io/controller-manager/pkg/leadermigration k8s.io/controller-manager/pkg/leadermigration/config k8s.io/controller-manager/pkg/leadermigration/options -# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230223163248-89232647de67 +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230302092939-8cfbab7d1c15 ## explicit; go 1.19 k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1 k8s.io/cri-api/pkg/errors -# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230223163248-89232647de67 +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230302092939-8cfbab7d1c15 ## explicit; go 1.19 k8s.io/csi-translation-lib k8s.io/csi-translation-lib/plugins -# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230223163248-89232647de67 +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230302092939-8cfbab7d1c15 ## explicit; go 1.19 k8s.io/dynamic-resource-allocation/resourceclaim # k8s.io/gengo v0.0.0-20220902162205-c0856e24416d @@ -2133,11 +2133,11 @@ k8s.io/klog/v2/internal/clock k8s.io/klog/v2/internal/dbg k8s.io/klog/v2/internal/serialize k8s.io/klog/v2/internal/severity -# k8s.io/kms v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230223163248-89232647de67 +# k8s.io/kms v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230302092939-8cfbab7d1c15 ## explicit; go 1.19 k8s.io/kms/apis/v1beta1 k8s.io/kms/apis/v2alpha1 -# k8s.io/kube-aggregator v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230223163248-89232647de67 +# k8s.io/kube-aggregator v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230302092939-8cfbab7d1c15 ## explicit; go 1.19 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2168,7 +2168,7 @@ k8s.io/kube-aggregator/pkg/controllers/status k8s.io/kube-aggregator/pkg/registry/apiservice k8s.io/kube-aggregator/pkg/registry/apiservice/etcd k8s.io/kube-aggregator/pkg/registry/apiservice/rest -# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230223163248-89232647de67 +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230302092939-8cfbab7d1c15 ## explicit; go 1.19 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 @@ -2201,13 +2201,13 @@ k8s.io/kube-openapi/pkg/validation/spec k8s.io/kube-openapi/pkg/validation/strfmt k8s.io/kube-openapi/pkg/validation/strfmt/bson k8s.io/kube-openapi/pkg/validation/validate -# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230223163248-89232647de67 +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230302092939-8cfbab7d1c15 ## explicit; go 1.19 k8s.io/kube-scheduler/config/v1 k8s.io/kube-scheduler/config/v1beta2 k8s.io/kube-scheduler/config/v1beta3 k8s.io/kube-scheduler/extender/v1 -# k8s.io/kubectl v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230223163248-89232647de67 +# k8s.io/kubectl v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230302092939-8cfbab7d1c15 ## explicit; go 1.19 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources @@ -2243,7 +2243,7 @@ k8s.io/kubectl/pkg/util/storage k8s.io/kubectl/pkg/util/templates k8s.io/kubectl/pkg/util/term k8s.io/kubectl/pkg/validation -# k8s.io/kubelet v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230223163248-89232647de67 +# k8s.io/kubelet v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230302092939-8cfbab7d1c15 ## explicit; go 1.19 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 @@ -2260,7 +2260,7 @@ k8s.io/kubelet/pkg/apis/pluginregistration/v1 k8s.io/kubelet/pkg/apis/podresources/v1 k8s.io/kubelet/pkg/apis/podresources/v1alpha1 k8s.io/kubelet/pkg/apis/stats/v1alpha1 -# k8s.io/kubernetes v1.26.1 => github.com/openshift/kubernetes v0.0.0-20230223163248-89232647de67 +# k8s.io/kubernetes v1.26.1 => github.com/openshift/kubernetes v0.0.0-20230302092939-8cfbab7d1c15 ## explicit; go 1.19 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -3048,7 +3048,7 @@ k8s.io/kubernetes/third_party/forked/gonum/graph k8s.io/kubernetes/third_party/forked/gonum/graph/internal/linear k8s.io/kubernetes/third_party/forked/gonum/graph/simple k8s.io/kubernetes/third_party/forked/gonum/graph/traverse -# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230223163248-89232647de67 +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230302092939-8cfbab7d1c15 ## explicit; go 1.19 k8s.io/legacy-cloud-providers/aws k8s.io/legacy-cloud-providers/azure @@ -3091,7 +3091,7 @@ k8s.io/legacy-cloud-providers/gce/gcpcredential k8s.io/legacy-cloud-providers/vsphere k8s.io/legacy-cloud-providers/vsphere/vclib k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers -# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230223163248-89232647de67 +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230302092939-8cfbab7d1c15 ## explicit; go 1.19 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3106,10 +3106,10 @@ k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1 k8s.io/metrics/pkg/client/custom_metrics k8s.io/metrics/pkg/client/custom_metrics/scheme k8s.io/metrics/pkg/client/external_metrics -# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230223163248-89232647de67 +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230302092939-8cfbab7d1c15 ## explicit; go 1.19 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.25.0 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230223163248-89232647de67 +# k8s.io/pod-security-admission v0.25.0 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230302092939-8cfbab7d1c15 ## explicit; go 1.19 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3252,33 +3252,33 @@ sigs.k8s.io/structured-merge-diff/v4/value ## explicit; go 1.12 sigs.k8s.io/yaml # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.4.1-0.20221214150008-e73634cb3870 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230223163248-89232647de67 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230223163248-89232647de67 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230223163248-89232647de67 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230223163248-89232647de67 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230223163248-89232647de67 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230223163248-89232647de67 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230223163248-89232647de67 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230223163248-89232647de67 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230223163248-89232647de67 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230223163248-89232647de67 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230223163248-89232647de67 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230223163248-89232647de67 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230223163248-89232647de67 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230223163248-89232647de67 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230223163248-89232647de67 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230223163248-89232647de67 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230223163248-89232647de67 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230223163248-89232647de67 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230223163248-89232647de67 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230223163248-89232647de67 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230223163248-89232647de67 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230223163248-89232647de67 -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230223163248-89232647de67 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230223163248-89232647de67 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230223163248-89232647de67 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230223163248-89232647de67 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230223163248-89232647de67 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230223163248-89232647de67 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230223163248-89232647de67 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230223163248-89232647de67 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230302092939-8cfbab7d1c15 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230302092939-8cfbab7d1c15