diff --git a/etcd/go.mod b/etcd/go.mod index c4a7f7b8fe..4211c7b373 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -58,7 +58,7 @@ require ( k8s.io/kubelet v0.0.0 // indirect k8s.io/kubernetes v1.26.1 // indirect k8s.io/mount-utils v0.0.0 // indirect - k8s.io/pod-security-admission v0.25.0 // indirect + k8s.io/pod-security-admission v0.0.0 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // 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-20230213202407-c7296782f651 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230213202407-c7296782f651 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230213202407-c7296782f651 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230213202407-c7296782f651 // staging kubernetes ) diff --git a/etcd/go.sum b/etcd/go.sum index c31c3580b3..a935244294 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -394,34 +394,34 @@ 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/kubernetes/staging/src/k8s.io/api v0.0.0-20230213202407-c7296782f651 h1:RgP/B8afJ65i5+5TjaXmcQB6Zb5X50S9h6mZMLGPTmA= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230213202407-c7296782f651/go.mod h1:SVFZVmcfr/QnDkKqmBvlVlhurEsml57BUNDH+R/CPqk= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230213202407-c7296782f651 h1:sTTB9s9H/NgqARqbrnLIk4aNRQmjtkIex3h8sZsinCY= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230213202407-c7296782f651/go.mod h1:fcaZu5DOMCvnjHsoJrKV5iQLvaiOTv50bj8okFxwYFw= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230213202407-c7296782f651 h1:k+J2YXtFlzvMk1MeSNljCvfaY6uJieq52I6y7SG3Ox4= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230213202407-c7296782f651/go.mod h1:CO72fYg4kCwaSLKgV6oMT9N1k5jhe8ZfxN1Rv7i9aL0= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230213202407-c7296782f651 h1:dGtHKJZqypgw9zLKfJolbGx62kjZsnwESZ0tv1PF01E= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230213202407-c7296782f651/go.mod h1:salqUyIbJbHU1a9StwrX18tkxIoZejk8BQB9aYNkIPk= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230213202407-c7296782f651 h1:dlf3EZ3OkRlseJ/6IXFCwdFY+Mw9adtJHQMzVKreHl0= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230213202407-c7296782f651/go.mod h1:g5iGehpfJ/sjrrPZotg2ndVBM1qrl/xlKDEC6CJwoRo= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230213202407-c7296782f651 h1:g0H1hYUPqmbgPrgsXINKuSW/CSc9r3cztXk4Tnv+VA8= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230213202407-c7296782f651/go.mod h1:y/nn+aWz2wp+2mklRHKwQb5C36SqiS4mCgw2/C1HRpM= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230213202407-c7296782f651 h1:Mn34ijXLvd6dqqHGaGRrh3VjUZzrH4OvNiZ+HCbUNxM= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230213202407-c7296782f651/go.mod h1:pfu0i4DFeQXwdlNs9TQpFEUK+8y4I3HSCzqbmQDobJ8= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230213202407-c7296782f651 h1:kZvuaqm7AWYHxykmxbT9Kf4a3nNbWRW4p5q1toW22oo= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230213202407-c7296782f651/go.mod h1:+K4RuDOLxtVWiPZfUefwPoYThb9BEmWYp5zId0KFgU0= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230213202407-c7296782f651 h1:cFNVFJSkgCad/Pj0QbRgAccRb5I3nqbmK6maV1ev7jE= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230213202407-c7296782f651/go.mod h1:IrwH1whPmwqMMBuqU2Gkb2cdmdqTg5zpbYsPC9KF8hY= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230213202407-c7296782f651 h1:I1TB4hjbbjDPDGakrdVGeuhVlTsl5SHFFtjIf9DQVaU= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230213202407-c7296782f651/go.mod h1:NXsaH8tQ1U2J3w6IW8hNaC4ZQFJvkC2lVoXOXZQ8ii0= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230213202407-c7296782f651 h1:8bntikPK1oITBfuaRCY9kZUACjbVoCxEgyq15HqN89M= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230213202407-c7296782f651/go.mod h1:6p383itqHHhUKvZADAr+LDVXOJ4ZWo0tBKVxTjqc9UY= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230213202407-c7296782f651 h1:0zvdp4QNz3IAW6PwIjhyaC6kh8BOkTWvtSQQvbjjAMA= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230213202407-c7296782f651/go.mod h1:7VSG6sD9u3yCsNAz3+TYBN6oNXmBmfX32o9piXgdUHQ= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230213202407-c7296782f651 h1:dnTOs/D5i9pOagZxXeLgQs8u+xcaX5nBztbGI7RTYhg= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230213202407-c7296782f651/go.mod h1:n49VMDfRrPr3RdbpZRjo4yIF65v6ryFoeflGeAFItyc= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230213202407-c7296782f651 h1:fWgR49EUg8iqfKltlzEjrs4jizhK0hAVVb/2mZiv/g8= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230213202407-c7296782f651/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/onsi-ginkgo/v2 v2.4.1-0.20221214150008-e73634cb3870 h1:YH3Z3ZWCDWjkAGdZpK5rCm5pRZ4wt0uEx1GwvCiO3+I= diff --git a/go.mod b/go.mod index c9fe3c564c..9122fc58e6 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/openshift/api v0.0.0-20230208193339-068b2ae5534f 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/cluster-policy-controller v0.0.0-20230112143856-3f8efde27bb6 github.com/openshift/library-go v0.0.0-20230130232623-47904dd9ff5a github.com/openshift/route-controller-manager v0.0.0-20230205134410-d7a8e22db412 github.com/pkg/errors v0.9.1 @@ -219,7 +219,7 @@ require ( k8s.io/legacy-cloud-providers v0.0.0 // indirect k8s.io/metrics v0.0.0 // indirect k8s.io/mount-utils v0.0.0 // indirect - k8s.io/pod-security-admission v0.25.0 // indirect + k8s.io/pod-security-admission v0.0.0 // indirect k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect @@ -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-20230213202407-c7296782f651 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230213202407-c7296782f651 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230213202407-c7296782f651 // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230213202407-c7296782f651 // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230213202407-c7296782f651 // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230213202407-c7296782f651 // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230213202407-c7296782f651 // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230213202407-c7296782f651 // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230213202407-c7296782f651 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230213202407-c7296782f651 // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230213202407-c7296782f651 // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230213202407-c7296782f651 // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230213202407-c7296782f651 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230213202407-c7296782f651 // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230213202407-c7296782f651 // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230213202407-c7296782f651 // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230213202407-c7296782f651 // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230213202407-c7296782f651 // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230213202407-c7296782f651 // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230213202407-c7296782f651 // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230213202407-c7296782f651 // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230213202407-c7296782f651 // from kubernetes ) diff --git a/go.sum b/go.sum index d840320f95..5fd22b43c7 100644 --- a/go.sum +++ b/go.sum @@ -598,6 +598,7 @@ github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.m github.com/opencontainers/selinux v1.10.0 h1:rAiKF8hTcgLI3w0DHm6i0ylVVcOrlgR1kK99DRLDhyU= github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= github.com/openshift/api v0.0.0-20230120195050-6ba31fa438f2/go.mod h1:ctXNyWanKEjGj8sss1KjjHQ3ENKFm33FFnS5BKaIPh4= +github.com/openshift/api v0.0.0-20230201213816-61d971884921/go.mod h1:ctXNyWanKEjGj8sss1KjjHQ3ENKFm33FFnS5BKaIPh4= github.com/openshift/api v0.0.0-20230208193339-068b2ae5534f h1:+GaTEfR8gYzh64fdlRKLYZLwt5p4wQd2mdnvkhFDa8k= github.com/openshift/api v0.0.0-20230208193339-068b2ae5534f/go.mod h1:ctXNyWanKEjGj8sss1KjjHQ3ENKFm33FFnS5BKaIPh4= github.com/openshift/apiserver-library-go v0.0.0-20230120221150-cefee9e0162b h1:1AeKPWFTSSSqSl0VYmwnaOuxw2kExQgJ6pjuC4XV33A= @@ -606,59 +607,59 @@ github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d h1:RR github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= github.com/openshift/client-go v0.0.0-20230120202327-72f107311084 h1:66uaqNwA+qYyQDwsMWUfjjau8ezmg1dzCqub13KZOcE= 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/cluster-policy-controller v0.0.0-20230112143856-3f8efde27bb6 h1:JJ8cHS+mXYwaYjpDnmnEWNj/KPvlVhed1dFLsz3zJ3g= +github.com/openshift/cluster-policy-controller v0.0.0-20230112143856-3f8efde27bb6/go.mod h1:mxj0Tg1YG9PpVJDOBLsAkjZNVvQTNu1LJkw9fSAkOE4= +github.com/openshift/kubernetes v0.0.0-20230213202407-c7296782f651 h1:fw6wQpp+DQfNnEMdo8SCah4uWbu2TVqUdMDJoRF7x/E= +github.com/openshift/kubernetes v0.0.0-20230213202407-c7296782f651/go.mod h1:X+oZfq0zUE+lpHZTcVDnge20xxiyXC+XSuyivKCn5YE= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230213202407-c7296782f651 h1:RgP/B8afJ65i5+5TjaXmcQB6Zb5X50S9h6mZMLGPTmA= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230213202407-c7296782f651/go.mod h1:SVFZVmcfr/QnDkKqmBvlVlhurEsml57BUNDH+R/CPqk= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230213202407-c7296782f651 h1:Ddbw/U4bft7L5xdXn6wD/W50hCzwGsR885orWpKwMmc= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230213202407-c7296782f651/go.mod h1:6TuEWeKgBs443fLsnv4iOAeGNgpQcNytep4PPOq/l7Q= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230213202407-c7296782f651 h1:sTTB9s9H/NgqARqbrnLIk4aNRQmjtkIex3h8sZsinCY= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230213202407-c7296782f651/go.mod h1:fcaZu5DOMCvnjHsoJrKV5iQLvaiOTv50bj8okFxwYFw= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230213202407-c7296782f651 h1:k+J2YXtFlzvMk1MeSNljCvfaY6uJieq52I6y7SG3Ox4= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230213202407-c7296782f651/go.mod h1:CO72fYg4kCwaSLKgV6oMT9N1k5jhe8ZfxN1Rv7i9aL0= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230213202407-c7296782f651 h1:dGtHKJZqypgw9zLKfJolbGx62kjZsnwESZ0tv1PF01E= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230213202407-c7296782f651/go.mod h1:salqUyIbJbHU1a9StwrX18tkxIoZejk8BQB9aYNkIPk= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230213202407-c7296782f651 h1:dlf3EZ3OkRlseJ/6IXFCwdFY+Mw9adtJHQMzVKreHl0= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230213202407-c7296782f651/go.mod h1:g5iGehpfJ/sjrrPZotg2ndVBM1qrl/xlKDEC6CJwoRo= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230213202407-c7296782f651 h1:g0H1hYUPqmbgPrgsXINKuSW/CSc9r3cztXk4Tnv+VA8= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230213202407-c7296782f651/go.mod h1:y/nn+aWz2wp+2mklRHKwQb5C36SqiS4mCgw2/C1HRpM= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230213202407-c7296782f651 h1:Mn34ijXLvd6dqqHGaGRrh3VjUZzrH4OvNiZ+HCbUNxM= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230213202407-c7296782f651/go.mod h1:pfu0i4DFeQXwdlNs9TQpFEUK+8y4I3HSCzqbmQDobJ8= +github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230213202407-c7296782f651/go.mod h1:ZjLs0DK9L3Xxjv99ioET5vBULmFymo1Dc1ZzF6G6L6c= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230213202407-c7296782f651 h1:kZvuaqm7AWYHxykmxbT9Kf4a3nNbWRW4p5q1toW22oo= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230213202407-c7296782f651/go.mod h1:+K4RuDOLxtVWiPZfUefwPoYThb9BEmWYp5zId0KFgU0= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230213202407-c7296782f651 h1:cFNVFJSkgCad/Pj0QbRgAccRb5I3nqbmK6maV1ev7jE= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230213202407-c7296782f651/go.mod h1:IrwH1whPmwqMMBuqU2Gkb2cdmdqTg5zpbYsPC9KF8hY= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230213202407-c7296782f651 h1:+pQrZUHMYs5+nRUPS4hfnVFEG+/iSN8tGftq1LVTfVA= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230213202407-c7296782f651/go.mod h1:AuOKusKtXgnoNwjX3FYoY9nSggJKZBk9TYeUoM5dnws= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230213202407-c7296782f651 h1:/SMENcT3FlXKP0HLB+TbUrxw6rfy3v6p9nfQQBmHrQc= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230213202407-c7296782f651/go.mod h1:TVwnVXG26sqo03sNVSJzkjIXBXB1r5KcoNJPliZ7SjM= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230213202407-c7296782f651 h1:JqaUMir2LAM2gfcPkTEubOClXAdG6zdyoAmPtSqXxHY= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230213202407-c7296782f651/go.mod h1:tK3gKkqt21TbFbG/1xF5M8Q1zWAmuhS6wO3SGZd0nmw= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230213202407-c7296782f651 h1:hnwZi/nfgJor61cgAUqB6xkpFqHSIZyPozjUsjK37F8= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230213202407-c7296782f651/go.mod h1:mgVmrJ+p9PHz4zZwo7XouLoex4tpJz3Rb8uPcw6+IJE= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230213202407-c7296782f651 h1:I1TB4hjbbjDPDGakrdVGeuhVlTsl5SHFFtjIf9DQVaU= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230213202407-c7296782f651/go.mod h1:NXsaH8tQ1U2J3w6IW8hNaC4ZQFJvkC2lVoXOXZQ8ii0= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230213202407-c7296782f651 h1:kEeq0WmPnfD7OaW6IwRHMb+KOshQq7f3xWSI45rkUBs= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230213202407-c7296782f651/go.mod h1:YEIiQsb6SFoP9Y4gunC2nL+EL/SDEjfg++eDyZDBV18= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230213202407-c7296782f651 h1:nZLZIeedLj++11FevFu0p1c/WvaTBm934/kXTuXVQ4k= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230213202407-c7296782f651/go.mod h1:wfRwoBCCxtoS6dmP/ijU2pC1u1COgMcL2qppCHqCeWg= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230213202407-c7296782f651 h1:v728q++Em6se894dLEeeLWdkKdKkHe7KdnqcNt6aAOI= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230213202407-c7296782f651/go.mod h1:0hEeqiK9VnRfKjEzziZZ/UdzDn2zolWihYE/iWC4wUM= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230213202407-c7296782f651 h1:8bntikPK1oITBfuaRCY9kZUACjbVoCxEgyq15HqN89M= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230213202407-c7296782f651/go.mod h1:6p383itqHHhUKvZADAr+LDVXOJ4ZWo0tBKVxTjqc9UY= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230213202407-c7296782f651 h1:0zvdp4QNz3IAW6PwIjhyaC6kh8BOkTWvtSQQvbjjAMA= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230213202407-c7296782f651/go.mod h1:7VSG6sD9u3yCsNAz3+TYBN6oNXmBmfX32o9piXgdUHQ= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230213202407-c7296782f651 h1:viYWVtSkW8h6rnspd7dGh+7FRapqSyWxXFYluusOP6E= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230213202407-c7296782f651/go.mod h1:VD+1/CcB3GhJH1hrDcxv/Idr3wYEN5YURxV/QRrRLJk= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230213202407-c7296782f651 h1:7D3yUS5xmbj54yj240xO1L5pPMS76rnIA3Nw3wP+878= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230213202407-c7296782f651/go.mod h1:Yjxnfo5lUPUSBUqfhgoAS19ZFY/JhMC16dgEw0ilIoU= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230213202407-c7296782f651 h1:dnTOs/D5i9pOagZxXeLgQs8u+xcaX5nBztbGI7RTYhg= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230213202407-c7296782f651/go.mod h1:n49VMDfRrPr3RdbpZRjo4yIF65v6ryFoeflGeAFItyc= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230213202407-c7296782f651 h1:fWgR49EUg8iqfKltlzEjrs4jizhK0hAVVb/2mZiv/g8= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230213202407-c7296782f651/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= diff --git a/rebase_sh.log b/rebase_sh.log new file mode 100644 index 0000000000..5024fb82f9 --- /dev/null +++ b/rebase_sh.log @@ -0,0 +1,682 @@ +# Rebasing to registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2023-02-21-161452 and registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-02-27-084418 +# Fetching release info for registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2023-02-21-161452 (amd64) +# Fetching release info for registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-02-27-084418 (arm64) +# Extracting registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2023-02-21-161452 manifest content +# Cloning registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2023-02-21-161452 component repos +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-dns-operator/.git/ +HEAD is now at 637a694 Merge pull request #352 from bverschueren/avoid-original-hosts-loss + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-ingress-operator/.git/ +HEAD is now at d523db5 Merge pull request #862 from openshift-bot/art-consistency-openshift-4.13-ose-cluster-ingress-operator + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-apiserver-operator/.git/ +HEAD is now at 9def852 Merge pull request #1442 from sanchezl/bump + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-controller-manager-operator/.git/ +HEAD is now at 7f293da Merge pull request #693 from ingvagabund/guard-controller-set-explicit-readiness-probe-endpoint + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-scheduler-operator/.git/ +HEAD is now at 05ac3ae Merge pull request #459 from ingvagabund/guard-pod-set-readiness-probe-endpoint-explicitly + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-network-operator/.git/ +HEAD is now at a08b720 Merge pull request #1711 from jluhrsen/always-get-env.sh + +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 3f8efde Merge pull request #94 from ingvagabund/crq-controller-do-not-sync-cache-over-no-monitors + +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 c7296782f Merge pull request #1454 from stlaz/podsecurity_metrics + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/machine-config-operator/.git/ +HEAD is now at d22708eb Merge pull request #3524 from mccv1r0/vmxnet3-iproute2 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/openshift-controller-manager/.git/ +HEAD is now at 67fcbf2 Merge pull request #250 from gabemontero/build-407 + +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.14.0-0.nightly-2023-02-21-161452 image repos +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/oc/.git/ +HEAD is now at 31c5481 Merge pull request #1340 from wking/update-approvers-bump + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/coredns/.git/ +HEAD is now at 064eec2 Merge pull request #83 from openshift-bot/art-consistency-openshift-4.13-coredns + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/router/.git/ +HEAD is now at 6144b9a Merge pull request #445 from gcs278/CVE-2022-41717 + +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 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/ovn-kubernetes/.git/ +HEAD is now at 4d17668 Merge pull request #1530 from zshi-redhat/iptable-in-microshift + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/kubernetes/.git/ +HEAD is now at c7296782f Merge pull request #1454 from stlaz/podsecurity_metrics + +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 83fd126 Merge pull request #1348 from bradmwilliams/changelog-json-commitdate + +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 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/ovn-kubernetes/.git/ +HEAD is now at b244c30 Merge pull request #1533 from zeeke/merge-2023-02-15 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/kubernetes/.git/ +HEAD is now at 89232647d Merge pull request #1312 from eggfoobar/wrk-prt-multi-node + +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.14.0-0.nightly-2023-02-21-161452_amd64-2023-02-21_arm64-2023-02-27' not found. +Switched to a new branch 'rebase-4.14.0-0.nightly-2023-02-21-161452_amd64-2023-02-21_arm64-2023-02-27' +## Updating last_rebase.sh +## Committing changes to last_rebase.sh +[rebase-4.14.0-0.nightly-2023-02-21-161452_amd64-2023-02-21_arm64-2023-02-27 16a8361b] update last_rebase.sh + 1 file changed, 1 insertion(+), 1 deletion(-) +cluster-openshift-controller-manager-operator embedded-component no change + +etcd embedded-component no change + +route-controller-manager embedded-component no change + +service-ca-operator embedded-component no change + +kube-rbac-proxy image-amd64 no change + +service-ca-operator image-amd64 no change + +oc image-arm64 no change + +coredns image-arm64 no change + +router image-arm64 no change + +kube-rbac-proxy image-arm64 no change + +ovn-kubernetes image-arm64 no change + +kubernetes image-arm64 no change + +service-ca-operator image-arm64 no change + +## Committing changes to changelog +[rebase-4.14.0-0.nightly-2023-02-21-161452_amd64-2023-02-21_arm64-2023-02-27 09835257] update changelog + 2 files changed, 45 insertions(+), 130 deletions(-) + rewrite scripts/auto-rebase/changelog.txt (99%) +# Updating microshift/go.mod +go mod edit -require github.com/openshift/cluster-policy-controller@3f8efde27bb6a50e5d50f0798877d4d2e1154dcb +go: downloading github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d +go: downloading github.com/ghodss/yaml v1.0.0 +go: downloading github.com/openshift/api v0.0.0-20230208193339-068b2ae5534f +go: downloading github.com/openshift/cluster-policy-controller v0.0.0-20230112143856-3f8efde27bb6 +go: downloading github.com/openshift/library-go v0.0.0-20230130232623-47904dd9ff5a +go: downloading github.com/openshift/client-go v0.0.0-20230120202327-72f107311084 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230223163248-89232647de67 +go: downloading github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e +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/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 k8s.io/klog/v2 v2.80.1 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230223163248-89232647de67 +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/apparentlymart/go-cidr v1.1.0 +go: downloading github.com/mitchellh/go-homedir v1.1.0 +go: downloading github.com/spf13/pflag v1.0.5 +go: downloading github.com/openshift/kubernetes v0.0.0-20230223163248-89232647de67 +go: downloading sigs.k8s.io/yaml v1.3.0 +go: downloading go.etcd.io/etcd/client/pkg/v3 v3.5.5 +go: downloading github.com/openshift/route-controller-manager v0.0.0-20230205134410-d7a8e22db412 +go: downloading go.etcd.io/etcd/client/v3 v3.5.5 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230223163248-89232647de67 +go: downloading github.com/stretchr/testify v1.8.0 +go: downloading github.com/google/go-cmp v0.5.9 +go: downloading gopkg.in/yaml.v2 v2.4.0 +go: downloading k8s.io/utils v0.0.0-20221107191617-1a15be271d1d +go: downloading github.com/evanphx/json-patch v4.12.0+incompatible +go: downloading sigs.k8s.io/kube-storage-version-migrator v0.0.4 +go: downloading github.com/davecgh/go-spew v1.1.1 +go: downloading github.com/gogo/protobuf v1.3.2 +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 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 +go: downloading github.com/google/gofuzz v1.2.0 +go: downloading github.com/go-logr/logr v1.2.3 +go: downloading github.com/inconshreveable/mousetrap v1.0.1 +go: downloading github.com/google/uuid v1.1.2 +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 gopkg.in/inf.v0 v0.9.1 +go: downloading github.com/miekg/dns v1.1.35 +go: downloading github.com/vishvananda/netlink v1.1.0 +go: downloading golang.org/x/sys v0.4.0 +go: downloading k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 +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/jonboulle/clockwork v0.2.2 +go: downloading github.com/google/gnostic v0.5.7-v3refs +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 github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230223163248-89232647de67 +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/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/coreos/go-systemd/v22 v22.3.2 +go: downloading github.com/emicklei/go-restful/v3 v3.9.0 +go: downloading go.uber.org/atomic v1.7.0 +go: downloading sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 +go: downloading golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 +go: downloading github.com/pmezard/go-difflib v1.0.0 +go: downloading gopkg.in/yaml.v3 v3.0.1 +go: downloading github.com/json-iterator/go v1.1.12 +go: downloading github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de +go: downloading golang.org/x/text v0.6.0 +go: downloading sigs.k8s.io/kustomize/api v0.12.1 +go: downloading sigs.k8s.io/kustomize/kyaml v0.13.9 +go: downloading github.com/golang/protobuf v1.5.2 +go: downloading google.golang.org/protobuf v1.28.1 +go: downloading github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 +go: downloading github.com/peterbourgon/diskv v2.0.1+incompatible +go: downloading golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 +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 github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230223163248-89232647de67 +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/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/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 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230223163248-89232647de67 +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 go.uber.org/goleak v1.1.12 +go: downloading github.com/benbjohnson/clock v1.1.0 +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/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230223163248-89232647de67 +go: downloading gopkg.in/natefinch/lumberjack.v2 v2.0.0 +go: downloading github.com/beorn7/perks v1.0.1 +go: downloading github.com/cespare/xxhash/v2 v2.1.2 +go: downloading github.com/google/cel-go v0.12.6 +go: downloading github.com/onsi/ginkgo v1.11.0 +go: downloading sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 +go: downloading go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0 +go: downloading github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 +go: downloading github.com/NYTimes/gziphandler v1.1.1 +go: downloading github.com/go-openapi/jsonreference v0.20.0 +go: downloading github.com/go-openapi/swag v0.19.14 +go: downloading github.com/matttproud/golang_protobuf_extensions v1.0.2 +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/google/btree v1.0.1 +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/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/robfig/cron v1.2.0 +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/Azure/go-autorest v14.2.0+incompatible +go: downloading github.com/container-storage-interface/spec v1.7.0 +go: downloading github.com/libopenstorage/openstorage v1.0.0 +go: downloading github.com/opencontainers/selinux v1.10.0 +go: downloading github.com/openshift/apiserver-library-go v0.0.0-20230120221150-cefee9e0162b +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 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/docker/go-units v0.5.0 +go: downloading github.com/cyphar/filepath-securejoin v0.2.3 +go: downloading github.com/moby/sys/mountinfo v0.6.2 +go: downloading github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e +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 github.com/karrick/godirwalk v1.17.0 +go: downloading github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 +go: downloading github.com/containerd/typeurl v1.0.2 +go: downloading k8s.io/gengo v0.0.0-20220902162205-c0856e24416d +go: downloading github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989 +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/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/BurntSushi/toml v0.3.1 +go: downloading github.com/stoewer/go-strcase v1.2.0 +go: downloading github.com/felixge/httpsnoop v1.0.3 +go: downloading go.opentelemetry.io/otel/metric v0.31.0 +go: downloading github.com/go-openapi/jsonpointer v0.19.5 +go: downloading github.com/mailru/easyjson v0.7.6 +go: downloading google.golang.org/appengine v1.6.7 +go: downloading go.etcd.io/etcd/server/v3 v3.5.5 +go: downloading github.com/go-errors/errors v1.0.1 +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/GoogleCloudPlatform/k8s-cloud-provider v1.18.1-0.20220218231025-f11817397a1b +go: downloading github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021 +go: downloading google.golang.org/api v0.60.0 +go: downloading github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb +go: downloading github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a +go: downloading github.com/mitchellh/mapstructure v1.4.1 +go: downloading github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f +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 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/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/godbus/dbus/v5 v5.0.6 +go: downloading github.com/kr/text v0.2.0 +go: downloading go.opentelemetry.io/contrib/propagators/b3 v1.10.0 +go: downloading github.com/moby/spdystream v0.2.0 +go: downloading github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 +go: downloading go.opentelemetry.io/contrib v0.20.0 +go: downloading github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 +go: downloading github.com/containerd/ttrpc v1.1.0 +go: downloading github.com/opencontainers/go-digest v1.0.0 +go: downloading golang.org/x/tools v0.2.0 +go: downloading github.com/euank/go-kmsg-parser v2.0.0+incompatible +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/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/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/stretchr/objx v0.4.0 +go: downloading gopkg.in/warnings.v0 v0.1.1 +go: downloading github.com/pquerna/cachecontrol v0.1.0 +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/gorilla/websocket v1.4.2 +go: downloading github.com/dustin/go-humanize v1.0.0 +go: downloading go.etcd.io/etcd/raft/v3 v3.5.5 +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/jmespath/go-jmespath v0.4.0 +go: downloading github.com/googleapis/gax-go/v2 v2.1.1 +go: downloading go.opencensus.io v0.23.0 +go: downloading github.com/go-ldap/ldap/v3 v3.4.3 +go: downloading github.com/cilium/ebpf v0.7.0 +go: downloading github.com/golang/glog v1.0.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/Azure/go-autorest/autorest/validation v0.1.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/sergi/go-diff v1.1.0 +go: downloading go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 +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 golang.org/x/mod v0.6.0 +go: downloading github.com/containerd/cgroups v1.0.1 +go: downloading github.com/opencontainers/image-spec v1.0.2 +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/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@c7296782f65144a9aed5b18bfb880fd4f9b9333e +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/apiextensions-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/apimachinery=github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiserver@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/cli-runtime=github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/client-go=github.com/openshift/kubernetes/staging/src/k8s.io/client-go@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/cloud-provider=github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/cluster-bootstrap=github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/code-generator=github.com/openshift/kubernetes/staging/src/k8s.io/code-generator@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/component-base=github.com/openshift/kubernetes/staging/src/k8s.io/component-base@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/component-helpers=github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/cri-api=github.com/openshift/kubernetes/staging/src/k8s.io/cri-api@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/csi-translation-lib=github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/dynamic-resource-allocation=github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kms=github.com/openshift/kubernetes/staging/src/k8s.io/kms@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kube-aggregator=github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kube-controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kube-proxy=github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kube-scheduler=github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kubectl=github.com/openshift/kubernetes/staging/src/k8s.io/kubectl@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kubelet=github.com/openshift/kubernetes/staging/src/k8s.io/kubelet@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/legacy-cloud-providers=github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/metrics=github.com/openshift/kubernetes/staging/src/k8s.io/metrics@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/mount-utils=github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/pod-security-admission=github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/sample-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/sample-cli-plugin=github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/sample-controller=github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller@v0.0.0-20230213202407-c7296782f651 +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-20230213202407-c7296782f651 +go mod edit -replace k8s.io/apiextensions-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/apimachinery=github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiserver@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/cli-runtime=github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/client-go=github.com/openshift/kubernetes/staging/src/k8s.io/client-go@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/cloud-provider=github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/cluster-bootstrap=github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/code-generator=github.com/openshift/kubernetes/staging/src/k8s.io/code-generator@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/component-base=github.com/openshift/kubernetes/staging/src/k8s.io/component-base@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/component-helpers=github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/cri-api=github.com/openshift/kubernetes/staging/src/k8s.io/cri-api@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/csi-translation-lib=github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/dynamic-resource-allocation=github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kms=github.com/openshift/kubernetes/staging/src/k8s.io/kms@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kube-aggregator=github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kube-controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kube-proxy=github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kube-scheduler=github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kubectl=github.com/openshift/kubernetes/staging/src/k8s.io/kubectl@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kubelet=github.com/openshift/kubernetes/staging/src/k8s.io/kubelet@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kubernetes=github.com/openshift/kubernetes@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/legacy-cloud-providers=github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/metrics=github.com/openshift/kubernetes/staging/src/k8s.io/metrics@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/mount-utils=github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/pod-security-admission=github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/sample-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/sample-cli-plugin=github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/sample-controller=github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller@v0.0.0-20230213202407-c7296782f651 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230213202407-c7296782f651 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230213202407-c7296782f651 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230213202407-c7296782f651 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230213202407-c7296782f651 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230213202407-c7296782f651 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230213202407-c7296782f651 +go: downloading github.com/openshift/kubernetes v0.0.0-20230213202407-c7296782f651 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230213202407-c7296782f651 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230213202407-c7296782f651 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230213202407-c7296782f651 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230213202407-c7296782f651 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230213202407-c7296782f651 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230213202407-c7296782f651 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230213202407-c7296782f651 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230213202407-c7296782f651 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230213202407-c7296782f651 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230213202407-c7296782f651 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230213202407-c7296782f651 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230213202407-c7296782f651 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230213202407-c7296782f651 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230213202407-c7296782f651 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230213202407-c7296782f651 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230213202407-c7296782f651 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230213202407-c7296782f651 +# Updating etcd/go.mod +go mod edit -require github.com/openshift/cluster-policy-controller@3f8efde27bb6a50e5d50f0798877d4d2e1154dcb +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/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f +go: downloading github.com/getsentry/raven-go v0.2.0 +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-20230213202407-c7296782f651 +go mod edit -replace k8s.io/apiextensions-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/apimachinery=github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiserver@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/cli-runtime=github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/client-go=github.com/openshift/kubernetes/staging/src/k8s.io/client-go@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/cloud-provider=github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/cluster-bootstrap=github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/code-generator=github.com/openshift/kubernetes/staging/src/k8s.io/code-generator@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/component-base=github.com/openshift/kubernetes/staging/src/k8s.io/component-base@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/component-helpers=github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/cri-api=github.com/openshift/kubernetes/staging/src/k8s.io/cri-api@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/csi-translation-lib=github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/dynamic-resource-allocation=github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kms=github.com/openshift/kubernetes/staging/src/k8s.io/kms@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kube-aggregator=github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kube-controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kube-proxy=github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kube-scheduler=github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kubectl=github.com/openshift/kubernetes/staging/src/k8s.io/kubectl@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kubelet=github.com/openshift/kubernetes/staging/src/k8s.io/kubelet@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/legacy-cloud-providers=github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/metrics=github.com/openshift/kubernetes/staging/src/k8s.io/metrics@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/mount-utils=github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/pod-security-admission=github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/sample-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/sample-cli-plugin=github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/sample-controller=github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller@v0.0.0-20230213202407-c7296782f651 +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-20230213202407-c7296782f651 +go mod edit -replace k8s.io/apiextensions-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/apimachinery=github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiserver@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/cli-runtime=github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/client-go=github.com/openshift/kubernetes/staging/src/k8s.io/client-go@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/cloud-provider=github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/cluster-bootstrap=github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/code-generator=github.com/openshift/kubernetes/staging/src/k8s.io/code-generator@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/component-base=github.com/openshift/kubernetes/staging/src/k8s.io/component-base@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/component-helpers=github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/cri-api=github.com/openshift/kubernetes/staging/src/k8s.io/cri-api@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/csi-translation-lib=github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/dynamic-resource-allocation=github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kms=github.com/openshift/kubernetes/staging/src/k8s.io/kms@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kube-aggregator=github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kube-controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kube-proxy=github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kube-scheduler=github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kubectl=github.com/openshift/kubernetes/staging/src/k8s.io/kubectl@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/kubelet=github.com/openshift/kubernetes/staging/src/k8s.io/kubelet@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/legacy-cloud-providers=github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/metrics=github.com/openshift/kubernetes/staging/src/k8s.io/metrics@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/mount-utils=github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/pod-security-admission=github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/sample-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/sample-cli-plugin=github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin@v0.0.0-20230213202407-c7296782f651 +go mod edit -replace k8s.io/sample-controller=github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller@v0.0.0-20230213202407-c7296782f651 +## Committing changes to microshift/go.mod +[rebase-4.14.0-0.nightly-2023-02-21-161452_amd64-2023-02-21_arm64-2023-02-27 f18c842b] update microshift/go.mod + 2 files changed, 86 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/0002-disable-APIrequestcount-controller.patch scripts/auto-rebase/rebase_patches/0003-disable-clusterQuotaMapping-controller.patch scripts/auto-rebase/rebase_patches/0004-remove-config-informer-and-cpu-partitioning-admission-plugin.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/0020-klog-component-names.patch scripts/auto-rebase/rebase_patches/0030-kube-controller-manager-command-context.patch; do \ + echo "Applying patch $p"; \ + git mailinfo /dev/null /dev/stderr 2<&1- < $p | git apply --reject || exit 1; \ +done +Applying patch scripts/auto-rebase/rebase_patches/0001-Fix-CSI-initialization-conflict.patch +Checking patch vendor/k8s.io/kubernetes/pkg/volume/csi/csi_plugin.go... +Applied patch vendor/k8s.io/kubernetes/pkg/volume/csi/csi_plugin.go cleanly. +Applying patch scripts/auto-rebase/rebase_patches/0002-disable-APIrequestcount-controller.patch +Checking patch vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go... +Applied patch vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go cleanly. +Applying patch scripts/auto-rebase/rebase_patches/0003-disable-clusterQuotaMapping-controller.patch +Checking patch vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go... +Applied patch vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go cleanly. +Applying patch scripts/auto-rebase/rebase_patches/0004-remove-config-informer-and-cpu-partitioning-admission-plugin.patch +Checking patch vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go... +error: while searching for: + "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" + + +error: patch failed: vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go:22 +error: while searching for: + sccadmission.NewInitializer(openshiftInformers.getOpenshiftSecurityInformers().Security().V1().SecurityContextConstraints()), + 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 + +error: patch failed: vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go:57 +Hunk #4 succeeded at 113 (offset 2 lines). +Hunk #5 succeeded at 121 (offset 2 lines). +Hunk #6 succeeded at 134 (offset 2 lines). +Hunk #7 succeeded at 142 (offset 2 lines). +Checking patch vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go... +error: while searching for: + "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" + +error: patch failed: vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go:12 +error: while searching for: + imagepolicy.Register(plugins) + ingressadmission.Register(plugins) + managementcpusoverride.Register(plugins) + managednode.Register(plugins) + projectnodeenv.Register(plugins) + quotaclusterresourceoverride.Register(plugins) + quotaclusterresourcequota.Register(plugins) + +error: patch failed: vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go:31 +error: while searching for: + "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 + +error: patch failed: vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go:73 +Applying patch vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go with 2 rejects... +Hunk #1 applied cleanly. +Rejected hunk #2. +Rejected hunk #3. +Hunk #4 applied cleanly. +Hunk #5 applied cleanly. +Hunk #6 applied cleanly. +Hunk #7 applied cleanly. +Applying patch vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go with 3 rejects... +Rejected hunk #1. +Rejected hunk #2. +Rejected hunk #3. +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..362bee76cb 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,115 +1,30 @@ -# 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 637a69416fb44ee6d55150f40fffb90db82803a6 + +# cluster-ingress-operator embedded-component 8eb2c667fd31a67d52c4d0ea6c5f014a9fe2ce0d to d523db546db824f13cc8822403fb90b6f7467f7f + +# cluster-kube-apiserver-operator embedded-component 6ad0a9407be5d5229d605665986899be4b531b5e to 9def85264fec138f12e8cb5746fe32d13e0747b5 + +# cluster-kube-controller-manager-operator embedded-component 4ca346ef97def3697f1aa0368c9b35459b9b2f59 to 7f293daf4d14fca5855513d3aaaf5b07d0e01d61 + +# cluster-kube-scheduler-operator embedded-component d3978864fb58063235be176c18fe50457b5223f3 to 05ac3aefa4d63bab9aadddc890dd9390a503ad57 + +# cluster-network-operator embedded-component 4d5a093d41e45def540ffbe4c5dc214550864d53 to a08b72091f4aa09718f17ebdd7426948986ecaf6 + +# cluster-policy-controller embedded-component ac01e3463245f2dd9312145368d7f4099a8a0bb9 to 3f8efde27bb6a50e5d50f0798877d4d2e1154dcb + +# kubernetes embedded-component 89232647de67ea787d339b1bd7c780a0ed97f3f9 to c7296782f65144a9aed5b18bfb880fd4f9b9333e + +# machine-config-operator embedded-component c078cdd2614e409faf0e9b13d97c426c065a71da to d22708eb4a26fb7c852a929affe1d50439b7e05f + +# openshift-controller-manager embedded-component 1c8021fcf40ccdc95a16bd8569b5ce53ecc09f0a to 67fcbf2f6e3d5922a1c451197d497eadddedcb8d + +# oc image-amd64 83fd126d7c7c598b1bfa398641d330e24596c2cf to 31c548165bd3cb6fe6c265ddfcabc7495dddb659 + +# coredns image-amd64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb to 064eec244109a6bf2e7ef57c161f9df78cce4fcd + +# router image-amd64 69eda4bd427c3f27d9993afa35461f4fc1dc0357 to 6144b9abe85ee434e586eba2f21b6b309357ee78 + +# ovn-kubernetes image-amd64 b244c306b58db1afb6bdd9124bfbcadc7aec8371 to 4d17668efe56ba2ebd324171cb2908fec4a49a67 + +# kubernetes image-amd64 89232647de67ea787d339b1bd7c780a0ed97f3f9 to c7296782f65144a9aed5b18bfb880fd4f9b9333e + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 59e7fcaf39..7546eebb59 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,23 +1,23 @@ -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-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-dns-operator embedded-component 637a69416fb44ee6d55150f40fffb90db82803a6 +https://github.com/openshift/cluster-ingress-operator embedded-component d523db546db824f13cc8822403fb90b6f7467f7f +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 9def85264fec138f12e8cb5746fe32d13e0747b5 +https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 7f293daf4d14fca5855513d3aaaf5b07d0e01d61 +https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 05ac3aefa4d63bab9aadddc890dd9390a503ad57 +https://github.com/openshift/cluster-network-operator embedded-component a08b72091f4aa09718f17ebdd7426948986ecaf6 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/cluster-policy-controller embedded-component 3f8efde27bb6a50e5d50f0798877d4d2e1154dcb 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 c7296782f65144a9aed5b18bfb880fd4f9b9333e +https://github.com/openshift/machine-config-operator embedded-component d22708eb4a26fb7c852a929affe1d50439b7e05f +https://github.com/openshift/openshift-controller-manager embedded-component 67fcbf2f6e3d5922a1c451197d497eadddedcb8d 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/coredns image-amd64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb -https://github.com/openshift/router image-amd64 69eda4bd427c3f27d9993afa35461f4fc1dc0357 +https://github.com/openshift/oc image-amd64 31c548165bd3cb6fe6c265ddfcabc7495dddb659 +https://github.com/openshift/coredns image-amd64 064eec244109a6bf2e7ef57c161f9df78cce4fcd +https://github.com/openshift/router image-amd64 6144b9abe85ee434e586eba2f21b6b309357ee78 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/ovn-kubernetes image-amd64 4d17668efe56ba2ebd324171cb2908fec4a49a67 +https://github.com/openshift/kubernetes image-amd64 c7296782f65144a9aed5b18bfb880fd4f9b9333e https://github.com/openshift/service-ca-operator image-amd64 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a https://github.com/openshift/oc image-arm64 83fd126d7c7c598b1bfa398641d330e24596c2cf https://github.com/openshift/coredns image-arm64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index b526a3d52b..d70ac613bc 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.14.0-0.nightly-2023-02-21-161452" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-02-27-084418" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12" diff --git a/vendor/k8s.io/klog/v2/goroutine_labels.go b/vendor/k8s.io/klog/v2/goroutine_labels.go deleted file mode 100644 index 50f2235b56..0000000000 --- a/vendor/k8s.io/klog/v2/goroutine_labels.go +++ /dev/null @@ -1,7 +0,0 @@ -package klog - -import "k8s.io/klog/v2/internal/buffer" - -func WithMicroshiftLoggerComponent(c string, f func()) { - buffer.WithMicroshiftLoggerComponent(c, f) -} diff --git a/vendor/k8s.io/klog/v2/internal/buffer/buffer.go b/vendor/k8s.io/klog/v2/internal/buffer/buffer.go index a29eb6263b..ac88682a2c 100644 --- a/vendor/k8s.io/klog/v2/internal/buffer/buffer.go +++ b/vendor/k8s.io/klog/v2/internal/buffer/buffer.go @@ -149,8 +149,6 @@ func (buf *Buffer) FormatHeader(s severity.Severity, file string, line int, now buf.Tmp[21] = ' ' buf.nDigits(7, 22, Pid, ' ') // TODO: should be TID buf.Tmp[29] = ' ' - buf.WriteString(getMicroshiftLoggerComponent()) - buf.WriteByte(' ') buf.Write(buf.Tmp[:30]) buf.WriteString(file) buf.Tmp[0] = ':' diff --git a/vendor/k8s.io/klog/v2/internal/buffer/goroutine_labels.go b/vendor/k8s.io/klog/v2/internal/buffer/goroutine_labels.go deleted file mode 100644 index 6e93bdbd85..0000000000 --- a/vendor/k8s.io/klog/v2/internal/buffer/goroutine_labels.go +++ /dev/null @@ -1,30 +0,0 @@ -package buffer - -import ( - "context" - "runtime/pprof" - "unsafe" -) - -//go:linkname runtime_getProfLabel runtime/pprof.runtime_getProfLabel -func runtime_getProfLabel() unsafe.Pointer - -func getMicroshiftLoggerComponent() string { - labels := (*map[string]string)(runtime_getProfLabel()) - if labels == nil { - return "???" - } - - c, ok := (*labels)["microshift_logger_component"] - if !ok { - return "???" - } - - return c -} - -func WithMicroshiftLoggerComponent(c string, f func()) { - pprof.Do(context.Background(), pprof.Labels("microshift_logger_component", c), func(context.Context) { - f() - }) -} 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.rej b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go.rej new file mode 100644 index 0000000000..257a920bff --- /dev/null +++ b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go.rej @@ -0,0 +1,25 @@ +diff a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go (rejected hunks) +@@ -12,7 +12,6 @@ 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" +@@ -31,7 +30,6 @@ 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) +@@ -73,7 +71,6 @@ 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/admission/autoscaling/managednode/admission.go b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/managednode/admission.go deleted file mode 100644 index d89c6423a0..0000000000 --- a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/managednode/admission.go +++ /dev/null @@ -1,136 +0,0 @@ -package managednode - -import ( - "context" - "fmt" - "io" - "strings" - - configv1 "github.com/openshift/api/config/v1" - configv1informer "github.com/openshift/client-go/config/informers/externalversions/config/v1" - configv1listers "github.com/openshift/client-go/config/listers/config/v1" - - "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/util/validation/field" - "k8s.io/apiserver/pkg/admission" - "k8s.io/apiserver/pkg/admission/initializer" - "k8s.io/kubernetes/pkg/kubelet/managed" - - corev1 "k8s.io/api/core/v1" - coreapi "k8s.io/kubernetes/pkg/apis/core" - - "k8s.io/client-go/kubernetes" -) - -const ( - PluginName = "autoscaling.openshift.io/ManagedNode" - // infraClusterName contains the name of the cluster infrastructure resource - infraClusterName = "cluster" -) - -var _ = initializer.WantsExternalKubeClientSet(&managedNodeValidate{}) -var _ = admission.ValidationInterface(&managedNodeValidate{}) -var _ = WantsInfraInformer(&managedNodeValidate{}) - -func Register(plugins *admission.Plugins) { - plugins.Register(PluginName, - func(_ io.Reader) (admission.Interface, error) { - return &managedNodeValidate{ - Handler: admission.NewHandler(admission.Create, admission.Update), - }, nil - }) -} - -type managedNodeValidate struct { - *admission.Handler - client kubernetes.Interface - infraConfigLister configv1listers.InfrastructureLister - infraConfigListSynced func() bool -} - -// SetExternalKubeClientSet implements the WantsExternalKubeClientSet interface. -func (a *managedNodeValidate) SetExternalKubeClientSet(client kubernetes.Interface) { - a.client = client -} - -func (a *managedNodeValidate) SetInfraInformer(informer configv1informer.InfrastructureInformer) { - a.infraConfigLister = informer.Lister() - a.infraConfigListSynced = informer.Informer().HasSynced -} - -func (a *managedNodeValidate) ValidateInitialization() error { - if a.client == nil { - return fmt.Errorf("%s plugin needs a kubernetes client", PluginName) - } - if a.infraConfigLister == nil { - return fmt.Errorf("%s did not get a config infrastructure lister", PluginName) - } - if a.infraConfigListSynced == nil { - return fmt.Errorf("%s plugin needs a config infrastructure lister synced", PluginName) - } - return nil -} - -func (a *managedNodeValidate) Validate(ctx context.Context, attr admission.Attributes, o admission.ObjectInterfaces) (err error) { - if attr.GetResource().GroupResource() != corev1.Resource("nodes") || attr.GetSubresource() != "" { - return nil - } - - node, ok := attr.GetObject().(*coreapi.Node) - if !ok { - return admission.NewForbidden(attr, fmt.Errorf("unexpected object: %#v", attr.GetResource())) - } - - // infraConfigListSynced is expected to be thread-safe since the underlying call is to the standard - // informer HasSynced() function which is thread-safe. - if !a.infraConfigListSynced() { - return admission.NewForbidden(attr, fmt.Errorf("%s infra config cache not synchronized", PluginName)) - } - - clusterInfra, err := a.infraConfigLister.Get(infraClusterName) - if err != nil { - return admission.NewForbidden(attr, err) // can happen due to informer latency - } - - // Check if we are in CPU Partitioning mode for AllNodes - allErrs := validateClusterCPUPartitioning(clusterInfra.Status, node) - if len(allErrs) == 0 { - return nil - } - return errors.NewInvalid(attr.GetKind().GroupKind(), node.Name, allErrs) -} - -// validateClusterCPUPartitioning Make sure that we only check nodes when CPU Partitioning is turned on. -// We also need to account for Single Node upgrades, during that initial upgrade, NTO will update this field during -// upgrade to make it authoritative from that point on. A roll back will revert an SingleNode cluster back to it's normal cycle. -// Other installations will have this field set at install time, and can not be turned off. -// -// If CPUPartitioning == AllNodes and is not empty value, check nodes -func validateClusterCPUPartitioning(infraStatus configv1.InfrastructureStatus, node *coreapi.Node) field.ErrorList { - errorMessage := "node does not contain resource information, this is required for clusters with workload partitioning enabled" - var allErrs field.ErrorList - - if infraStatus.CPUPartitioning == configv1.CPUPartitioningAllNodes { - if !containsCPUResource(node.Status.Capacity) { - allErrs = append(allErrs, getNodeInvalidWorkloadResourceError("capacity", errorMessage)) - } - if !containsCPUResource(node.Status.Allocatable) { - allErrs = append(allErrs, getNodeInvalidWorkloadResourceError("allocatable", errorMessage)) - } - } - - return allErrs -} - -func containsCPUResource(resources coreapi.ResourceList) bool { - for k := range resources { - if strings.Contains(k.String(), managed.WorkloadsCapacitySuffix) { - return true - } - } - return false -} - -func getNodeInvalidWorkloadResourceError(resourcePool, message string) *field.Error { - return field.Required(field.NewPath("status", resourcePool, managed.WorkloadsCapacitySuffix), message) -} diff --git a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/managednode/initializers.go b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/managednode/initializers.go deleted file mode 100644 index 512a5f8d03..0000000000 --- a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/managednode/initializers.go +++ /dev/null @@ -1,28 +0,0 @@ -package managednode - -import ( - "k8s.io/apiserver/pkg/admission" - - configv1informer "github.com/openshift/client-go/config/informers/externalversions/config/v1" -) - -func NewInitializer(infraInformer configv1informer.InfrastructureInformer) admission.PluginInitializer { - return &localInitializer{infraInformer: infraInformer} -} - -type WantsInfraInformer interface { - SetInfraInformer(informer configv1informer.InfrastructureInformer) - admission.InitializationValidator -} - -type localInitializer struct { - infraInformer configv1informer.InfrastructureInformer -} - -// Initialize will check the initialization interfaces implemented by each plugin -// and provide the appropriate initialization data -func (i *localInitializer) Initialize(plugin admission.Interface) { - if wants, ok := plugin.(WantsInfraInformer); ok { - wants.SetInfraInformer(i.infraInformer) - } -} diff --git a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/managementcpusoverride/admission.go b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/managementcpusoverride/admission.go index c672aeced2..b10969a75f 100644 --- a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/managementcpusoverride/admission.go +++ b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/managementcpusoverride/admission.go @@ -179,16 +179,6 @@ func (a *managementCPUsOverride) Admit(ctx context.Context, attr admission.Attri return admission.NewForbidden(attr, fmt.Errorf("%s node or namespace or infra config cache not synchronized", PluginName)) } - nodes, err := a.nodeLister.List(labels.Everything()) - if err != nil { - return admission.NewForbidden(attr, err) // can happen due to informer latency - } - - // we still need to have nodes under the cluster to decide if the management resource enabled or not - if len(nodes) == 0 { - return admission.NewForbidden(attr, fmt.Errorf("%s the cluster does not have any nodes", PluginName)) - } - clusterInfra, err := a.infraConfigLister.Get(infraClusterName) if err != nil { return admission.NewForbidden(attr, err) // can happen due to informer latency @@ -206,8 +196,26 @@ func (a *managementCPUsOverride) Admit(ctx context.Context, attr admission.Attri return nil } - // Check if we are in CPU Partitioning mode for AllNodes - if !isCPUPartitioning(clusterInfra.Status, nodes, workloadType) { + // not the SNO cluster, skip mutation + // TODO: currently we supports only SNO use case because we have not yet worked out the best approach to determining whether the feature + // should be on or off in a multi-node cluster, and computing that state incorrectly could lead to breaking running clusters. + if clusterInfra.Status.InfrastructureTopology != configv1.SingleReplicaTopologyMode || + clusterInfra.Status.ControlPlaneTopology != configv1.SingleReplicaTopologyMode { + return nil + } + + nodes, err := a.nodeLister.List(labels.Everything()) + if err != nil { + return admission.NewForbidden(attr, err) // can happen due to informer latency + } + + // we still need to have nodes under the cluster to decide if the management resource enabled or not + if len(nodes) == 0 { + return admission.NewForbidden(attr, fmt.Errorf("%s the cluster does not have any nodes", PluginName)) + } + + // probably the workload feature disabled, because some cluster nodes do not have workload resource + if err := isManagementResourceAvailableForAllNodes(nodes, workloadType); err != nil { return nil } @@ -276,21 +284,6 @@ func (a *managementCPUsOverride) Admit(ctx context.Context, attr admission.Attri return nil } -func isCPUPartitioning(infraStatus configv1.InfrastructureStatus, nodes []*corev1.Node, workloadType string) bool { - // If status is not for CPU partitioning and we're single node we also check nodes to support upgrade event - // TODO: This should not be needed after 4.13 as all clusters after should have this feature on at install time, or updated by migration in NTO. - if infraStatus.CPUPartitioning != configv1.CPUPartitioningAllNodes && infraStatus.ControlPlaneTopology == configv1.SingleReplicaTopologyMode { - managedResource := fmt.Sprintf("%s.%s", workloadType, containerWorkloadResourceSuffix) - for _, node := range nodes { - // We only expect a single node to exist, so we return on first hit - if _, ok := node.Status.Allocatable[corev1.ResourceName(managedResource)]; ok { - return true - } - } - } - return infraStatus.CPUPartitioning == configv1.CPUPartitioningAllNodes -} - func (a *managementCPUsOverride) getPodNamespace(attr admission.Attributes) (*corev1.Namespace, error) { ns, err := a.nsLister.Get(attr.GetNamespace()) if err == nil { @@ -319,7 +312,7 @@ func (a *managementCPUsOverride) waitForSyncedStore(timeout <-chan time.Time) bo select { case <-time.After(100 * time.Millisecond): case <-timeout: - return a.nsListerSynced() && a.nodeListSynced() && a.infraConfigListSynced() + return a.nsListerSynced() && a.nodeListSynced() } } @@ -449,6 +442,17 @@ func podHasBothCPULimitAndRequest(containers []coreapi.Container) bool { return false } +func isManagementResourceAvailableForAllNodes(nodes []*corev1.Node, workloadType string) error { + managedResource := fmt.Sprintf("%s.%s", workloadType, containerWorkloadResourceSuffix) + for _, node := range nodes { + if v, ok := node.Status.Allocatable[corev1.ResourceName(managedResource)]; !ok || v.IsZero() { + return fmt.Errorf("the node %q does not have resource %q", node.Name, managedResource) + } + } + + return nil +} + func doesNamespaceAllowWorkloadType(annotations map[string]string, workloadType string) bool { v, found := annotations[namespaceAllowedAnnotation] if !found { 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..589f1b2769 100644 --- a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go +++ b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go @@ -9,12 +9,18 @@ import ( "github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccadmission" 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" "k8s.io/apiserver/pkg/admission" genericapiserver "k8s.io/apiserver/pkg/server" clientgoinformers "k8s.io/client-go/informers" "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/managementcpusoverride" "k8s.io/kubernetes/openshift-kube-apiserver/admission/scheduler/nodeenv" "k8s.io/kubernetes/openshift-kube-apiserver/enablement" @@ -44,9 +50,11 @@ func OpenShiftKubeAPIServerConfigPatch(genericConfig *genericapiserver.Config, k *pluginInitializers = append(*pluginInitializers, imagepolicy.NewInitializer(imagereferencemutators.KubeImageMutators{}, enablement.OpenshiftConfig().ImagePolicyConfig.InternalRegistryHostname), + restrictusers.NewInitializer(openshiftInformers.getOpenshiftUserInformers()), sccadmission.NewInitializer(openshiftInformers.getOpenshiftSecurityInformers().Security().V1().SecurityContextConstraints()), nodeenv.NewInitializer(enablement.OpenshiftConfig().ProjectConfig.DefaultNodeSelector), admissionrestconfig.NewInitializer(*rest.CopyConfig(genericConfig.LoopbackClientConfig)), + managementcpusoverride.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 @@ -101,6 +109,10 @@ func newInformers(loopbackClientConfig *rest.Config) (*kubeAPIServerInformers, e if err != nil { return nil, err } + userClient, err := userclient.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. @@ -108,6 +120,12 @@ func newInformers(loopbackClientConfig *rest.Config) (*kubeAPIServerInformers, e ret := &kubeAPIServerInformers{ OpenshiftSecurityInformers: securityv1informer.NewSharedInformerFactory(securityClient, defaultInformerResyncPeriod), + OpenshiftUserInformers: userinformer.NewSharedInformerFactory(userClient, defaultInformerResyncPeriod), + } + if err := ret.OpenshiftUserInformers.User().V1().Groups().Informer().AddIndexers(cache.Indexers{ + usercache.ByUserIndexName: usercache.ByUserIndexKeys, + }); err != nil { + return nil, err } return ret, nil @@ -115,12 +133,17 @@ func newInformers(loopbackClientConfig *rest.Config) (*kubeAPIServerInformers, e type kubeAPIServerInformers struct { OpenshiftSecurityInformers securityv1informer.SharedInformerFactory + OpenshiftUserInformers userinformer.SharedInformerFactory } func (i *kubeAPIServerInformers) getOpenshiftSecurityInformers() securityv1informer.SharedInformerFactory { return i.OpenshiftSecurityInformers } +func (i *kubeAPIServerInformers) getOpenshiftUserInformers() userinformer.SharedInformerFactory { + return i.OpenshiftUserInformers +} func (i *kubeAPIServerInformers) Start(stopCh <-chan struct{}) { i.OpenshiftSecurityInformers.Start(stopCh) + i.OpenshiftUserInformers.Start(stopCh) } diff --git a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go.rej b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go.rej new file mode 100644 index 0000000000..00469004fd --- /dev/null +++ b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go.rej @@ -0,0 +1,19 @@ +diff a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go (rejected hunks) +@@ -22,8 +20,6 @@ import ( + "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" + +@@ -57,8 +53,6 @@ func OpenShiftKubeAPIServerConfigPatch(genericConfig *genericapiserver.Config, k + sccadmission.NewInitializer(openshiftInformers.getOpenshiftSecurityInformers().Security().V1().SecurityContextConstraints()), + 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 diff --git a/vendor/modules.txt b/vendor/modules.txt index 9f34e521e1..42c9a5d9b5 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -808,7 +808,7 @@ github.com/openshift/client-go/user/informers/externalversions/internalinterface github.com/openshift/client-go/user/informers/externalversions/user github.com/openshift/client-go/user/informers/externalversions/user/v1 github.com/openshift/client-go/user/listers/user/v1 -# github.com/openshift/cluster-policy-controller v0.0.0-20230217170320-ac01e3463245 +# github.com/openshift/cluster-policy-controller v0.0.0-20230112143856-3f8efde27bb6 ## explicit; go 1.19 github.com/openshift/cluster-policy-controller/pkg/client/genericinformers github.com/openshift/cluster-policy-controller/pkg/cmd/cluster-policy-controller @@ -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-20230213202407-c7296782f651 ## 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-20230213202407-c7296782f651 ## 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-20230213202407-c7296782f651 ## 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-20230213202407-c7296782f651 ## 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-20230213202407-c7296782f651 ## 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-20230213202407-c7296782f651 ## 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-20230213202407-c7296782f651 ## 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-20230213202407-c7296782f651 ## 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-20230213202407-c7296782f651 ## 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-20230213202407-c7296782f651 ## 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-20230213202407-c7296782f651 ## 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-20230213202407-c7296782f651 ## 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-20230213202407-c7296782f651 ## 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-20230213202407-c7296782f651 ## 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-20230213202407-c7296782f651 ## 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-20230213202407-c7296782f651 ## 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-20230213202407-c7296782f651 ## 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-20230213202407-c7296782f651 ## 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-20230213202407-c7296782f651 ## 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-20230213202407-c7296782f651 ## 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-20230213202407-c7296782f651 ## explicit; go 1.19 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -2282,7 +2282,6 @@ k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/apis/runoncedur k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/apis/runonceduration/v1 k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/apis/runonceduration/validation 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 k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/runonceduration k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation @@ -3048,7 +3047,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-20230213202407-c7296782f651 ## explicit; go 1.19 k8s.io/legacy-cloud-providers/aws k8s.io/legacy-cloud-providers/azure @@ -3091,7 +3090,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-20230213202407-c7296782f651 ## explicit; go 1.19 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3106,10 +3105,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-20230213202407-c7296782f651 ## 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.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230213202407-c7296782f651 ## explicit; go 1.19 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3252,33 +3251,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-20230213202407-c7296782f651 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230213202407-c7296782f651 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230213202407-c7296782f651 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230213202407-c7296782f651 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230213202407-c7296782f651 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230213202407-c7296782f651 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230213202407-c7296782f651 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230213202407-c7296782f651 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230213202407-c7296782f651 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230213202407-c7296782f651 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230213202407-c7296782f651 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230213202407-c7296782f651 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230213202407-c7296782f651 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230213202407-c7296782f651 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230213202407-c7296782f651 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230213202407-c7296782f651 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230213202407-c7296782f651 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230213202407-c7296782f651 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230213202407-c7296782f651 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230213202407-c7296782f651 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230213202407-c7296782f651 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230213202407-c7296782f651 +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230213202407-c7296782f651 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230213202407-c7296782f651 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230213202407-c7296782f651 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230213202407-c7296782f651 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230213202407-c7296782f651 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230213202407-c7296782f651 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230213202407-c7296782f651 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230213202407-c7296782f651