diff --git a/etcd/go.mod b/etcd/go.mod index d0f1288eec..c4a7f7b8fe 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -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-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230221040739-518f3edfe79c // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230221040739-518f3edfe79c // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230221040739-518f3edfe79c // staging 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 // 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 ) diff --git a/etcd/go.sum b/etcd/go.sum index 811e123f00..c31c3580b3 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-20230221040739-518f3edfe79c h1:I5XubLaz4uSEbq2G79XfSdQh2V6rj5zvn7csPzo7uVg= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230221040739-518f3edfe79c/go.mod h1:SVFZVmcfr/QnDkKqmBvlVlhurEsml57BUNDH+R/CPqk= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230221040739-518f3edfe79c h1:9RM60o8kqfjkXiOsXGXBoO9zBRlIXhnJSgWneEMZ6dU= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230221040739-518f3edfe79c/go.mod h1:fcaZu5DOMCvnjHsoJrKV5iQLvaiOTv50bj8okFxwYFw= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230221040739-518f3edfe79c h1:mf/0JxNsi3uZGcE9HPTazdLw5Gh6WioFp2QVezAB9rs= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230221040739-518f3edfe79c/go.mod h1:CO72fYg4kCwaSLKgV6oMT9N1k5jhe8ZfxN1Rv7i9aL0= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230221040739-518f3edfe79c h1:eyQCT2qdqjT52L6uCa2tm4SuKfgJp093Zs+Y49RZTWg= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230221040739-518f3edfe79c/go.mod h1:salqUyIbJbHU1a9StwrX18tkxIoZejk8BQB9aYNkIPk= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230221040739-518f3edfe79c h1:8NRqWb4DdYlwFsUpwJx+SVtTsGx6qbzGH7blig1EnOk= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230221040739-518f3edfe79c/go.mod h1:g5iGehpfJ/sjrrPZotg2ndVBM1qrl/xlKDEC6CJwoRo= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230221040739-518f3edfe79c h1:fUAaOqyuJ4AWEq/L/KXyTry7SsZDKzKlON2/VRcu+cY= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230221040739-518f3edfe79c/go.mod h1:y/nn+aWz2wp+2mklRHKwQb5C36SqiS4mCgw2/C1HRpM= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230221040739-518f3edfe79c h1:w3b3rP7kG9GiOKowcfAy6E63iQx3wlmqcHdUfvGTFB8= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230221040739-518f3edfe79c/go.mod h1:pfu0i4DFeQXwdlNs9TQpFEUK+8y4I3HSCzqbmQDobJ8= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230221040739-518f3edfe79c h1:KBPXtOFU89LnEuDO13iiL1P354/nUH+aPOq/arNrJu4= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230221040739-518f3edfe79c/go.mod h1:+K4RuDOLxtVWiPZfUefwPoYThb9BEmWYp5zId0KFgU0= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230221040739-518f3edfe79c h1:Q3rGj5sV3w/8pzOuI4XV0B1STXQHwVXo8+JB67FQuhU= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230221040739-518f3edfe79c/go.mod h1:IrwH1whPmwqMMBuqU2Gkb2cdmdqTg5zpbYsPC9KF8hY= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230221040739-518f3edfe79c h1:FzG2/kehCJOVcUssHrIoVHaOSMUmSfYVGGLnCZtZbHM= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230221040739-518f3edfe79c/go.mod h1:NXsaH8tQ1U2J3w6IW8hNaC4ZQFJvkC2lVoXOXZQ8ii0= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230221040739-518f3edfe79c h1:vFMublyZ7nkEMxBD8y5FDt5XKv216adFPa4GVom1iWk= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230221040739-518f3edfe79c/go.mod h1:6p383itqHHhUKvZADAr+LDVXOJ4ZWo0tBKVxTjqc9UY= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230221040739-518f3edfe79c h1:Y9vyI6bPTf7N1trIDfhfRw+qRgVFTaUng7K9czxMCu8= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230221040739-518f3edfe79c/go.mod h1:7VSG6sD9u3yCsNAz3+TYBN6oNXmBmfX32o9piXgdUHQ= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230221040739-518f3edfe79c h1:QmU3g0OF0PjO58cuf5OFNaXhixKg5rUCB3lNy17ypsk= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230221040739-518f3edfe79c/go.mod h1:n49VMDfRrPr3RdbpZRjo4yIF65v6ryFoeflGeAFItyc= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230221040739-518f3edfe79c h1:QhneT0R4ALRESRqx8Xqyq3Anbtt6OsaQtIdRMBh7IUA= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230221040739-518f3edfe79c/go.mod h1:y8fO9+mZJPj9OK26w+MwxW4kUf+bJh1CHsPYvRjwYoA= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230223163248-89232647de67 h1:jodZbyQh9GPxPR97CE430QxolCRK0mk7oZ70sulRxgI= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230223163248-89232647de67/go.mod h1:SVFZVmcfr/QnDkKqmBvlVlhurEsml57BUNDH+R/CPqk= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230223163248-89232647de67 h1:kO4mM0qG9nkleOgVM+P8j++CWIigGdBkaiOKAjeHxMs= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230223163248-89232647de67/go.mod h1:fcaZu5DOMCvnjHsoJrKV5iQLvaiOTv50bj8okFxwYFw= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230223163248-89232647de67 h1:g8TIpCLp5/kZi6BBGDnY4Wqaw0Rj49QEX9RINciIeD8= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230223163248-89232647de67/go.mod h1:CO72fYg4kCwaSLKgV6oMT9N1k5jhe8ZfxN1Rv7i9aL0= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230223163248-89232647de67 h1:B9MD7YTmV1H6YCyH/xQMBOt92xUvEUr2AIqSPNBKOW0= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230223163248-89232647de67/go.mod h1:salqUyIbJbHU1a9StwrX18tkxIoZejk8BQB9aYNkIPk= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230223163248-89232647de67 h1:XBWzd4WZ5WWElSF5NQIAc0amOIOPdF/1OLERO1fKwjg= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230223163248-89232647de67/go.mod h1:g5iGehpfJ/sjrrPZotg2ndVBM1qrl/xlKDEC6CJwoRo= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230223163248-89232647de67 h1:oI+hUXmAZs5/DhIfBpD2IRZfR47eiKkjYaibFMja+44= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230223163248-89232647de67/go.mod h1:y/nn+aWz2wp+2mklRHKwQb5C36SqiS4mCgw2/C1HRpM= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230223163248-89232647de67 h1:eni4EViEO+I0Kfxyq0NW0C5AxQjGFKfakFsN1TJU1n4= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230223163248-89232647de67/go.mod h1:pfu0i4DFeQXwdlNs9TQpFEUK+8y4I3HSCzqbmQDobJ8= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230223163248-89232647de67 h1:3o/vN/o1/BX0pSXnzxSBFAfs8xO+7YZkfA5x28p1TDI= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230223163248-89232647de67/go.mod h1:+K4RuDOLxtVWiPZfUefwPoYThb9BEmWYp5zId0KFgU0= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230223163248-89232647de67 h1:4RoVjs10TFjwM1hKjMt1mRN/oVInSh6SfAqPLLUG1wM= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230223163248-89232647de67/go.mod h1:IrwH1whPmwqMMBuqU2Gkb2cdmdqTg5zpbYsPC9KF8hY= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230223163248-89232647de67 h1:ClQHFBI/h6g75rl75DYTd87lm3cqkWCcLz7ge5lpTRQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230223163248-89232647de67/go.mod h1:NXsaH8tQ1U2J3w6IW8hNaC4ZQFJvkC2lVoXOXZQ8ii0= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230223163248-89232647de67 h1:bsS++odMO5hvu7njKc3sTt+QqR9mYszQSzvN+uaLLgQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230223163248-89232647de67/go.mod h1:6p383itqHHhUKvZADAr+LDVXOJ4ZWo0tBKVxTjqc9UY= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230223163248-89232647de67 h1:9bgKIabZ59hgFivSWZb+0kPm/MbFcGD3f9JhF7HIbyw= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230223163248-89232647de67/go.mod h1:7VSG6sD9u3yCsNAz3+TYBN6oNXmBmfX32o9piXgdUHQ= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230223163248-89232647de67 h1:vmW1Jb6zsFOuYbCfDsMN5dDS2b6AI+4tjv5wCIaAXvY= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230223163248-89232647de67/go.mod h1:n49VMDfRrPr3RdbpZRjo4yIF65v6ryFoeflGeAFItyc= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230223163248-89232647de67 h1:Bc5AtKJhmjgGUF4Q5NX3LEP2HmU6EnnzvB0o5jnhEA4= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230223163248-89232647de67/go.mod h1:y8fO9+mZJPj9OK26w+MwxW4kUf+bJh1CHsPYvRjwYoA= github.com/openshift/library-go v0.0.0-20230130232623-47904dd9ff5a h1:OzF7I7mAzO4SBo5eO5CWoCTgMDydN/Tf2/Rq8YbMpT0= github.com/openshift/library-go v0.0.0-20230130232623-47904dd9ff5a/go.mod h1:xO4nAf0qa56dgvEJWVD1WuwSJ8JWPU1TYLBQrlutWnE= github.com/openshift/onsi-ginkgo/v2 v2.4.1-0.20221214150008-e73634cb3870 h1:YH3Z3ZWCDWjkAGdZpK5rCm5pRZ4wt0uEx1GwvCiO3+I= diff --git a/go.mod b/go.mod index 3adca46292..311f34d9f3 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e // openshift-controller-manager github.com/miekg/dns v1.1.35 // microshift github.com/mitchellh/go-homedir v1.1.0 // microshift - github.com/openshift/api v0.0.0-20230201213816-61d971884921 + 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 @@ -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-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230221040739-518f3edfe79c // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230221040739-518f3edfe79c // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230221040739-518f3edfe79c // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230221040739-518f3edfe79c // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230221040739-518f3edfe79c // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230221040739-518f3edfe79c // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230221040739-518f3edfe79c // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230221040739-518f3edfe79c // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230221040739-518f3edfe79c // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230221040739-518f3edfe79c // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230221040739-518f3edfe79c // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230221040739-518f3edfe79c // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230221040739-518f3edfe79c // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230221040739-518f3edfe79c // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230221040739-518f3edfe79c // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230221040739-518f3edfe79c // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230221040739-518f3edfe79c // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230221040739-518f3edfe79c // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230221040739-518f3edfe79c // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230221040739-518f3edfe79c // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230221040739-518f3edfe79c // 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 ) diff --git a/go.sum b/go.sum index 6757d144e4..d840320f95 100644 --- a/go.sum +++ b/go.sum @@ -598,8 +598,8 @@ 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 h1:19XfhG/rG4oxNOQ1PNtHIjW23z2+QNHC6lH1VZWhSWY= -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= github.com/openshift/apiserver-library-go v0.0.0-20230120221150-cefee9e0162b/go.mod h1:FmOGJTf5L1X9LiqnsNDwKJyt5ycUNxnNqpxs0rgylTc= github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d h1:RR4ah7FfaPR1WePizm0jlrsbmPu91xQZnAsVVreQV1k= @@ -608,57 +608,57 @@ github.com/openshift/client-go v0.0.0-20230120202327-72f107311084 h1:66uaqNwA+qY github.com/openshift/client-go v0.0.0-20230120202327-72f107311084/go.mod h1:M3h9m001PWac3eAudGG3isUud6yBjr5XpzLYLLTlHKo= github.com/openshift/cluster-policy-controller v0.0.0-20230217170320-ac01e3463245 h1:BoNt9Hemwyc32xX+CZZaNGegWEiN7bGTVk4XaRboO8k= github.com/openshift/cluster-policy-controller v0.0.0-20230217170320-ac01e3463245/go.mod h1:vlkRuwyRueLOQ/ZRRle+rCrh+YNoh+pzJm9WaN9e6mU= -github.com/openshift/kubernetes v0.0.0-20230221040739-518f3edfe79c h1:byAH+qLl4rcPAHuYEpcX7rx3/+kGVI1CyICRb6CGwTk= -github.com/openshift/kubernetes v0.0.0-20230221040739-518f3edfe79c/go.mod h1:X+oZfq0zUE+lpHZTcVDnge20xxiyXC+XSuyivKCn5YE= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230221040739-518f3edfe79c h1:I5XubLaz4uSEbq2G79XfSdQh2V6rj5zvn7csPzo7uVg= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230221040739-518f3edfe79c/go.mod h1:SVFZVmcfr/QnDkKqmBvlVlhurEsml57BUNDH+R/CPqk= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230221040739-518f3edfe79c h1:XrKWMnzYF5EOcb//Ln6a8YyrGNb2MXaucKyPdO1SSu4= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230221040739-518f3edfe79c/go.mod h1:6TuEWeKgBs443fLsnv4iOAeGNgpQcNytep4PPOq/l7Q= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230221040739-518f3edfe79c h1:9RM60o8kqfjkXiOsXGXBoO9zBRlIXhnJSgWneEMZ6dU= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230221040739-518f3edfe79c/go.mod h1:fcaZu5DOMCvnjHsoJrKV5iQLvaiOTv50bj8okFxwYFw= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230221040739-518f3edfe79c h1:mf/0JxNsi3uZGcE9HPTazdLw5Gh6WioFp2QVezAB9rs= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230221040739-518f3edfe79c/go.mod h1:CO72fYg4kCwaSLKgV6oMT9N1k5jhe8ZfxN1Rv7i9aL0= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230221040739-518f3edfe79c h1:eyQCT2qdqjT52L6uCa2tm4SuKfgJp093Zs+Y49RZTWg= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230221040739-518f3edfe79c/go.mod h1:salqUyIbJbHU1a9StwrX18tkxIoZejk8BQB9aYNkIPk= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230221040739-518f3edfe79c h1:8NRqWb4DdYlwFsUpwJx+SVtTsGx6qbzGH7blig1EnOk= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230221040739-518f3edfe79c/go.mod h1:g5iGehpfJ/sjrrPZotg2ndVBM1qrl/xlKDEC6CJwoRo= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230221040739-518f3edfe79c h1:fUAaOqyuJ4AWEq/L/KXyTry7SsZDKzKlON2/VRcu+cY= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230221040739-518f3edfe79c/go.mod h1:y/nn+aWz2wp+2mklRHKwQb5C36SqiS4mCgw2/C1HRpM= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230221040739-518f3edfe79c h1:w3b3rP7kG9GiOKowcfAy6E63iQx3wlmqcHdUfvGTFB8= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230221040739-518f3edfe79c/go.mod h1:pfu0i4DFeQXwdlNs9TQpFEUK+8y4I3HSCzqbmQDobJ8= -github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230221040739-518f3edfe79c/go.mod h1:ZjLs0DK9L3Xxjv99ioET5vBULmFymo1Dc1ZzF6G6L6c= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230221040739-518f3edfe79c h1:KBPXtOFU89LnEuDO13iiL1P354/nUH+aPOq/arNrJu4= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230221040739-518f3edfe79c/go.mod h1:+K4RuDOLxtVWiPZfUefwPoYThb9BEmWYp5zId0KFgU0= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230221040739-518f3edfe79c h1:Q3rGj5sV3w/8pzOuI4XV0B1STXQHwVXo8+JB67FQuhU= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230221040739-518f3edfe79c/go.mod h1:IrwH1whPmwqMMBuqU2Gkb2cdmdqTg5zpbYsPC9KF8hY= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230221040739-518f3edfe79c h1:HJ5SJfJTnfDIB4tdEyfgqQc6hEZdWSc5EAIEtGWaiFQ= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230221040739-518f3edfe79c/go.mod h1:AuOKusKtXgnoNwjX3FYoY9nSggJKZBk9TYeUoM5dnws= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230221040739-518f3edfe79c h1:Xwlgv8NUQ/9PxIXpGQxjzgNGTIGDq4Ngw58MoogL6lE= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230221040739-518f3edfe79c/go.mod h1:TVwnVXG26sqo03sNVSJzkjIXBXB1r5KcoNJPliZ7SjM= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230221040739-518f3edfe79c h1:6DN7VKKHt6td1kVAnVZbJ6N1Zbc/xmcH1OMKbUDfaMg= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230221040739-518f3edfe79c/go.mod h1:tK3gKkqt21TbFbG/1xF5M8Q1zWAmuhS6wO3SGZd0nmw= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230221040739-518f3edfe79c h1:dMxdluHtXPxc44GeksQIrLGWTxlmE7i+abFDOrKCvkg= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230221040739-518f3edfe79c/go.mod h1:mgVmrJ+p9PHz4zZwo7XouLoex4tpJz3Rb8uPcw6+IJE= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230221040739-518f3edfe79c h1:FzG2/kehCJOVcUssHrIoVHaOSMUmSfYVGGLnCZtZbHM= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230221040739-518f3edfe79c/go.mod h1:NXsaH8tQ1U2J3w6IW8hNaC4ZQFJvkC2lVoXOXZQ8ii0= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230221040739-518f3edfe79c h1:QdA0kIvT0P8m5l8trhNwvHZdzMF6+4NrepuI1teRrC0= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230221040739-518f3edfe79c/go.mod h1:YEIiQsb6SFoP9Y4gunC2nL+EL/SDEjfg++eDyZDBV18= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230221040739-518f3edfe79c h1:RGKtGFdaMvad/4HryHTA+xblJyaabBaCQsasgnCfbpk= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230221040739-518f3edfe79c/go.mod h1:wfRwoBCCxtoS6dmP/ijU2pC1u1COgMcL2qppCHqCeWg= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230221040739-518f3edfe79c h1:RJVaq9Mc4vTOFRdmz+KvA777ch9I+Hzc9zKlQicXytg= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230221040739-518f3edfe79c/go.mod h1:0hEeqiK9VnRfKjEzziZZ/UdzDn2zolWihYE/iWC4wUM= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230221040739-518f3edfe79c h1:vFMublyZ7nkEMxBD8y5FDt5XKv216adFPa4GVom1iWk= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230221040739-518f3edfe79c/go.mod h1:6p383itqHHhUKvZADAr+LDVXOJ4ZWo0tBKVxTjqc9UY= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230221040739-518f3edfe79c h1:Y9vyI6bPTf7N1trIDfhfRw+qRgVFTaUng7K9czxMCu8= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230221040739-518f3edfe79c/go.mod h1:7VSG6sD9u3yCsNAz3+TYBN6oNXmBmfX32o9piXgdUHQ= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230221040739-518f3edfe79c h1:cb7BHRJLyDHL9qIFEqVQqyxVX3rwjAkQUtyM30uEuow= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230221040739-518f3edfe79c/go.mod h1:VD+1/CcB3GhJH1hrDcxv/Idr3wYEN5YURxV/QRrRLJk= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230221040739-518f3edfe79c h1:l5IRLAMXCQEzanqpxsSHhzrWiBoXhgVSa4IXzBQmW8I= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230221040739-518f3edfe79c/go.mod h1:Yjxnfo5lUPUSBUqfhgoAS19ZFY/JhMC16dgEw0ilIoU= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230221040739-518f3edfe79c h1:QmU3g0OF0PjO58cuf5OFNaXhixKg5rUCB3lNy17ypsk= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230221040739-518f3edfe79c/go.mod h1:n49VMDfRrPr3RdbpZRjo4yIF65v6ryFoeflGeAFItyc= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230221040739-518f3edfe79c h1:QhneT0R4ALRESRqx8Xqyq3Anbtt6OsaQtIdRMBh7IUA= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230221040739-518f3edfe79c/go.mod h1:y8fO9+mZJPj9OK26w+MwxW4kUf+bJh1CHsPYvRjwYoA= +github.com/openshift/kubernetes v0.0.0-20230223163248-89232647de67 h1:dewYsajZF/pAgiTsn7qTCQD7b2mPX6RHdoXRS5UCdFA= +github.com/openshift/kubernetes v0.0.0-20230223163248-89232647de67/go.mod h1:1TasN9CV9saCSh+Nk2dHjqKZc46B2e1yM14mtGKyK+c= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230223163248-89232647de67 h1:jodZbyQh9GPxPR97CE430QxolCRK0mk7oZ70sulRxgI= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230223163248-89232647de67/go.mod h1:SVFZVmcfr/QnDkKqmBvlVlhurEsml57BUNDH+R/CPqk= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230223163248-89232647de67 h1:vH6wwtAYyrods9Tkov8YY/NTDEglxMdYqBE/ikZ4vrE= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230223163248-89232647de67/go.mod h1:cwvC6XCAm5R2g+jlAhmBrZ6/W4WlbwynzMHd/mx4xuM= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230223163248-89232647de67 h1:kO4mM0qG9nkleOgVM+P8j++CWIigGdBkaiOKAjeHxMs= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230223163248-89232647de67/go.mod h1:fcaZu5DOMCvnjHsoJrKV5iQLvaiOTv50bj8okFxwYFw= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230223163248-89232647de67 h1:g8TIpCLp5/kZi6BBGDnY4Wqaw0Rj49QEX9RINciIeD8= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230223163248-89232647de67/go.mod h1:CO72fYg4kCwaSLKgV6oMT9N1k5jhe8ZfxN1Rv7i9aL0= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230223163248-89232647de67 h1:B9MD7YTmV1H6YCyH/xQMBOt92xUvEUr2AIqSPNBKOW0= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230223163248-89232647de67/go.mod h1:salqUyIbJbHU1a9StwrX18tkxIoZejk8BQB9aYNkIPk= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230223163248-89232647de67 h1:XBWzd4WZ5WWElSF5NQIAc0amOIOPdF/1OLERO1fKwjg= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230223163248-89232647de67/go.mod h1:g5iGehpfJ/sjrrPZotg2ndVBM1qrl/xlKDEC6CJwoRo= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230223163248-89232647de67 h1:oI+hUXmAZs5/DhIfBpD2IRZfR47eiKkjYaibFMja+44= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230223163248-89232647de67/go.mod h1:y/nn+aWz2wp+2mklRHKwQb5C36SqiS4mCgw2/C1HRpM= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230223163248-89232647de67 h1:eni4EViEO+I0Kfxyq0NW0C5AxQjGFKfakFsN1TJU1n4= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230223163248-89232647de67/go.mod h1:pfu0i4DFeQXwdlNs9TQpFEUK+8y4I3HSCzqbmQDobJ8= +github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230223163248-89232647de67/go.mod h1:ZjLs0DK9L3Xxjv99ioET5vBULmFymo1Dc1ZzF6G6L6c= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230223163248-89232647de67 h1:3o/vN/o1/BX0pSXnzxSBFAfs8xO+7YZkfA5x28p1TDI= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230223163248-89232647de67/go.mod h1:+K4RuDOLxtVWiPZfUefwPoYThb9BEmWYp5zId0KFgU0= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230223163248-89232647de67 h1:4RoVjs10TFjwM1hKjMt1mRN/oVInSh6SfAqPLLUG1wM= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230223163248-89232647de67/go.mod h1:IrwH1whPmwqMMBuqU2Gkb2cdmdqTg5zpbYsPC9KF8hY= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230223163248-89232647de67 h1:wvNSqeJvcGelybVgZS5fuUjGEOGlnxTACbjIkgat4c8= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230223163248-89232647de67/go.mod h1:AuOKusKtXgnoNwjX3FYoY9nSggJKZBk9TYeUoM5dnws= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230223163248-89232647de67 h1:y6O2w4f6gPaK0zJ+lWD2QEh5I0nz5K/YvRExy+iyNf4= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230223163248-89232647de67/go.mod h1:TVwnVXG26sqo03sNVSJzkjIXBXB1r5KcoNJPliZ7SjM= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230223163248-89232647de67 h1:/CYcEisaj3xhjhTA/rAZK634iqlFa0qOb0T6HCnkwAw= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230223163248-89232647de67/go.mod h1:tK3gKkqt21TbFbG/1xF5M8Q1zWAmuhS6wO3SGZd0nmw= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230223163248-89232647de67 h1:0y3RpX8Y2J1QnzOFhC+hAxYVpYTY2vTRM7iz2XjfsW8= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230223163248-89232647de67/go.mod h1:mgVmrJ+p9PHz4zZwo7XouLoex4tpJz3Rb8uPcw6+IJE= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230223163248-89232647de67 h1:ClQHFBI/h6g75rl75DYTd87lm3cqkWCcLz7ge5lpTRQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230223163248-89232647de67/go.mod h1:NXsaH8tQ1U2J3w6IW8hNaC4ZQFJvkC2lVoXOXZQ8ii0= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230223163248-89232647de67 h1:UxMSfSa6zN8KM519Bo5sI3fK0/FbmZ3B60L4wh6Y7OE= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230223163248-89232647de67/go.mod h1:YEIiQsb6SFoP9Y4gunC2nL+EL/SDEjfg++eDyZDBV18= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230223163248-89232647de67 h1:iA0Z2NZNC9o6DKfdhUOBw7YMKZKaR+33IEn2YpuJyRc= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230223163248-89232647de67/go.mod h1:wfRwoBCCxtoS6dmP/ijU2pC1u1COgMcL2qppCHqCeWg= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230223163248-89232647de67 h1:b0pp/eYVg/KNWg4HUmskyXGqxwnzRjvpbjY8XB6dqf4= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230223163248-89232647de67/go.mod h1:0hEeqiK9VnRfKjEzziZZ/UdzDn2zolWihYE/iWC4wUM= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230223163248-89232647de67 h1:bsS++odMO5hvu7njKc3sTt+QqR9mYszQSzvN+uaLLgQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230223163248-89232647de67/go.mod h1:6p383itqHHhUKvZADAr+LDVXOJ4ZWo0tBKVxTjqc9UY= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230223163248-89232647de67 h1:9bgKIabZ59hgFivSWZb+0kPm/MbFcGD3f9JhF7HIbyw= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230223163248-89232647de67/go.mod h1:7VSG6sD9u3yCsNAz3+TYBN6oNXmBmfX32o9piXgdUHQ= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230223163248-89232647de67 h1:J/9hK40KkOnSw2MzzW+IHAIuI8frMTnDqn90v2Y4E+c= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230223163248-89232647de67/go.mod h1:VD+1/CcB3GhJH1hrDcxv/Idr3wYEN5YURxV/QRrRLJk= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230223163248-89232647de67 h1:s5UgYGleFuVQpDhYxauo2F9glav4K6hdtxGlxSN1zoE= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230223163248-89232647de67/go.mod h1:Yjxnfo5lUPUSBUqfhgoAS19ZFY/JhMC16dgEw0ilIoU= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230223163248-89232647de67 h1:vmW1Jb6zsFOuYbCfDsMN5dDS2b6AI+4tjv5wCIaAXvY= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230223163248-89232647de67/go.mod h1:n49VMDfRrPr3RdbpZRjo4yIF65v6ryFoeflGeAFItyc= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230223163248-89232647de67 h1:Bc5AtKJhmjgGUF4Q5NX3LEP2HmU6EnnzvB0o5jnhEA4= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230223163248-89232647de67/go.mod h1:y8fO9+mZJPj9OK26w+MwxW4kUf+bJh1CHsPYvRjwYoA= github.com/openshift/library-go v0.0.0-20230127195720-edf819b079cf/go.mod h1:xO4nAf0qa56dgvEJWVD1WuwSJ8JWPU1TYLBQrlutWnE= github.com/openshift/library-go v0.0.0-20230130232623-47904dd9ff5a h1:OzF7I7mAzO4SBo5eO5CWoCTgMDydN/Tf2/Rq8YbMpT0= github.com/openshift/library-go v0.0.0-20230130232623-47904dd9ff5a/go.mod h1:xO4nAf0qa56dgvEJWVD1WuwSJ8JWPU1TYLBQrlutWnE= diff --git a/rebase_sh.log b/rebase_sh.log new file mode 100644 index 0000000000..935cc8fa2e --- /dev/null +++ b/rebase_sh.log @@ -0,0 +1,611 @@ +# Rebasing to registry.ci.openshift.org/ocp/release:4.13.0-0.nightly-2023-02-27-101545 and registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-03-01-231404 +# Fetching release info for registry.ci.openshift.org/ocp/release:4.13.0-0.nightly-2023-02-27-101545 (amd64) +# Fetching release info for registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-03-01-231404 (arm64) +# Extracting registry.ci.openshift.org/ocp/release:4.13.0-0.nightly-2023-02-27-101545 manifest content +# Cloning registry.ci.openshift.org/ocp/release:4.13.0-0.nightly-2023-02-27-101545 component repos +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-dns-operator/.git/ +HEAD is now at ccd55d0 Merge pull request #353 from alebedev87/x-net-http2-cve-2022-41717 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-ingress-operator/.git/ +HEAD is now at 8eb2c66 Merge pull request #846 from r4f4/azure-adal-deprecation + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-apiserver-operator/.git/ +HEAD is now at 6ad0a94 Merge pull request #1434 from dobsonj/STOR-1051 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-controller-manager-operator/.git/ +HEAD is now at 4ca346e Merge pull request #701 from ingvagabund/enable-DynamicResourceAllocation-feature-gate-for-tech-preview + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-scheduler-operator/.git/ +HEAD is now at d397886 Merge pull request #463 from ingvagabund/enable-DynamicResourceAllocation-feature-gate-for-tech-preview + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-network-operator/.git/ +HEAD is now at 4d5a093 Merge pull request #1633 from tkashem/apf-v1beta3 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-openshift-controller-manager-operator/.git/ +HEAD is now at 7867c26 Merge pull request #273 from tkashem/apf-use-v1beta3 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-policy-controller/.git/ +HEAD is now at ac01e34 Merge pull request #103 from perdasilva/update_psa_dep + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/etcd/.git/ +HEAD is now at 13c18c44 Merge pull request #181 from openshift-bot/art-consistency-openshift-4.13-ose-etcd + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/kubernetes/.git/ +HEAD is now at 89232647d Merge pull request #1312 from eggfoobar/wrk-prt-multi-node + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/machine-config-operator/.git/ +HEAD is now at c078cdd2 Merge pull request #3567 from lobziik/update-crd + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/openshift-controller-manager/.git/ +HEAD is now at 1c8021f Merge pull request #251 from gabemontero/revert-sharedresources-ga + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/route-controller-manager/.git/ +HEAD is now at d7a8e22 Merge pull request #16 from ingvagabund/gomoddep + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/service-ca-operator/.git/ +HEAD is now at 1b89fdc Merge pull request #202 from benluddy/no-stop-error + +# Cloning registry.ci.openshift.org/ocp/release:4.13.0-0.nightly-2023-02-27-101545 image repos +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/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/amd64/coredns/.git/ +HEAD is now at 5560e4a Merge pull request #88 from gcs278/merge-1.10.1 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/router/.git/ +HEAD is now at 69eda4b Merge pull request #451 from gcs278/k8s-1.26-bump + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/kube-rbac-proxy/.git/ +HEAD is now at 0aa2830 Merge pull request #63 from openshift-auth/master + +openssl not from release payload, skipping + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/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/amd64/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/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 b06d2ef Merge pull request #1347 from enxebre/hypershift-default-not-master + +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 3e65a77 Merge pull request #1546 from trozet/2-28-23_merge + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/kubernetes/.git/ +HEAD is now at f854081c0 Merge pull request #1490 from stlaz/sc_accessors_openshift + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/service-ca-operator/.git/ +HEAD is now at 1b89fdc Merge pull request #202 from benluddy/no-stop-error + +topolvm_csi not from release payload, skipping + +topolvm_csi_livenessprobe not from release payload, skipping + +topolvm_csi_provisioner not from release payload, skipping + +topolvm_csi_registrar not from release payload, skipping + +topolvm_csi_resizer not from release payload, skipping + +downloading LVMS operator bundles +/go/src/github.com/openshift/microshift/_output/staging/lvms/amd64 /go/src/github.com/openshift/microshift +extracting lvms operator bundle for "amd64" architecture +/go/src/github.com/openshift/microshift +/go/src/github.com/openshift/microshift/_output/staging/lvms/arm64 /go/src/github.com/openshift/microshift +extracting lvms operator bundle for "arm64" architecture +/go/src/github.com/openshift/microshift +error: branch 'rebase-4.13.0-0.nightly-2023-02-27-101545_amd64-2023-02-27_arm64-2023-03-01' not found. +Switched to a new branch 'rebase-4.13.0-0.nightly-2023-02-27-101545_amd64-2023-02-27_arm64-2023-03-01' +## Updating last_rebase.sh +## Committing changes to last_rebase.sh +[rebase-4.13.0-0.nightly-2023-02-27-101545_amd64-2023-02-27_arm64-2023-03-01 f601cae2] update last_rebase.sh + 1 file changed, 1 insertion(+), 1 deletion(-) +cluster-kube-controller-manager-operator embedded-component no change + +cluster-kube-scheduler-operator embedded-component no change + +cluster-openshift-controller-manager-operator embedded-component no change + +cluster-policy-controller embedded-component no change + +etcd embedded-component no change + +route-controller-manager embedded-component no change + +service-ca-operator embedded-component no change + +coredns image-amd64 no change + +router image-amd64 no change + +kube-rbac-proxy image-amd64 no change + +service-ca-operator image-amd64 no change + +coredns image-arm64 no change + +router image-arm64 no change + +kube-rbac-proxy image-arm64 no change + +service-ca-operator image-arm64 no change + +## Committing changes to changelog +[rebase-4.13.0-0.nightly-2023-02-27-101545_amd64-2023-02-27_arm64-2023-03-01 0bc7c662] update changelog + 2 files changed, 164 insertions(+), 14 deletions(-) +# Updating microshift/go.mod +go mod edit -require github.com/openshift/cluster-policy-controller@ac01e3463245f2dd9312145368d7f4099a8a0bb9 +go: downloading github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d +go: downloading k8s.io/klog/v2 v2.80.1 +go: downloading github.com/openshift/api v0.0.0-20230201213816-61d971884921 +go: downloading github.com/openshift/client-go v0.0.0-20230120202327-72f107311084 +go: downloading github.com/openshift/library-go v0.0.0-20230130232623-47904dd9ff5a +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230221040739-518f3edfe79c +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230221040739-518f3edfe79c +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230221040739-518f3edfe79c +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230221040739-518f3edfe79c +go: downloading github.com/spf13/cobra v1.6.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230221040739-518f3edfe79c +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230221040739-518f3edfe79c +go: downloading github.com/ghodss/yaml v1.0.0 +go: downloading github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230221040739-518f3edfe79c +go: downloading github.com/pkg/errors v0.9.1 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230221040739-518f3edfe79c +go: downloading github.com/openshift/kubernetes v0.0.0-20230221040739-518f3edfe79c +go: downloading sigs.k8s.io/yaml v1.3.0 +go: downloading github.com/apparentlymart/go-cidr v1.1.0 +go: downloading github.com/miekg/dns v1.1.35 +go: downloading github.com/mitchellh/go-homedir v1.1.0 +go: downloading github.com/spf13/pflag v1.0.5 +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 github.com/stretchr/testify v1.8.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230221040739-518f3edfe79c +go: downloading github.com/openshift/cluster-policy-controller v0.0.0-20230217170320-ac01e3463245 +go: downloading github.com/openshift/route-controller-manager v0.0.0-20230205134410-d7a8e22db412 +go: downloading go.etcd.io/etcd/client/pkg/v3 v3.5.5 +go: downloading go.etcd.io/etcd/client/v3 v3.5.5 +go: downloading github.com/google/go-cmp v0.5.9 +go: downloading github.com/go-logr/logr v1.2.3 +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/google/gofuzz v1.2.0 +go: downloading sigs.k8s.io/structured-merge-diff/v4 v4.2.3 +go: downloading github.com/inconshreveable/mousetrap v1.0.1 +go: downloading gopkg.in/yaml.v2 v2.4.0 +go: downloading github.com/google/uuid v1.1.2 +go: downloading golang.org/x/net v0.5.0 +go: downloading github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae +go: downloading golang.org/x/crypto v0.1.0 +go: downloading golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 +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/imdario/mergo v0.3.11 +go: downloading golang.org/x/term v0.4.0 +go: downloading github.com/pmezard/go-difflib v1.0.0 +go: downloading gopkg.in/yaml.v3 v3.0.1 +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/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230221040739-518f3edfe79c +go: downloading github.com/coreos/go-systemd/v22 v22.3.2 +go: downloading github.com/google/cadvisor v0.46.0 +go: downloading github.com/opencontainers/runc v1.1.4 +go: downloading go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 +go: downloading go.opentelemetry.io/otel/sdk v1.10.0 +go: downloading go.opentelemetry.io/otel v1.10.0 +go: downloading go.opentelemetry.io/otel/trace v1.10.0 +go: downloading go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230221040739-518f3edfe79c +go: downloading github.com/fsnotify/fsnotify v1.6.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230221040739-518f3edfe79c +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230221040739-518f3edfe79c +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230221040739-518f3edfe79c +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230221040739-518f3edfe79c +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230221040739-518f3edfe79c +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230221040739-518f3edfe79c +go: downloading github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da +go: downloading github.com/prometheus/client_golang v1.14.0 +go: downloading github.com/blang/semver/v4 v4.0.0 +go: downloading github.com/prometheus/client_model v0.3.0 +go: downloading github.com/blang/semver v3.5.1+incompatible +go: downloading github.com/prometheus/procfs v0.8.0 +go: downloading github.com/prometheus/common v0.37.0 +go: downloading gopkg.in/inf.v0 v0.9.1 +go: downloading sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 +go: downloading github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de +go: downloading golang.org/x/text v0.6.0 +go: downloading 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 github.com/chai2010/gettext-go v1.0.2 +go: downloading github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d +go: downloading golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 +go: downloading golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 +go: downloading github.com/json-iterator/go v1.1.12 +go: downloading github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae +go: downloading k8s.io/gengo v0.0.0-20220902162205-c0856e24416d +go: downloading github.com/pkg/profile v1.3.0 +go: downloading github.com/sirupsen/logrus v1.8.1 +go: downloading github.com/emicklei/go-restful/v3 v3.9.0 +go: downloading go.uber.org/atomic v1.7.0 +go: downloading google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 +go: downloading github.com/coreos/go-semver v0.3.0 +go: downloading go.uber.org/multierr v1.6.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 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f +go: downloading go.uber.org/goleak v1.1.12 +go: downloading github.com/benbjohnson/clock v1.1.0 +go: downloading 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/cyphar/filepath-securejoin v0.2.3 +go: downloading github.com/moby/sys/mountinfo v0.6.2 +go: downloading github.com/Azure/azure-sdk-for-go v55.0.0+incompatible +go: downloading github.com/Azure/go-autorest/autorest/adal v0.9.20 +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/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230221040739-518f3edfe79c +go: downloading github.com/Azure/go-autorest/autorest/to v0.4.0 +go: downloading github.com/onsi/ginkgo v1.11.0 +go: downloading go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0 +go: downloading gopkg.in/natefinch/lumberjack.v2 v2.0.0 +go: downloading sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 +go: downloading gopkg.in/square/go-jose.v2 v2.2.2 +go: downloading github.com/aws/aws-sdk-go v1.44.116 +go: downloading github.com/opencontainers/selinux v1.10.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230221040739-518f3edfe79c +go: downloading github.com/golang/mock v1.6.0 +go: downloading github.com/docker/go-units v0.5.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230221040739-518f3edfe79c +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230221040739-518f3edfe79c +go: downloading github.com/robfig/cron/v3 v3.0.1 +go: downloading github.com/openshift/apiserver-library-go v0.0.0-20230120221150-cefee9e0162b +go: downloading github.com/robfig/cron v1.2.0 +go: downloading go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.35.0 +go: downloading github.com/Microsoft/go-winio v0.4.17 +go: downloading github.com/container-storage-interface/spec v1.7.0 +go: downloading github.com/libopenstorage/openstorage v1.0.0 +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 github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230221040739-518f3edfe79c +go: downloading github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989 +go: downloading github.com/beorn7/perks v1.0.1 +go: downloading github.com/cespare/xxhash/v2 v2.1.2 +go: downloading github.com/matttproud/golang_protobuf_extensions v1.0.2 +go: downloading github.com/google/btree v1.0.1 +go: downloading github.com/go-openapi/swag v0.19.14 +go: downloading github.com/go-openapi/jsonreference v0.20.0 +go: downloading github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 +go: downloading github.com/fvbommel/sortorder v1.0.1 +go: downloading github.com/creack/pty v1.1.11 +go: downloading gotest.tools/v3 v3.0.3 +go: downloading github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd +go: downloading github.com/modern-go/reflect2 v1.0.2 +go: downloading golang.org/x/tools v0.2.0 +go: downloading github.com/google/cel-go v0.12.6 +go: downloading github.com/NYTimes/gziphandler v1.1.1 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230221040739-518f3edfe79c +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 go.etcd.io/etcd/server/v3 v3.5.5 +go: downloading github.com/go-logr/stdr v1.2.2 +go: downloading github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e +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/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/felixge/httpsnoop v1.0.3 +go: downloading go.opentelemetry.io/otel/metric v0.31.0 +go: downloading github.com/BurntSushi/toml v0.3.1 +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 gopkg.in/gcfg.v1 v1.2.0 +go: downloading github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021 +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 google.golang.org/api v0.60.0 +go: downloading github.com/vmware/govmomi v0.20.3 +go: downloading github.com/docker/distribution v2.8.1+incompatible +go: downloading github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e +go: downloading github.com/Microsoft/hcsshim v0.8.22 +go: downloading github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab +go: downloading github.com/lithammer/dedent v1.1.0 +go: downloading github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible +go: downloading github.com/godbus/dbus/v5 v5.0.6 +go: downloading github.com/hashicorp/golang-lru v0.5.1 +go: downloading github.com/moby/spdystream v0.2.0 +go: downloading github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 +go: downloading github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 +go: downloading go.opentelemetry.io/contrib/propagators/b3 v1.10.0 +go: downloading go.opentelemetry.io/contrib v0.20.0 +go: downloading github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb +go: downloading github.com/coreos/go-oidc v2.1.0+incompatible +go: downloading github.com/containerd/ttrpc v1.1.0 +go: downloading github.com/opencontainers/go-digest v1.0.0 +go: downloading github.com/euank/go-kmsg-parser v2.0.0+incompatible +go: downloading github.com/mailru/easyjson v0.7.6 +go: downloading github.com/go-openapi/jsonpointer v0.19.5 +go: downloading google.golang.org/appengine v1.6.7 +go: downloading github.com/go-errors/errors v1.0.1 +go: downloading github.com/fatih/camelcase v1.0.0 +go: downloading github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 +go: downloading github.com/stoewer/go-strcase v1.2.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/kr/text v0.2.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230221040739-518f3edfe79c +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/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/josharian/intern v1.0.0 +go: downloading golang.org/x/mod v0.6.0 +go: downloading github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 +go: downloading github.com/gorilla/websocket v1.4.2 +go: downloading go.etcd.io/etcd/raft/v3 v3.5.5 +go: downloading github.com/dustin/go-humanize v1.0.0 +go: downloading github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 +go: downloading github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 +go: downloading github.com/golang/glog v1.0.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/cilium/ebpf v0.7.0 +go: downloading github.com/go-ldap/ldap/v3 v3.4.3 +go: downloading github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 +go: downloading github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 +go: downloading github.com/opencontainers/image-spec v1.0.2 +go: downloading github.com/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/form3tech-oss/jwt-go v3.2.3+incompatible +go: downloading go.etcd.io/etcd/client/v2 v2.305.5 +go: downloading github.com/Azure/go-ntlmssp v0.0.0-20211209120228-48547f28849e +go: downloading github.com/go-asn1-ber/asn1-ber v1.5.4 +go: downloading github.com/containerd/cgroups v1.0.1 +go: downloading go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 +go: downloading github.com/sergi/go-diff v1.1.0 +go: downloading github.com/jmespath/go-jmespath/internal/testify v1.5.1 +go: downloading github.com/frankban/quicktest v1.11.3 +go: downloading github.com/kr/pretty v0.2.1 +go mod edit -require github.com/openshift/route-controller-manager@d7a8e22db412b6fabb7028ca0da8de8f3d9ac3c3 +go mod edit -replace k8s.io/api=github.com/openshift/kubernetes/staging/src/k8s.io/api@89232647de67ea787d339b1bd7c780a0ed97f3f9 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/apiextensions-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/apimachinery=github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiserver@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/cli-runtime=github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/client-go=github.com/openshift/kubernetes/staging/src/k8s.io/client-go@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/cloud-provider=github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/cluster-bootstrap=github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/code-generator=github.com/openshift/kubernetes/staging/src/k8s.io/code-generator@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/component-base=github.com/openshift/kubernetes/staging/src/k8s.io/component-base@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/component-helpers=github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/cri-api=github.com/openshift/kubernetes/staging/src/k8s.io/cri-api@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/csi-translation-lib=github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/dynamic-resource-allocation=github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kms=github.com/openshift/kubernetes/staging/src/k8s.io/kms@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kube-aggregator=github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kube-controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kube-proxy=github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kube-scheduler=github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kubectl=github.com/openshift/kubernetes/staging/src/k8s.io/kubectl@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kubelet=github.com/openshift/kubernetes/staging/src/k8s.io/kubelet@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/legacy-cloud-providers=github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/metrics=github.com/openshift/kubernetes/staging/src/k8s.io/metrics@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/mount-utils=github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/pod-security-admission=github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/sample-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/sample-cli-plugin=github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/sample-controller=github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller@v0.0.0-20230223163248-89232647de67 +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-20230223163248-89232647de67 +go mod edit -replace k8s.io/apiextensions-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/apimachinery=github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiserver@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/cli-runtime=github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/client-go=github.com/openshift/kubernetes/staging/src/k8s.io/client-go@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/cloud-provider=github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/cluster-bootstrap=github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/code-generator=github.com/openshift/kubernetes/staging/src/k8s.io/code-generator@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/component-base=github.com/openshift/kubernetes/staging/src/k8s.io/component-base@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/component-helpers=github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/cri-api=github.com/openshift/kubernetes/staging/src/k8s.io/cri-api@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/csi-translation-lib=github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/dynamic-resource-allocation=github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kms=github.com/openshift/kubernetes/staging/src/k8s.io/kms@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kube-aggregator=github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kube-controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kube-proxy=github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kube-scheduler=github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kubectl=github.com/openshift/kubernetes/staging/src/k8s.io/kubectl@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kubelet=github.com/openshift/kubernetes/staging/src/k8s.io/kubelet@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kubernetes=github.com/openshift/kubernetes@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/legacy-cloud-providers=github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/metrics=github.com/openshift/kubernetes/staging/src/k8s.io/metrics@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/mount-utils=github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/pod-security-admission=github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/sample-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/sample-cli-plugin=github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/sample-controller=github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller@v0.0.0-20230223163248-89232647de67 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230223163248-89232647de67 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230223163248-89232647de67 +go: downloading github.com/openshift/kubernetes v0.0.0-20230223163248-89232647de67 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230223163248-89232647de67 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230223163248-89232647de67 +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/kubectl 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/kube-aggregator v0.0.0-20230223163248-89232647de67 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kubelet 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/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230223163248-89232647de67 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230223163248-89232647de67 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230223163248-89232647de67 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230223163248-89232647de67 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230223163248-89232647de67 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/metrics 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/cri-api v0.0.0-20230223163248-89232647de67 +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/cluster-bootstrap v0.0.0-20230223163248-89232647de67 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230223163248-89232647de67 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230223163248-89232647de67 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230223163248-89232647de67 +go: downloading github.com/openshift/api v0.0.0-20230208193339-068b2ae5534f +# Updating etcd/go.mod +go mod edit -require github.com/openshift/cluster-policy-controller@ac01e3463245f2dd9312145368d7f4099a8a0bb9 +go: downloading github.com/openshift/etcd/server/v3 v3.5.1-0.20230125165349-13c18c444a8c +go: downloading k8s.io/kubernetes v1.26.1 +go: downloading github.com/openshift/etcd/api/v3 v3.5.1-0.20230125165349-13c18c444a8c +go: downloading github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20230125165349-13c18c444a8c +go: downloading github.com/openshift/etcd/client/v3 v3.5.1-0.20230125165349-13c18c444a8c +go: downloading github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230125165349-13c18c444a8c +go: downloading github.com/openshift/etcd/raft/v3 v3.5.1-0.20230125165349-13c18c444a8c +go: downloading github.com/golang-jwt/jwt/v4 v4.4.2 +go: downloading go.etcd.io/etcd/client/v2 v2.305.6 +go: downloading github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5 +go: downloading github.com/cockroachdb/errors v1.2.4 +go: downloading github.com/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-20230223163248-89232647de67 +go mod edit -replace k8s.io/apiextensions-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/apimachinery=github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiserver@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/cli-runtime=github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/client-go=github.com/openshift/kubernetes/staging/src/k8s.io/client-go@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/cloud-provider=github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/cluster-bootstrap=github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/code-generator=github.com/openshift/kubernetes/staging/src/k8s.io/code-generator@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/component-base=github.com/openshift/kubernetes/staging/src/k8s.io/component-base@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/component-helpers=github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/cri-api=github.com/openshift/kubernetes/staging/src/k8s.io/cri-api@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/csi-translation-lib=github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/dynamic-resource-allocation=github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kms=github.com/openshift/kubernetes/staging/src/k8s.io/kms@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kube-aggregator=github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kube-controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kube-proxy=github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kube-scheduler=github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kubectl=github.com/openshift/kubernetes/staging/src/k8s.io/kubectl@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kubelet=github.com/openshift/kubernetes/staging/src/k8s.io/kubelet@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/legacy-cloud-providers=github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/metrics=github.com/openshift/kubernetes/staging/src/k8s.io/metrics@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/mount-utils=github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/pod-security-admission=github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/sample-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/sample-cli-plugin=github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/sample-controller=github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller@v0.0.0-20230223163248-89232647de67 +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-20230223163248-89232647de67 +go mod edit -replace k8s.io/apiextensions-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/apimachinery=github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiserver@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/cli-runtime=github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/client-go=github.com/openshift/kubernetes/staging/src/k8s.io/client-go@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/cloud-provider=github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/cluster-bootstrap=github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/code-generator=github.com/openshift/kubernetes/staging/src/k8s.io/code-generator@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/component-base=github.com/openshift/kubernetes/staging/src/k8s.io/component-base@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/component-helpers=github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/cri-api=github.com/openshift/kubernetes/staging/src/k8s.io/cri-api@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/csi-translation-lib=github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/dynamic-resource-allocation=github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kms=github.com/openshift/kubernetes/staging/src/k8s.io/kms@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kube-aggregator=github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kube-controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kube-proxy=github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kube-scheduler=github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kubectl=github.com/openshift/kubernetes/staging/src/k8s.io/kubectl@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/kubelet=github.com/openshift/kubernetes/staging/src/k8s.io/kubelet@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/legacy-cloud-providers=github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/metrics=github.com/openshift/kubernetes/staging/src/k8s.io/metrics@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/mount-utils=github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/pod-security-admission=github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/sample-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/sample-cli-plugin=github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin@v0.0.0-20230223163248-89232647de67 +go mod edit -replace k8s.io/sample-controller=github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller@v0.0.0-20230223163248-89232647de67 +## Committing changes to microshift/go.mod +[rebase-4.13.0-0.nightly-2023-02-27-101545_amd64-2023-02-27_arm64-2023-03-01 beb898ef] update microshift/go.mod + 2 files changed, 84 insertions(+), 84 deletions(-) +## Updating microshift/vendor directory +go mod vendor +for p in scripts/auto-rebase/rebase_patches/0001-Fix-CSI-initialization-conflict.patch scripts/auto-rebase/rebase_patches/0020-klog-component-names.patch scripts/auto-rebase/rebase_patches/0004-remove-config-informer.patch scripts/auto-rebase/rebase_patches/0003-disable-clusterQuotaMapping-controller.patch scripts/auto-rebase/rebase_patches/0030-kube-controller-manager-command-context.patch scripts/auto-rebase/rebase_patches/0002-disable-APIrequestcount-controller.patch scripts/auto-rebase/rebase_patches/0005-remove-user-informer.patch scripts/auto-rebase/rebase_patches/0010-kube-apiserver-command-context.patch; do \ + echo "Applying patch $p"; \ + git mailinfo /dev/null /dev/stderr 2<&1- < $p | git apply || exit 1; \ +done +Applying patch scripts/auto-rebase/rebase_patches/0001-Fix-CSI-initialization-conflict.patch +Applying patch scripts/auto-rebase/rebase_patches/0020-klog-component-names.patch +Applying patch scripts/auto-rebase/rebase_patches/0004-remove-config-informer.patch +error: patch failed: vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go:7 +error: vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go: patch does not apply +make: *** [Makefile:234: vendor] Error 1 +Script exited with error. +Script exited with error. diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 79a0e0b101..7c9be3f516 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,2 +1,152 @@ -# oc image-arm64 49b1e9f681b3dbdd4f43ca3d288ac64f4c681e2d to a04d9dc7e12a1d251da3502df69d8dc8a48e18b8 +# 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 b06d2ef98551e9d9ad9240d2cc226f502388a0a7 +39679d53195c77ff541aeea2717b25bc2a03b3bc 2023-02-27T15:13:52+01:00 groupsync: cache ldap connection instead of spamming the LDAP server with conn/bind +adce7bab1211a4ace5b910359d6203572c013a26 2023-02-27T15:13:52+01:00 bump(library-go): update to LDAP queries library +ba4172a0f2e504c62f4fbfc43d2ebac0469c8d35 2023-02-21T17:48:59-05:00 Adding CommitDate to the Changelog json output +b186341885cab69f82673153985fb721b9f9ade6 2023-02-21T11:07:44+01:00 Do not set master node selector if there's no masters +# ovn-kubernetes image-arm64 e75917d7dcd961d39b4c7768d88aa5d13ba67eb0 to 3e65a77ce8debac8cef97d200d2f5a2cd6b6ca1a +e8897948c502de58e09427a90a2897c15520c870 2023-02-28T17:56:16-05:00 CARRY: Fully revert ICNIv1 and remove downstream hacks +34350bde6f5a56904cc0b81751bfc0e0a6a7684f 2023-02-28T11:24:34-05:00 Add nodeSelector to Egress Firewall +40fb1cb0a730e943a7bcfabf86e4795c8f37ef1c 2023-02-28T10:44:37+01:00 e2e, multi-homing: test a dual-stack config on secondary networks +5ef71505312611126420c4b2ce2d129b83e35620 2023-02-28T10:15:42+01:00 e2e, multi-homing: test an IPv6 CIDR on secondary networks +7577acdb2780c92af659058b271c1f1e72b3fd2b 2023-02-28T10:13:33+01:00 e2e, multi-homing: ensure pod IP is in range of the subnet passed in the net-config +c1b6761c399351fc23a67cb86ea212122d8099b8 2023-02-28T10:10:37+01:00 e2e, multi-homing: randomize the NAD name +2cac5b61836f11251ab39d806e74dce2141a5362 2023-02-27T18:39:52+01:00 address set test: use a set to compare expected ips instead of a slice +934e961160c61ce331dcabe4ca90a595807a5cc4 2023-02-27T18:39:52+01:00 fix twoPodsContinuousConnectivityTest to send error to the channel, and the caller to wait for either error or success. Previously if error happened, the original goroutine was still waiting for success message, causing the whole test to timeout in 3 hours. +cbbd55e8dd5f56dfdbb64989cb0d98fc531f7d04 2023-02-27T18:39:48+01:00 Add addressSetsSyncer to sync address sets that don't have new ExternalIDs. address_set_cleanup.go is removed, because all address sets will be synced by addressSetsSyncer. Move all constants that are not used anymore to address_set_sync.go Add libovsdb ops required to sync address sets with 1 transaction. +a5175f4383c944ecff26d99191352370a76c75b4 2023-02-24T13:21:47+01:00 Update unit tests to match new AddressSetFactory functionality. Move address_set_test.go/"Dual Stack : when cleaning up old address sets" to address_set_sync_test.go/"destroys address sets in old non dual stack format". +9a836e3a547f3464d433ce8b9eef336624d51858 2023-02-23T14:21:35-06:00 node: add node healthz server for cloud load balancers +c8489e3ff9c321e77f265dc9d484ed2549df4a6b 2023-02-23T14:17:24-06:00 node: split openflowManager and service health check code +1e0c4cc8cceb03961470b9d38ea86465b8401c49 2023-02-23T21:10:46+01:00 Add new ExternalIDs for address sets. +78f43330b7dbd0695331cfb23e4671850b6e32fc 2023-02-23T21:10:42+01:00 Introduce new ExternalIDs for db rows indexing and DbObjectIDs struct. +7da08136e9fefdb2170a6a0d508bc5f847f8000a 2023-02-23T14:56:11-05:00 Fixes not properly skipping dualstack conversion test +60faf57d70fa9b977be2d6c4ed5acbffc36cc1b2 2023-02-23T19:02:18+01:00 docs, multi-homing: add excludedSubnets to the flatL2 example +a8cd57a4eb6740a509652eff077a9874a8bf72dc 2023-02-23T19:02:16+01:00 docs, multi-homing: point out secondary networks are not namespaced +5cae058353e4004c906aaab9e1482b7f7fb72957 2023-02-23T19:00:19+01:00 docs, multi-homing: explain each network config attribute +2b250af6153215bfce61f9e29437431868541f58 2023-02-23T10:22:19-06:00 vendor: bump vishvananda/netlink to 70ca0345eede55c73106738585d3a8acb39697d5 +688d2f50b379af626b63f36386ab21ec503fa418 2023-02-23T12:44:01+01:00 gofmt on pkg/ovn/multicast.go and util/multi_network.go +f6ef43368cc79b85bf0de535ff3b79a5856ab481 2023-02-23T12:43:56+01:00 Check the "Serving" field for endpoints +db10f9f5fa9b9771a55dec9e2f3a2d3b9c5a0092 2023-02-23T09:55:26+01:00 Regenerate nbdb and sbdb: added Table const and field getters. +5d3b54a97e904a67194e20282b98f59335f2642d 2023-02-23T09:03:59+01:00 Changes due to `pkg/ovn/controller/services` move +2cc36379d8ecc5e00f393f92551802099f4232e1 2023-02-23T06:23:09+00:00 Bump golang.org/x/text from 0.3.7 to 0.3.8 in /go-controller +476698912764ff67e7167459df26c604e05083e3 2023-02-22T11:40:54-08:00 rm metallb repo in destroy_metallb() function +72345e0b3551603df72627702ec60c70c7885221 2023-02-22T10:58:36-08:00 support secondary network of localnet topology +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 +0151db900f6da56601a64b18548caabce4aeb251 2023-02-22T16:38:48+01:00 Add metrics pod ovs ports +3375e866cd860e21a886680b86bf4ad03e466897 2023-02-21T11:07:05+01:00 multi-homing, e2e: improve readability of configurePodStaticIP +b882fb7f488ccfda874716fd749f7c5097c8864e 2023-02-21T10:55:10+01:00 e2e, flatl2: test static IPs via net-selection-elements +992ef2a4b7147f7d79a0de53d72d654c0365aad7 2023-02-21T10:43:55+01:00 multi-homing, flatl2: configure static IPs via net-selection-elements +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 +185c3afd4805e811035a818cd9ad9a56aa67b7ab 2023-02-16T09:13:11+02:00 Manifests: update CRDs with latest controller-gen +6da85259dc2fa5c387aea6d92ed4b08b454e8e62 2023-02-16T09:10:30+02:00 pkg/crd: Run update-codegen.sh with latest cmds +1dc4ec661028202e11a370f093a2ffa6cf0b32ee 2023-02-16T09:05:49+02:00 update-codegen: set EgressQoS plural correctly +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 f854081c06940fd6ca58c634bf829aba76551eb4 +5bb8838b4a2408385113ba108465bbcd4d19dd63 2023-02-28T13:17:25+01:00 UPSTREAM: 115968: add SeccompProfile to Pod and Container accessors/mutators +9626fc26ae199773b64a36f3bc699c78ca857dc7 2023-02-23T13:30:48-05:00 UPSTREAM: : OCPBUGS-5991: Kube APIServer panics in admission controller +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) diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 4660a081f4..d030de69de 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,28 +1,28 @@ -https://github.com/openshift/cluster-dns-operator embedded-component e17caca25c52b60692925c007b7157ad7f688f81 -https://github.com/openshift/cluster-ingress-operator embedded-component ed7b2ccbe91cba42b9198f34c3cdca67c3f0fca5 -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 4134462c6c60429941a309342d027463fe875b38 +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 3b5212db0bbc69f4dadb9fe353e3e5ac7eee3e33 +https://github.com/openshift/cluster-network-operator embedded-component 4d5a093d41e45def540ffbe4c5dc214550864d53 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 7867c26e6c91e2cc279317dfc080befe63a60749 https://github.com/openshift/cluster-policy-controller embedded-component ac01e3463245f2dd9312145368d7f4099a8a0bb9 https://github.com/openshift/etcd embedded-component 13c18c444a8c6a86ccbba16cce664008f5f948bd -https://github.com/openshift/kubernetes embedded-component 518f3edfe79c93dcc01145153247ebffcd4fe6e6 -https://github.com/openshift/machine-config-operator embedded-component 8671aa4a777a940b1e45c97b6bd72e26d76acace -https://github.com/openshift/openshift-controller-manager embedded-component 67fcbf2f6e3d5922a1c451197d497eadddedcb8d +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/route-controller-manager embedded-component d7a8e22db412b6fabb7028ca0da8de8f3d9ac3c3 https://github.com/openshift/service-ca-operator embedded-component 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a -https://github.com/openshift/oc image-amd64 49b1e9f681b3dbdd4f43ca3d288ac64f4c681e2d +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/kube-rbac-proxy image-amd64 0aa2830ed7359fd8cd0e2f7db0ed96a733c5990e -https://github.com/openshift/ovn-kubernetes image-amd64 e75917d7dcd961d39b4c7768d88aa5d13ba67eb0 -https://github.com/openshift/kubernetes image-amd64 518f3edfe79c93dcc01145153247ebffcd4fe6e6 +https://github.com/openshift/ovn-kubernetes image-amd64 b244c306b58db1afb6bdd9124bfbcadc7aec8371 +https://github.com/openshift/kubernetes image-amd64 89232647de67ea787d339b1bd7c780a0ed97f3f9 https://github.com/openshift/service-ca-operator image-amd64 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a -https://github.com/openshift/oc image-arm64 a04d9dc7e12a1d251da3502df69d8dc8a48e18b8 +https://github.com/openshift/oc image-arm64 b06d2ef98551e9d9ad9240d2cc226f502388a0a7 https://github.com/openshift/coredns image-arm64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb https://github.com/openshift/router image-arm64 69eda4bd427c3f27d9993afa35461f4fc1dc0357 https://github.com/openshift/kube-rbac-proxy image-arm64 0aa2830ed7359fd8cd0e2f7db0ed96a733c5990e -https://github.com/openshift/ovn-kubernetes image-arm64 e75917d7dcd961d39b4c7768d88aa5d13ba67eb0 -https://github.com/openshift/kubernetes image-arm64 518f3edfe79c93dcc01145153247ebffcd4fe6e6 +https://github.com/openshift/ovn-kubernetes image-arm64 3e65a77ce8debac8cef97d200d2f5a2cd6b6ca1a +https://github.com/openshift/kubernetes image-arm64 f854081c06940fd6ca58c634bf829aba76551eb4 https://github.com/openshift/service-ca-operator image-arm64 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index a6a467d032..83e40e87d1 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-23-000625" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-02-23-121422" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.13.0-0.nightly-2023-02-27-101545" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-03-01-231404" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12" diff --git a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure-Default.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure-Default.crd.yaml index af6638c47e..03646e692a 100644 --- a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure-Default.crd.yaml +++ b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure-Default.crd.yaml @@ -534,7 +534,36 @@ spec: resourceGroupName: description: resourceGroupName is the Resource Group for new Azure resources created for the cluster. type: string + resourceTags: + description: resourceTags is a list of additional tags to apply to Azure resources created for the cluster. See https://docs.microsoft.com/en-us/rest/api/resources/tags for information on tagging Azure resources. Due to limitations on Automation, Content Delivery Network, DNS Azure resources, a maximum of 15 tags may be applied. OpenShift reserves 5 tags for internal use, allowing 10 tags for user configuration. + items: + description: AzureResourceTag is a tag to apply to Azure resources created for the cluster. + properties: + key: + description: key is the key part of the tag. A tag key can have a maximum of 128 characters and cannot be empty. Key must begin with a letter, end with a letter, number or underscore, and must contain only alphanumeric characters and the following special characters `_ . -`. + maxLength: 128 + minLength: 1 + pattern: ^[a-zA-Z]([0-9A-Za-z_.-]*[0-9A-Za-z_])?$ + type: string + value: + description: 'value is the value part of the tag. A tag value can have a maximum of 256 characters and cannot be empty. Value must contain only alphanumeric characters and the following special characters `_ + , - . / : ; < = > ? @`.' + maxLength: 256 + minLength: 1 + pattern: ^[0-9A-Za-z_.=+-@]+$ + type: string + required: + - key + - value + type: object + maxItems: 10 + type: array + x-kubernetes-validations: + - message: resourceTags are immutable and may only be configured during installation + rule: self.all(x, x in oldSelf) && oldSelf.all(x, x in self) type: object + x-kubernetes-validations: + - message: resourceTags may only be configured during installation + rule: '!has(oldSelf.resourceTags) && !has(self.resourceTags) || has(oldSelf.resourceTags) && has(self.resourceTags)' baremetal: description: BareMetal contains settings specific to the BareMetal platform. properties: diff --git a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure-TechPreviewNoUpgrade.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure-TechPreviewNoUpgrade.crd.yaml index 01eeb09289..a68aac578b 100644 --- a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure-TechPreviewNoUpgrade.crd.yaml +++ b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure-TechPreviewNoUpgrade.crd.yaml @@ -392,6 +392,13 @@ spec: - SingleReplica - External type: string + cpuPartitioning: + default: None + description: cpuPartitioning expresses if CPU partitioning is a currently enabled feature in the cluster. CPU Partitioning means that this cluster can support partitioning workloads to specific CPU Sets. Valid values are "None" and "AllNodes". When omitted, the default value is "None". The default value of "None" indicates that no nodes will be setup with CPU partitioning. The "AllNodes" value indicates that all nodes have been setup with CPU partitioning, and can then be further configured via the PerformanceProfile API. + enum: + - None + - AllNodes + type: string etcdDiscoveryDomain: description: 'etcdDiscoveryDomain is the domain used to fetch the SRV records for discovering etcd servers and clients. For more info: https://github.com/etcd-io/etcd/blob/329be66e8b3f9e2e6af83c123ff89297e49ebd15/Documentation/op-guide/clustering.md#dns-discovery deprecated: as of 4.7, this field is no longer set or honored. It will be removed in a future release.' type: string @@ -534,7 +541,36 @@ spec: resourceGroupName: description: resourceGroupName is the Resource Group for new Azure resources created for the cluster. type: string + resourceTags: + description: resourceTags is a list of additional tags to apply to Azure resources created for the cluster. See https://docs.microsoft.com/en-us/rest/api/resources/tags for information on tagging Azure resources. Due to limitations on Automation, Content Delivery Network, DNS Azure resources, a maximum of 15 tags may be applied. OpenShift reserves 5 tags for internal use, allowing 10 tags for user configuration. + items: + description: AzureResourceTag is a tag to apply to Azure resources created for the cluster. + properties: + key: + description: key is the key part of the tag. A tag key can have a maximum of 128 characters and cannot be empty. Key must begin with a letter, end with a letter, number or underscore, and must contain only alphanumeric characters and the following special characters `_ . -`. + maxLength: 128 + minLength: 1 + pattern: ^[a-zA-Z]([0-9A-Za-z_.-]*[0-9A-Za-z_])?$ + type: string + value: + description: 'value is the value part of the tag. A tag value can have a maximum of 256 characters and cannot be empty. Value must contain only alphanumeric characters and the following special characters `_ + , - . / : ; < = > ? @`.' + maxLength: 256 + minLength: 1 + pattern: ^[0-9A-Za-z_.=+-@]+$ + type: string + required: + - key + - value + type: object + maxItems: 10 + type: array + x-kubernetes-validations: + - message: resourceTags are immutable and may only be configured during installation + rule: self.all(x, x in oldSelf) && oldSelf.all(x, x in self) type: object + x-kubernetes-validations: + - message: resourceTags may only be configured during installation + rule: '!has(oldSelf.resourceTags) && !has(self.resourceTags) || has(oldSelf.resourceTags) && has(self.resourceTags)' baremetal: description: BareMetal contains settings specific to the BareMetal platform. properties: @@ -558,6 +594,22 @@ spec: type: string maxItems: 2 type: array + loadBalancer: + default: + type: OpenShiftManagedDefault + description: loadBalancer defines how the load balancer used by the cluster is configured. + properties: + type: + default: OpenShiftManagedDefault + description: type defines the type of load balancer used by the cluster on BareMetal platform which can be a user-managed or openshift-managed load balancer that is to be used for the OpenShift API and Ingress endpoints. When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing defined in the machine config operator will be deployed. When set to UserManaged these static pods will not be deployed and it is expected that the load balancer is configured out of band by the deployer. When omitted, this means no opinion and the platform is left to choose a reasonable default. The default value is OpenShiftManagedDefault. + enum: + - OpenShiftManagedDefault + - UserManaged + type: string + x-kubernetes-validations: + - message: type is immutable once set + rule: oldSelf == '' || self == oldSelf + type: object nodeDNSIP: description: nodeDNSIP is the IP address for the internal DNS used by the nodes. Unlike the one managed by the DNS operator, `NodeDNSIP` provides name resolution for the nodes themselves. There is no DNS-as-a-service for BareMetal deployments. In order to minimize necessary changes to the datacenter DNS, a DNS service is hosted as a static pod to serve those hostnames to the nodes in the cluster. type: string @@ -637,6 +689,22 @@ spec: type: string maxItems: 2 type: array + loadBalancer: + default: + type: OpenShiftManagedDefault + description: loadBalancer defines how the load balancer used by the cluster is configured. + properties: + type: + default: OpenShiftManagedDefault + description: type defines the type of load balancer used by the cluster on Nutanix platform which can be a user-managed or openshift-managed load balancer that is to be used for the OpenShift API and Ingress endpoints. When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing defined in the machine config operator will be deployed. When set to UserManaged these static pods will not be deployed and it is expected that the load balancer is configured out of band by the deployer. When omitted, this means no opinion and the platform is left to choose a reasonable default. The default value is OpenShiftManagedDefault. + enum: + - OpenShiftManagedDefault + - UserManaged + type: string + x-kubernetes-validations: + - message: type is immutable once set + rule: oldSelf == '' || self == oldSelf + type: object type: object openstack: description: OpenStack contains settings specific to the OpenStack infrastructure provider. @@ -664,6 +732,22 @@ spec: type: string maxItems: 2 type: array + loadBalancer: + default: + type: OpenShiftManagedDefault + description: loadBalancer defines how the load balancer used by the cluster is configured. + properties: + type: + default: OpenShiftManagedDefault + description: type defines the type of load balancer used by the cluster on OpenStack platform which can be a user-managed or openshift-managed load balancer that is to be used for the OpenShift API and Ingress endpoints. When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing defined in the machine config operator will be deployed. When set to UserManaged these static pods will not be deployed and it is expected that the load balancer is configured out of band by the deployer. When omitted, this means no opinion and the platform is left to choose a reasonable default. The default value is OpenShiftManagedDefault. + enum: + - OpenShiftManagedDefault + - UserManaged + type: string + x-kubernetes-validations: + - message: type is immutable once set + rule: oldSelf == '' || self == oldSelf + type: object nodeDNSIP: description: nodeDNSIP is the IP address for the internal DNS used by the nodes. Unlike the one managed by the DNS operator, `NodeDNSIP` provides name resolution for the nodes themselves. There is no DNS-as-a-service for OpenStack deployments. In order to minimize necessary changes to the datacenter DNS, a DNS service is hosted as a static pod to serve those hostnames to the nodes in the cluster. type: string @@ -691,6 +775,22 @@ spec: type: string maxItems: 2 type: array + loadBalancer: + default: + type: OpenShiftManagedDefault + description: loadBalancer defines how the load balancer used by the cluster is configured. + properties: + type: + default: OpenShiftManagedDefault + description: type defines the type of load balancer used by the cluster on Ovirt platform which can be a user-managed or openshift-managed load balancer that is to be used for the OpenShift API and Ingress endpoints. When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing defined in the machine config operator will be deployed. When set to UserManaged these static pods will not be deployed and it is expected that the load balancer is configured out of band by the deployer. When omitted, this means no opinion and the platform is left to choose a reasonable default. The default value is OpenShiftManagedDefault. + enum: + - OpenShiftManagedDefault + - UserManaged + type: string + x-kubernetes-validations: + - message: type is immutable once set + rule: oldSelf == '' || self == oldSelf + type: object nodeDNSIP: description: 'deprecated: as of 4.6, this field is no longer set or honored. It will be removed in a future release.' type: string @@ -774,6 +874,22 @@ spec: type: string maxItems: 2 type: array + loadBalancer: + default: + type: OpenShiftManagedDefault + description: loadBalancer defines how the load balancer used by the cluster is configured. + properties: + type: + default: OpenShiftManagedDefault + description: type defines the type of load balancer used by the cluster on VSphere platform which can be a user-managed or openshift-managed load balancer that is to be used for the OpenShift API and Ingress endpoints. When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing defined in the machine config operator will be deployed. When set to UserManaged these static pods will not be deployed and it is expected that the load balancer is configured out of band by the deployer. When omitted, this means no opinion and the platform is left to choose a reasonable default. The default value is OpenShiftManagedDefault. + enum: + - OpenShiftManagedDefault + - UserManaged + type: string + x-kubernetes-validations: + - message: type is immutable once set + rule: oldSelf == '' || self == oldSelf + type: object nodeDNSIP: description: nodeDNSIP is the IP address for the internal DNS used by the nodes. Unlike the one managed by the DNS operator, `NodeDNSIP` provides name resolution for the nodes themselves. There is no DNS-as-a-service for vSphere deployments. In order to minimize necessary changes to the datacenter DNS, a DNS service is hosted as a static pod to serve those hostnames to the nodes in the cluster. type: string diff --git a/vendor/github.com/openshift/api/config/v1/stable.infrastructure.testsuite.yaml b/vendor/github.com/openshift/api/config/v1/stable.infrastructure.testsuite.yaml index bbafe4c478..da2d0e6684 100644 --- a/vendor/github.com/openshift/api/config/v1/stable.infrastructure.testsuite.yaml +++ b/vendor/github.com/openshift/api/config/v1/stable.infrastructure.testsuite.yaml @@ -56,3 +56,161 @@ tests: external: platformName: SomeOtherCoolplatformName expectedError: " spec.platformSpec.external.platformName: Invalid value: \"string\": platform name cannot be changed once set" + - name: Should not be able to modify an existing Azure ResourceTags Tag + initial: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: {} + status: + controlPlaneTopology: "HighlyAvailable" + infrastructureTopology: "HighlyAvailable" + platform: Azure + platformStatus: + type: Azure + azure: + resourceTags: + - {key: "key", value: "value"} + updated: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: {} + status: + platform: Azure + platformStatus: + type: Azure + azure: + resourceTags: + - {key: "key", value: "changed"} + expectedStatusError: "status.platformStatus.azure.resourceTags: Invalid value: \"array\": resourceTags are immutable and may only be configured during installation" + - name: Should not be able to add a Tag to an existing Azure ResourceTags + initial: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: {} + status: + controlPlaneTopology: "HighlyAvailable" + infrastructureTopology: "HighlyAvailable" + platform: Azure + platformStatus: + type: Azure + azure: + resourceTags: + - {key: "key", value: "value"} + updated: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: {} + status: + platform: Azure + platformStatus: + type: Azure + azure: + resourceTags: + - {key: "key", value: "value"} + - {key: "new", value: "entry"} + expectedStatusError: "status.platformStatus.azure.resourceTags: Invalid value: \"array\": resourceTags are immutable and may only be configured during installation" + - name: Should not be able to remove a Tag from an existing Azure ResourceTags + initial: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: {} + status: + platform: Azure + platformStatus: + type: Azure + azure: + resourceTags: + - {key: "key", value: "value"} + - {key: "new", value: "entry"} + updated: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: {} + status: + platform: Azure + platformStatus: + type: Azure + azure: + resourceTags: + - {key: "key", value: "value"} + expectedStatusError: "status.platformStatus.azure.resourceTags: Invalid value: \"array\": resourceTags are immutable and may only be configured during installation" + - name: Should not be able to add Azure ResourceTags to an empty platformStatus.azure + initial: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: {} + status: + platform: Azure + platformStatus: + type: Azure + azure: {} + updated: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: {} + status: + platform: Azure + platformStatus: + azure: + resourceTags: + - {key: "key", value: "value"} + expectedStatusError: "status.platformStatus.azure: Invalid value: \"object\": resourceTags may only be configured during installation" + - name: Should not be able to remove Azure ResourceTags from platformStatus.azure + initial: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: {} + status: + platform: Azure + platformStatus: + type: Azure + azure: + resourceTags: + - {key: "key", value: "value"} + updated: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: {} + status: + platform: Azure + platformStatus: + type: Azure + azure: {} + expectedStatusError: "status.platformStatus.azure: Invalid value: \"object\": resourceTags may only be configured during installation" + - name: Should be able to modify the ResourceGroupName while Azure ResourceTags are present + initial: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: {} + status: + platform: Azure + platformStatus: + type: Azure + azure: + resourceGroupName: foo + resourceTags: + - {key: "key", value: "value"} + updated: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: {} + status: + platform: Azure + platformStatus: + azure: + resourceGroupName: bar + resourceTags: + - {key: "key", value: "value"} + expected: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: {} + status: + controlPlaneTopology: "HighlyAvailable" + infrastructureTopology: "HighlyAvailable" + platform: Azure + platformStatus: + azure: + resourceGroupName: bar + resourceTags: + - {key: "key", value: "value"} diff --git a/vendor/github.com/openshift/api/config/v1/techpreview.infrastructure.testsuite.yaml b/vendor/github.com/openshift/api/config/v1/techpreview.infrastructure.testsuite.yaml index 23580beea3..f9829b9a39 100644 --- a/vendor/github.com/openshift/api/config/v1/techpreview.infrastructure.testsuite.yaml +++ b/vendor/github.com/openshift/api/config/v1/techpreview.infrastructure.testsuite.yaml @@ -12,3 +12,202 @@ tests: apiVersion: config.openshift.io/v1 kind: Infrastructure spec: {} + onUpdate: + - name: Status Should contain default fields + initial: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: {} + status: {} + updated: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: {} + status: {} + expected: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: {} + status: + cpuPartitioning: None + infrastructureTopology: HighlyAvailable + controlPlaneTopology: HighlyAvailable + - name: Status update cpuPartitioning should fail validation check + initial: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: {} + status: + cpuPartitioning: None + updated: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: {} + status: + cpuPartitioning: "Invalid" + expectedStatusError: 'status.cpuPartitioning: Unsupported value: "Invalid": supported values: "None", "AllNodes"' + - name: Should set load balancer type to OpenShiftManagedDefault if not specified + initial: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: + platformSpec: + baremetal: {} + type: BareMetal + updated: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: + platformSpec: + baremetal: {} + type: BareMetal + status: + platform: BareMetal + platformStatus: + baremetal: {} + type: BareMetal + expected: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: + platformSpec: + baremetal: {} + type: BareMetal + status: + controlPlaneTopology: HighlyAvailable + cpuPartitioning: None + infrastructureTopology: HighlyAvailable + platform: BareMetal + platformStatus: + baremetal: + loadBalancer: + type: OpenShiftManagedDefault + type: BareMetal + - name: Should be able to override the default load balancer with a valid value + initial: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: + platformSpec: + baremetal: {} + type: BareMetal + updated: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: + platformSpec: + baremetal: {} + type: BareMetal + status: + platform: BareMetal + platformStatus: + baremetal: + loadBalancer: + type: UserManaged + type: BareMetal + expected: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: + platformSpec: + baremetal: {} + type: BareMetal + status: + controlPlaneTopology: HighlyAvailable + cpuPartitioning: None + infrastructureTopology: HighlyAvailable + platform: BareMetal + platformStatus: + baremetal: + loadBalancer: + type: UserManaged + type: BareMetal + - name: Should not allow changing the immutable load balancer type field + initial: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: + platformSpec: + baremetal: {} + type: BareMetal + status: + controlPlaneTopology: HighlyAvailable + infrastructureTopology: HighlyAvailable + platform: BareMetal + platformStatus: + baremetal: + loadBalancer: + type: OpenShiftManagedDefault + type: BareMetal + updated: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: + platformSpec: + type: BareMetal + baremetal: {} + status: + controlPlaneTopology: HighlyAvailable + infrastructureTopology: HighlyAvailable + platform: BareMetal + platformStatus: + baremetal: + loadBalancer: + type: UserManaged + type: BareMetal + expectedStatusError: "status.platformStatus.baremetal.loadBalancer.type: Invalid value: \"string\": type is immutable once set" + - name: Should not allow removing the immutable load balancer type field that was initially set + initial: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: + platformSpec: + baremetal: {} + type: BareMetal + status: + controlPlaneTopology: HighlyAvailable + infrastructureTopology: HighlyAvailable + platform: BareMetal + platformStatus: + baremetal: + loadBalancer: + type: UserManaged + type: BareMetal + updated: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: + platformSpec: + type: BareMetal + baremetal: {} + status: + controlPlaneTopology: HighlyAvailable + infrastructureTopology: HighlyAvailable + platform: BareMetal + platformStatus: + baremetal: {} + type: BareMetal + expectedStatusError: "status.platformStatus.baremetal.loadBalancer.type: Invalid value: \"string\": type is immutable once set" + - name: Should not allow setting the load balancer type to a wrong value + initial: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: + platformSpec: + baremetal: {} + type: BareMetal + updated: | + apiVersion: config.openshift.io/v1 + kind: Infrastructure + spec: + platformSpec: + baremetal: {} + type: BareMetal + status: + platform: BareMetal + platformStatus: + baremetal: + loadBalancer: + type: FooBar + type: BareMetal + expectedStatusError: "status.platformStatus.baremetal.loadBalancer.type: Unsupported value: \"FooBar\": supported values: \"OpenShiftManagedDefault\", \"UserManaged\"" diff --git a/vendor/github.com/openshift/api/config/v1/types_infrastructure.go b/vendor/github.com/openshift/api/config/v1/types_infrastructure.go index b6e3afb27b..a6004b0750 100644 --- a/vendor/github.com/openshift/api/config/v1/types_infrastructure.go +++ b/vendor/github.com/openshift/api/config/v1/types_infrastructure.go @@ -101,6 +101,19 @@ type InfrastructureStatus struct { // +kubebuilder:default=HighlyAvailable // +kubebuilder:validation:Enum=HighlyAvailable;SingleReplica InfrastructureTopology TopologyMode `json:"infrastructureTopology"` + + // cpuPartitioning expresses if CPU partitioning is a currently enabled feature in the cluster. + // CPU Partitioning means that this cluster can support partitioning workloads to specific CPU Sets. + // Valid values are "None" and "AllNodes". When omitted, the default value is "None". + // The default value of "None" indicates that no nodes will be setup with CPU partitioning. + // The "AllNodes" value indicates that all nodes have been setup with CPU partitioning, + // and can then be further configured via the PerformanceProfile API. + // +kubebuilder:default=None + // +default="None" + // +kubebuilder:validation:Enum=None;AllNodes + // +openshift:enable:FeatureSets=TechPreviewNoUpgrade + // +optional + CPUPartitioning CPUPartitioningMode `json:"cpuPartitioning,omitempty"` } // TopologyMode defines the topology mode of the control/infra nodes. @@ -123,6 +136,28 @@ const ( ExternalTopologyMode TopologyMode = "External" ) +// CPUPartitioningMode defines the mode for CPU partitioning +type CPUPartitioningMode string + +const ( + // CPUPartitioningNone means that no CPU Partitioning is on in this cluster infrastructure + CPUPartitioningNone CPUPartitioningMode = "None" + + // CPUPartitioningAllNodes means that all nodes are configured with CPU Partitioning in this cluster + CPUPartitioningAllNodes CPUPartitioningMode = "AllNodes" +) + +// PlatformLoadBalancerType defines the type of load balancer used by the cluster. +type PlatformLoadBalancerType string + +const ( + // LoadBalancerTypeUserManaged is a load balancer with control-plane VIPs managed outside of the cluster by the customer. + LoadBalancerTypeUserManaged PlatformLoadBalancerType = "UserManaged" + + // LoadBalancerTypeOpenShiftManagedDefault is the default load balancer with control-plane VIPs managed by the OpenShift cluster. + LoadBalancerTypeOpenShiftManagedDefault PlatformLoadBalancerType = "OpenShiftManagedDefault" +) + // PlatformType is a specific supported infrastructure provider. // +kubebuilder:validation:Enum="";AWS;Azure;BareMetal;GCP;Libvirt;OpenStack;None;VSphere;oVirt;IBMCloud;KubeVirt;EquinixMetal;PowerVS;AlibabaCloud;Nutanix;External type PlatformType string @@ -460,6 +495,7 @@ type AWSResourceTag struct { type AzurePlatformSpec struct{} // AzurePlatformStatus holds the current status of the Azure infrastructure provider. +// +kubebuilder:validation:XValidation:rule="!has(oldSelf.resourceTags) && !has(self.resourceTags) || has(oldSelf.resourceTags) && has(self.resourceTags)",message="resourceTags may only be configured during installation" type AzurePlatformStatus struct { // resourceGroupName is the Resource Group for new Azure resources created for the cluster. ResourceGroupName string `json:"resourceGroupName"` @@ -478,6 +514,34 @@ type AzurePlatformStatus struct { // armEndpoint specifies a URL to use for resource management in non-soverign clouds such as Azure Stack. // +optional ARMEndpoint string `json:"armEndpoint,omitempty"` + + // resourceTags is a list of additional tags to apply to Azure resources created for the cluster. + // See https://docs.microsoft.com/en-us/rest/api/resources/tags for information on tagging Azure resources. + // Due to limitations on Automation, Content Delivery Network, DNS Azure resources, a maximum of 15 tags + // may be applied. OpenShift reserves 5 tags for internal use, allowing 10 tags for user configuration. + // +kubebuilder:validation:MaxItems=10 + // +kubebuilder:validation:XValidation:rule="self.all(x, x in oldSelf) && oldSelf.all(x, x in self)",message="resourceTags are immutable and may only be configured during installation" + // +optional + ResourceTags []AzureResourceTag `json:"resourceTags,omitempty"` +} + +// AzureResourceTag is a tag to apply to Azure resources created for the cluster. +type AzureResourceTag struct { + // key is the key part of the tag. A tag key can have a maximum of 128 characters and cannot be empty. Key + // must begin with a letter, end with a letter, number or underscore, and must contain only alphanumeric + // characters and the following special characters `_ . -`. + // +kubebuilder:validation:Required + // +kubebuilder:validation:MinLength=1 + // +kubebuilder:validation:MaxLength=128 + // +kubebuilder:validation:Pattern=`^[a-zA-Z]([0-9A-Za-z_.-]*[0-9A-Za-z_])?$` + Key string `json:"key"` + // value is the value part of the tag. A tag value can have a maximum of 256 characters and cannot be empty. Value + // must contain only alphanumeric characters and the following special characters `_ + , - . / : ; < = > ? @`. + // +kubebuilder:validation:Required + // +kubebuilder:validation:MinLength=1 + // +kubebuilder:validation:MaxLength=256 + // +kubebuilder:validation:Pattern=`^[0-9A-Za-z_.=+-@]+$` + Value string `json:"value"` } // AzureCloudEnvironment is the name of the Azure cloud environment @@ -514,6 +578,27 @@ type GCPPlatformStatus struct { Region string `json:"region"` } +// BareMetalPlatformLoadBalancer defines the load balancer used by the cluster on BareMetal platform. +// +union +type BareMetalPlatformLoadBalancer struct { + // type defines the type of load balancer used by the cluster on BareMetal platform + // which can be a user-managed or openshift-managed load balancer + // that is to be used for the OpenShift API and Ingress endpoints. + // When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing + // defined in the machine config operator will be deployed. + // When set to UserManaged these static pods will not be deployed and it is expected that + // the load balancer is configured out of band by the deployer. + // When omitted, this means no opinion and the platform is left to choose a reasonable default. + // The default value is OpenShiftManagedDefault. + // +default="OpenShiftManagedDefault" + // +kubebuilder:default:="OpenShiftManagedDefault" + // +kubebuilder:validation:Enum:="OpenShiftManagedDefault";"UserManaged" + // +kubebuilder:validation:XValidation:rule="oldSelf == '' || self == oldSelf",message="type is immutable once set" + // +optional + // +unionDiscriminator + Type PlatformLoadBalancerType `json:"type,omitempty"` +} + // BareMetalPlatformSpec holds the desired state of the BareMetal infrastructure provider. // This only includes fields that can be modified in the cluster. type BareMetalPlatformSpec struct{} @@ -562,6 +647,34 @@ type BareMetalPlatformStatus struct { // datacenter DNS, a DNS service is hosted as a static pod to serve those hostnames // to the nodes in the cluster. NodeDNSIP string `json:"nodeDNSIP,omitempty"` + + // loadBalancer defines how the load balancer used by the cluster is configured. + // +default={"type": "OpenShiftManagedDefault"} + // +kubebuilder:default={"type": "OpenShiftManagedDefault"} + // +openshift:enable:FeatureSets=TechPreviewNoUpgrade + // +optional + LoadBalancer *BareMetalPlatformLoadBalancer `json:"loadBalancer,omitempty"` +} + +// OpenStackPlatformLoadBalancer defines the load balancer used by the cluster on OpenStack platform. +// +union +type OpenStackPlatformLoadBalancer struct { + // type defines the type of load balancer used by the cluster on OpenStack platform + // which can be a user-managed or openshift-managed load balancer + // that is to be used for the OpenShift API and Ingress endpoints. + // When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing + // defined in the machine config operator will be deployed. + // When set to UserManaged these static pods will not be deployed and it is expected that + // the load balancer is configured out of band by the deployer. + // When omitted, this means no opinion and the platform is left to choose a reasonable default. + // The default value is OpenShiftManagedDefault. + // +default="OpenShiftManagedDefault" + // +kubebuilder:default:="OpenShiftManagedDefault" + // +kubebuilder:validation:Enum:="OpenShiftManagedDefault";"UserManaged" + // +kubebuilder:validation:XValidation:rule="oldSelf == '' || self == oldSelf",message="type is immutable once set" + // +optional + // +unionDiscriminator + Type PlatformLoadBalancerType `json:"type,omitempty"` } // OpenStackPlatformSpec holds the desired state of the OpenStack infrastructure provider. @@ -614,6 +727,34 @@ type OpenStackPlatformStatus struct { // datacenter DNS, a DNS service is hosted as a static pod to serve those hostnames // to the nodes in the cluster. NodeDNSIP string `json:"nodeDNSIP,omitempty"` + + // loadBalancer defines how the load balancer used by the cluster is configured. + // +default={"type": "OpenShiftManagedDefault"} + // +kubebuilder:default={"type": "OpenShiftManagedDefault"} + // +openshift:enable:FeatureSets=TechPreviewNoUpgrade + // +optional + LoadBalancer *OpenStackPlatformLoadBalancer `json:"loadBalancer,omitempty"` +} + +// OvirtPlatformLoadBalancer defines the load balancer used by the cluster on Ovirt platform. +// +union +type OvirtPlatformLoadBalancer struct { + // type defines the type of load balancer used by the cluster on Ovirt platform + // which can be a user-managed or openshift-managed load balancer + // that is to be used for the OpenShift API and Ingress endpoints. + // When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing + // defined in the machine config operator will be deployed. + // When set to UserManaged these static pods will not be deployed and it is expected that + // the load balancer is configured out of band by the deployer. + // When omitted, this means no opinion and the platform is left to choose a reasonable default. + // The default value is OpenShiftManagedDefault. + // +default="OpenShiftManagedDefault" + // +kubebuilder:default:="OpenShiftManagedDefault" + // +kubebuilder:validation:Enum:="OpenShiftManagedDefault";"UserManaged" + // +kubebuilder:validation:XValidation:rule="oldSelf == '' || self == oldSelf",message="type is immutable once set" + // +optional + // +unionDiscriminator + Type PlatformLoadBalancerType `json:"type,omitempty"` } // OvirtPlatformSpec holds the desired state of the oVirt infrastructure provider. @@ -657,6 +798,34 @@ type OvirtPlatformStatus struct { // deprecated: as of 4.6, this field is no longer set or honored. It will be removed in a future release. NodeDNSIP string `json:"nodeDNSIP,omitempty"` + + // loadBalancer defines how the load balancer used by the cluster is configured. + // +default={"type": "OpenShiftManagedDefault"} + // +kubebuilder:default={"type": "OpenShiftManagedDefault"} + // +openshift:enable:FeatureSets=TechPreviewNoUpgrade + // +optional + LoadBalancer *OvirtPlatformLoadBalancer `json:"loadBalancer,omitempty"` +} + +// VSpherePlatformLoadBalancer defines the load balancer used by the cluster on VSphere platform. +// +union +type VSpherePlatformLoadBalancer struct { + // type defines the type of load balancer used by the cluster on VSphere platform + // which can be a user-managed or openshift-managed load balancer + // that is to be used for the OpenShift API and Ingress endpoints. + // When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing + // defined in the machine config operator will be deployed. + // When set to UserManaged these static pods will not be deployed and it is expected that + // the load balancer is configured out of band by the deployer. + // When omitted, this means no opinion and the platform is left to choose a reasonable default. + // The default value is OpenShiftManagedDefault. + // +default="OpenShiftManagedDefault" + // +kubebuilder:default:="OpenShiftManagedDefault" + // +kubebuilder:validation:Enum:="OpenShiftManagedDefault";"UserManaged" + // +kubebuilder:validation:XValidation:rule="oldSelf == '' || self == oldSelf",message="type is immutable once set" + // +optional + // +unionDiscriminator + Type PlatformLoadBalancerType `json:"type,omitempty"` } // VSpherePlatformFailureDomainSpec holds the region and zone failure domain and @@ -895,6 +1064,13 @@ type VSpherePlatformStatus struct { // datacenter DNS, a DNS service is hosted as a static pod to serve those hostnames // to the nodes in the cluster. NodeDNSIP string `json:"nodeDNSIP,omitempty"` + + // loadBalancer defines how the load balancer used by the cluster is configured. + // +default={"type": "OpenShiftManagedDefault"} + // +kubebuilder:default={"type": "OpenShiftManagedDefault"} + // +openshift:enable:FeatureSets=TechPreviewNoUpgrade + // +optional + LoadBalancer *VSpherePlatformLoadBalancer `json:"loadBalancer,omitempty"` } // IBMCloudPlatformSpec holds the desired state of the IBMCloud infrastructure provider. @@ -1052,6 +1228,27 @@ type AlibabaCloudResourceTag struct { Value string `json:"value"` } +// NutanixPlatformLoadBalancer defines the load balancer used by the cluster on Nutanix platform. +// +union +type NutanixPlatformLoadBalancer struct { + // type defines the type of load balancer used by the cluster on Nutanix platform + // which can be a user-managed or openshift-managed load balancer + // that is to be used for the OpenShift API and Ingress endpoints. + // When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing + // defined in the machine config operator will be deployed. + // When set to UserManaged these static pods will not be deployed and it is expected that + // the load balancer is configured out of band by the deployer. + // When omitted, this means no opinion and the platform is left to choose a reasonable default. + // The default value is OpenShiftManagedDefault. + // +default="OpenShiftManagedDefault" + // +kubebuilder:default:="OpenShiftManagedDefault" + // +kubebuilder:validation:Enum:="OpenShiftManagedDefault";"UserManaged" + // +kubebuilder:validation:XValidation:rule="oldSelf == '' || self == oldSelf",message="type is immutable once set" + // +optional + // +unionDiscriminator + Type PlatformLoadBalancerType `json:"type,omitempty"` +} + // NutanixPlatformSpec holds the desired state of the Nutanix infrastructure provider. // This only includes fields that can be modified in the cluster. type NutanixPlatformSpec struct { @@ -1137,6 +1334,13 @@ type NutanixPlatformStatus struct { // +kubebuilder:validation:Format=ip // +kubebuilder:validation:MaxItems=2 IngressIPs []string `json:"ingressIPs"` + + // loadBalancer defines how the load balancer used by the cluster is configured. + // +default={"type": "OpenShiftManagedDefault"} + // +kubebuilder:default={"type": "OpenShiftManagedDefault"} + // +openshift:enable:FeatureSets=TechPreviewNoUpgrade + // +optional + LoadBalancer *NutanixPlatformLoadBalancer `json:"loadBalancer,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object diff --git a/vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go b/vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go index a9babbc7f2..04a75688f7 100644 --- a/vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go +++ b/vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go @@ -555,6 +555,11 @@ func (in *AzurePlatformSpec) DeepCopy() *AzurePlatformSpec { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *AzurePlatformStatus) DeepCopyInto(out *AzurePlatformStatus) { *out = *in + if in.ResourceTags != nil { + in, out := &in.ResourceTags, &out.ResourceTags + *out = make([]AzureResourceTag, len(*in)) + copy(*out, *in) + } return } @@ -568,6 +573,38 @@ func (in *AzurePlatformStatus) DeepCopy() *AzurePlatformStatus { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *AzureResourceTag) DeepCopyInto(out *AzureResourceTag) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AzureResourceTag. +func (in *AzureResourceTag) DeepCopy() *AzureResourceTag { + if in == nil { + return nil + } + out := new(AzureResourceTag) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *BareMetalPlatformLoadBalancer) DeepCopyInto(out *BareMetalPlatformLoadBalancer) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BareMetalPlatformLoadBalancer. +func (in *BareMetalPlatformLoadBalancer) DeepCopy() *BareMetalPlatformLoadBalancer { + if in == nil { + return nil + } + out := new(BareMetalPlatformLoadBalancer) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *BareMetalPlatformSpec) DeepCopyInto(out *BareMetalPlatformSpec) { *out = *in @@ -597,6 +634,11 @@ func (in *BareMetalPlatformStatus) DeepCopyInto(out *BareMetalPlatformStatus) { *out = make([]string, len(*in)) copy(*out, *in) } + if in.LoadBalancer != nil { + in, out := &in.LoadBalancer, &out.LoadBalancer + *out = new(BareMetalPlatformLoadBalancer) + **out = **in + } return } @@ -3494,6 +3536,22 @@ func (in *NodeStatus) DeepCopy() *NodeStatus { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *NutanixPlatformLoadBalancer) DeepCopyInto(out *NutanixPlatformLoadBalancer) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NutanixPlatformLoadBalancer. +func (in *NutanixPlatformLoadBalancer) DeepCopy() *NutanixPlatformLoadBalancer { + if in == nil { + return nil + } + out := new(NutanixPlatformLoadBalancer) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *NutanixPlatformSpec) DeepCopyInto(out *NutanixPlatformSpec) { *out = *in @@ -3529,6 +3587,11 @@ func (in *NutanixPlatformStatus) DeepCopyInto(out *NutanixPlatformStatus) { *out = make([]string, len(*in)) copy(*out, *in) } + if in.LoadBalancer != nil { + in, out := &in.LoadBalancer, &out.LoadBalancer + *out = new(NutanixPlatformLoadBalancer) + **out = **in + } return } @@ -3814,6 +3877,22 @@ func (in *OpenIDIdentityProvider) DeepCopy() *OpenIDIdentityProvider { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *OpenStackPlatformLoadBalancer) DeepCopyInto(out *OpenStackPlatformLoadBalancer) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OpenStackPlatformLoadBalancer. +func (in *OpenStackPlatformLoadBalancer) DeepCopy() *OpenStackPlatformLoadBalancer { + if in == nil { + return nil + } + out := new(OpenStackPlatformLoadBalancer) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *OpenStackPlatformSpec) DeepCopyInto(out *OpenStackPlatformSpec) { *out = *in @@ -3843,6 +3922,11 @@ func (in *OpenStackPlatformStatus) DeepCopyInto(out *OpenStackPlatformStatus) { *out = make([]string, len(*in)) copy(*out, *in) } + if in.LoadBalancer != nil { + in, out := &in.LoadBalancer, &out.LoadBalancer + *out = new(OpenStackPlatformLoadBalancer) + **out = **in + } return } @@ -3975,6 +4059,22 @@ func (in *OperatorHubStatus) DeepCopy() *OperatorHubStatus { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *OvirtPlatformLoadBalancer) DeepCopyInto(out *OvirtPlatformLoadBalancer) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OvirtPlatformLoadBalancer. +func (in *OvirtPlatformLoadBalancer) DeepCopy() *OvirtPlatformLoadBalancer { + if in == nil { + return nil + } + out := new(OvirtPlatformLoadBalancer) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *OvirtPlatformSpec) DeepCopyInto(out *OvirtPlatformSpec) { *out = *in @@ -4004,6 +4104,11 @@ func (in *OvirtPlatformStatus) DeepCopyInto(out *OvirtPlatformStatus) { *out = make([]string, len(*in)) copy(*out, *in) } + if in.LoadBalancer != nil { + in, out := &in.LoadBalancer, &out.LoadBalancer + *out = new(OvirtPlatformLoadBalancer) + **out = **in + } return } @@ -4114,7 +4219,7 @@ func (in *PlatformStatus) DeepCopyInto(out *PlatformStatus) { if in.Azure != nil { in, out := &in.Azure, &out.Azure *out = new(AzurePlatformStatus) - **out = **in + (*in).DeepCopyInto(*out) } if in.GCP != nil { in, out := &in.GCP, &out.GCP @@ -4956,6 +5061,22 @@ func (in *VSpherePlatformFailureDomainSpec) DeepCopy() *VSpherePlatformFailureDo return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *VSpherePlatformLoadBalancer) DeepCopyInto(out *VSpherePlatformLoadBalancer) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VSpherePlatformLoadBalancer. +func (in *VSpherePlatformLoadBalancer) DeepCopy() *VSpherePlatformLoadBalancer { + if in == nil { + return nil + } + out := new(VSpherePlatformLoadBalancer) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *VSpherePlatformNodeNetworking) DeepCopyInto(out *VSpherePlatformNodeNetworking) { *out = *in @@ -5044,6 +5165,11 @@ func (in *VSpherePlatformStatus) DeepCopyInto(out *VSpherePlatformStatus) { *out = make([]string, len(*in)) copy(*out, *in) } + if in.LoadBalancer != nil { + in, out := &in.LoadBalancer, &out.LoadBalancer + *out = new(VSpherePlatformLoadBalancer) + **out = **in + } return } diff --git a/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go b/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go index 0f149c9900..f63cec9999 100644 --- a/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go +++ b/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go @@ -1064,12 +1064,32 @@ var map_AzurePlatformStatus = map[string]string{ "networkResourceGroupName": "networkResourceGroupName is the Resource Group for network resources like the Virtual Network and Subnets used by the cluster. If empty, the value is same as ResourceGroupName.", "cloudName": "cloudName is the name of the Azure cloud environment which can be used to configure the Azure SDK with the appropriate Azure API endpoints. If empty, the value is equal to `AzurePublicCloud`.", "armEndpoint": "armEndpoint specifies a URL to use for resource management in non-soverign clouds such as Azure Stack.", + "resourceTags": "resourceTags is a list of additional tags to apply to Azure resources created for the cluster. See https://docs.microsoft.com/en-us/rest/api/resources/tags for information on tagging Azure resources. Due to limitations on Automation, Content Delivery Network, DNS Azure resources, a maximum of 15 tags may be applied. OpenShift reserves 5 tags for internal use, allowing 10 tags for user configuration.", } func (AzurePlatformStatus) SwaggerDoc() map[string]string { return map_AzurePlatformStatus } +var map_AzureResourceTag = map[string]string{ + "": "AzureResourceTag is a tag to apply to Azure resources created for the cluster.", + "key": "key is the key part of the tag. A tag key can have a maximum of 128 characters and cannot be empty. Key must begin with a letter, end with a letter, number or underscore, and must contain only alphanumeric characters and the following special characters `_ . -`.", + "value": "value is the value part of the tag. A tag value can have a maximum of 256 characters and cannot be empty. Value must contain only alphanumeric characters and the following special characters `_ + , - . / : ; < = > ? @`.", +} + +func (AzureResourceTag) SwaggerDoc() map[string]string { + return map_AzureResourceTag +} + +var map_BareMetalPlatformLoadBalancer = map[string]string{ + "": "BareMetalPlatformLoadBalancer defines the load balancer used by the cluster on BareMetal platform.", + "type": "type defines the type of load balancer used by the cluster on BareMetal platform which can be a user-managed or openshift-managed load balancer that is to be used for the OpenShift API and Ingress endpoints. When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing defined in the machine config operator will be deployed. When set to UserManaged these static pods will not be deployed and it is expected that the load balancer is configured out of band by the deployer. When omitted, this means no opinion and the platform is left to choose a reasonable default. The default value is OpenShiftManagedDefault.", +} + +func (BareMetalPlatformLoadBalancer) SwaggerDoc() map[string]string { + return map_BareMetalPlatformLoadBalancer +} + var map_BareMetalPlatformSpec = map[string]string{ "": "BareMetalPlatformSpec holds the desired state of the BareMetal infrastructure provider. This only includes fields that can be modified in the cluster.", } @@ -1085,6 +1105,7 @@ var map_BareMetalPlatformStatus = map[string]string{ "ingressIP": "ingressIP is an external IP which routes to the default ingress controller. The IP is a suitable target of a wildcard DNS record used to resolve default route host names.\n\nDeprecated: Use IngressIPs instead.", "ingressIPs": "ingressIPs are the external IPs which route to the default ingress controller. The IPs are suitable targets of a wildcard DNS record used to resolve default route host names. In dual stack clusters this list contains two IPs otherwise only one.", "nodeDNSIP": "nodeDNSIP is the IP address for the internal DNS used by the nodes. Unlike the one managed by the DNS operator, `NodeDNSIP` provides name resolution for the nodes themselves. There is no DNS-as-a-service for BareMetal deployments. In order to minimize necessary changes to the datacenter DNS, a DNS service is hosted as a static pod to serve those hostnames to the nodes in the cluster.", + "loadBalancer": "loadBalancer defines how the load balancer used by the cluster is configured.", } func (BareMetalPlatformStatus) SwaggerDoc() map[string]string { @@ -1213,6 +1234,7 @@ var map_InfrastructureStatus = map[string]string{ "apiServerInternalURI": "apiServerInternalURL is a valid URI with scheme 'https', address and optionally a port (defaulting to 443). apiServerInternalURL can be used by components like kubelets, to contact the Kubernetes API server using the infrastructure provider rather than Kubernetes networking.", "controlPlaneTopology": "controlPlaneTopology expresses the expectations for operands that normally run on control nodes. The default is 'HighlyAvailable', which represents the behavior operators have in a \"normal\" cluster. The 'SingleReplica' mode will be used in single-node deployments and the operators should not configure the operand for highly-available operation The 'External' mode indicates that the control plane is hosted externally to the cluster and that its components are not visible within the cluster.", "infrastructureTopology": "infrastructureTopology expresses the expectations for infrastructure services that do not run on control plane nodes, usually indicated by a node selector for a `role` value other than `master`. The default is 'HighlyAvailable', which represents the behavior operators have in a \"normal\" cluster. The 'SingleReplica' mode will be used in single-node deployments and the operators should not configure the operand for highly-available operation NOTE: External topology mode is not applicable for this field.", + "cpuPartitioning": "cpuPartitioning expresses if CPU partitioning is a currently enabled feature in the cluster. CPU Partitioning means that this cluster can support partitioning workloads to specific CPU Sets. Valid values are \"None\" and \"AllNodes\". When omitted, the default value is \"None\". The default value of \"None\" indicates that no nodes will be setup with CPU partitioning. The \"AllNodes\" value indicates that all nodes have been setup with CPU partitioning, and can then be further configured via the PerformanceProfile API.", } func (InfrastructureStatus) SwaggerDoc() map[string]string { @@ -1237,6 +1259,15 @@ func (KubevirtPlatformStatus) SwaggerDoc() map[string]string { return map_KubevirtPlatformStatus } +var map_NutanixPlatformLoadBalancer = map[string]string{ + "": "NutanixPlatformLoadBalancer defines the load balancer used by the cluster on Nutanix platform.", + "type": "type defines the type of load balancer used by the cluster on Nutanix platform which can be a user-managed or openshift-managed load balancer that is to be used for the OpenShift API and Ingress endpoints. When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing defined in the machine config operator will be deployed. When set to UserManaged these static pods will not be deployed and it is expected that the load balancer is configured out of band by the deployer. When omitted, this means no opinion and the platform is left to choose a reasonable default. The default value is OpenShiftManagedDefault.", +} + +func (NutanixPlatformLoadBalancer) SwaggerDoc() map[string]string { + return map_NutanixPlatformLoadBalancer +} + var map_NutanixPlatformSpec = map[string]string{ "": "NutanixPlatformSpec holds the desired state of the Nutanix infrastructure provider. This only includes fields that can be modified in the cluster.", "prismCentral": "prismCentral holds the endpoint address and port to access the Nutanix Prism Central. When a cluster-wide proxy is installed, by default, this endpoint will be accessed via the proxy. Should you wish for communication with this endpoint not to be proxied, please add the endpoint to the proxy spec.noProxy list.", @@ -1253,6 +1284,7 @@ var map_NutanixPlatformStatus = map[string]string{ "apiServerInternalIPs": "apiServerInternalIPs are the IP addresses to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. These are the IPs for a self-hosted load balancer in front of the API servers. In dual stack clusters this list contains two IPs otherwise only one.", "ingressIP": "ingressIP is an external IP which routes to the default ingress controller. The IP is a suitable target of a wildcard DNS record used to resolve default route host names.\n\nDeprecated: Use IngressIPs instead.", "ingressIPs": "ingressIPs are the external IPs which route to the default ingress controller. The IPs are suitable targets of a wildcard DNS record used to resolve default route host names. In dual stack clusters this list contains two IPs otherwise only one.", + "loadBalancer": "loadBalancer defines how the load balancer used by the cluster is configured.", } func (NutanixPlatformStatus) SwaggerDoc() map[string]string { @@ -1279,6 +1311,15 @@ func (NutanixPrismEndpoint) SwaggerDoc() map[string]string { return map_NutanixPrismEndpoint } +var map_OpenStackPlatformLoadBalancer = map[string]string{ + "": "OpenStackPlatformLoadBalancer defines the load balancer used by the cluster on OpenStack platform.", + "type": "type defines the type of load balancer used by the cluster on OpenStack platform which can be a user-managed or openshift-managed load balancer that is to be used for the OpenShift API and Ingress endpoints. When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing defined in the machine config operator will be deployed. When set to UserManaged these static pods will not be deployed and it is expected that the load balancer is configured out of band by the deployer. When omitted, this means no opinion and the platform is left to choose a reasonable default. The default value is OpenShiftManagedDefault.", +} + +func (OpenStackPlatformLoadBalancer) SwaggerDoc() map[string]string { + return map_OpenStackPlatformLoadBalancer +} + var map_OpenStackPlatformSpec = map[string]string{ "": "OpenStackPlatformSpec holds the desired state of the OpenStack infrastructure provider. This only includes fields that can be modified in the cluster.", } @@ -1295,12 +1336,22 @@ var map_OpenStackPlatformStatus = map[string]string{ "ingressIP": "ingressIP is an external IP which routes to the default ingress controller. The IP is a suitable target of a wildcard DNS record used to resolve default route host names.\n\nDeprecated: Use IngressIPs instead.", "ingressIPs": "ingressIPs are the external IPs which route to the default ingress controller. The IPs are suitable targets of a wildcard DNS record used to resolve default route host names. In dual stack clusters this list contains two IPs otherwise only one.", "nodeDNSIP": "nodeDNSIP is the IP address for the internal DNS used by the nodes. Unlike the one managed by the DNS operator, `NodeDNSIP` provides name resolution for the nodes themselves. There is no DNS-as-a-service for OpenStack deployments. In order to minimize necessary changes to the datacenter DNS, a DNS service is hosted as a static pod to serve those hostnames to the nodes in the cluster.", + "loadBalancer": "loadBalancer defines how the load balancer used by the cluster is configured.", } func (OpenStackPlatformStatus) SwaggerDoc() map[string]string { return map_OpenStackPlatformStatus } +var map_OvirtPlatformLoadBalancer = map[string]string{ + "": "OvirtPlatformLoadBalancer defines the load balancer used by the cluster on Ovirt platform.", + "type": "type defines the type of load balancer used by the cluster on Ovirt platform which can be a user-managed or openshift-managed load balancer that is to be used for the OpenShift API and Ingress endpoints. When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing defined in the machine config operator will be deployed. When set to UserManaged these static pods will not be deployed and it is expected that the load balancer is configured out of band by the deployer. When omitted, this means no opinion and the platform is left to choose a reasonable default. The default value is OpenShiftManagedDefault.", +} + +func (OvirtPlatformLoadBalancer) SwaggerDoc() map[string]string { + return map_OvirtPlatformLoadBalancer +} + var map_OvirtPlatformSpec = map[string]string{ "": "OvirtPlatformSpec holds the desired state of the oVirt infrastructure provider. This only includes fields that can be modified in the cluster.", } @@ -1316,6 +1367,7 @@ var map_OvirtPlatformStatus = map[string]string{ "ingressIP": "ingressIP is an external IP which routes to the default ingress controller. The IP is a suitable target of a wildcard DNS record used to resolve default route host names.\n\nDeprecated: Use IngressIPs instead.", "ingressIPs": "ingressIPs are the external IPs which route to the default ingress controller. The IPs are suitable targets of a wildcard DNS record used to resolve default route host names. In dual stack clusters this list contains two IPs otherwise only one.", "nodeDNSIP": "deprecated: as of 4.6, this field is no longer set or honored. It will be removed in a future release.", + "loadBalancer": "loadBalancer defines how the load balancer used by the cluster is configured.", } func (OvirtPlatformStatus) SwaggerDoc() map[string]string { @@ -1413,6 +1465,15 @@ func (VSpherePlatformFailureDomainSpec) SwaggerDoc() map[string]string { return map_VSpherePlatformFailureDomainSpec } +var map_VSpherePlatformLoadBalancer = map[string]string{ + "": "VSpherePlatformLoadBalancer defines the load balancer used by the cluster on VSphere platform.", + "type": "type defines the type of load balancer used by the cluster on VSphere platform which can be a user-managed or openshift-managed load balancer that is to be used for the OpenShift API and Ingress endpoints. When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing defined in the machine config operator will be deployed. When set to UserManaged these static pods will not be deployed and it is expected that the load balancer is configured out of band by the deployer. When omitted, this means no opinion and the platform is left to choose a reasonable default. The default value is OpenShiftManagedDefault.", +} + +func (VSpherePlatformLoadBalancer) SwaggerDoc() map[string]string { + return map_VSpherePlatformLoadBalancer +} + var map_VSpherePlatformNodeNetworking = map[string]string{ "": "VSpherePlatformNodeNetworking holds the external and internal node networking spec.", "external": "external represents the network configuration of the node that is externally routable.", @@ -1452,6 +1513,7 @@ var map_VSpherePlatformStatus = map[string]string{ "ingressIP": "ingressIP is an external IP which routes to the default ingress controller. The IP is a suitable target of a wildcard DNS record used to resolve default route host names.\n\nDeprecated: Use IngressIPs instead.", "ingressIPs": "ingressIPs are the external IPs which route to the default ingress controller. The IPs are suitable targets of a wildcard DNS record used to resolve default route host names. In dual stack clusters this list contains two IPs otherwise only one.", "nodeDNSIP": "nodeDNSIP is the IP address for the internal DNS used by the nodes. Unlike the one managed by the DNS operator, `NodeDNSIP` provides name resolution for the nodes themselves. There is no DNS-as-a-service for vSphere deployments. In order to minimize necessary changes to the datacenter DNS, a DNS service is hosted as a static pod to serve those hostnames to the nodes in the cluster.", + "loadBalancer": "loadBalancer defines how the load balancer used by the cluster is configured.", } func (VSpherePlatformStatus) SwaggerDoc() map[string]string { diff --git a/vendor/github.com/openshift/api/operator/v1/0000_50_ingress-operator_00-ingresscontroller.crd.yaml b/vendor/github.com/openshift/api/operator/v1/0000_50_ingress-operator_00-ingresscontroller.crd.yaml index b6ff95a92e..fb8dd8e5ec 100644 --- a/vendor/github.com/openshift/api/operator/v1/0000_50_ingress-operator_00-ingresscontroller.crd.yaml +++ b/vendor/github.com/openshift/api/operator/v1/0000_50_ingress-operator_00-ingresscontroller.crd.yaml @@ -161,8 +161,19 @@ spec: - Local type: string type: object + ibm: + description: "ibm provides configuration settings that are specific to IBM Cloud load balancers. \n If empty, defaults will be applied. See specific ibm fields for details about their defaults." + properties: + protocol: + description: "protocol specifies whether the load balancer uses PROXY protocol to forward connections to the IngressController. See \"service.kubernetes.io/ibm-load-balancer-cloud-provider-enable-features: \"proxy-protocol\"\" at https://cloud.ibm.com/docs/containers?topic=containers-vpc-lbaas\" \n PROXY protocol can be used with load balancers that support it to communicate the source addresses of client connections when forwarding those connections to the IngressController. Using PROXY protocol enables the IngressController to report those source addresses instead of reporting the load balancer's address in HTTP headers and logs. Note that enabling PROXY protocol on the IngressController will cause connections to fail if you are not using a load balancer that uses PROXY protocol to forward connections to the IngressController. See http://www.haproxy.org/download/2.2/doc/proxy-protocol.txt for information about PROXY protocol. \n Valid values for protocol are TCP, PROXY and omitted. When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time. The current default is TCP, without the proxy protocol enabled." + enum: + - "" + - TCP + - PROXY + type: string + type: object type: - description: type is the underlying infrastructure provider for the load balancer. Allowed values are "AWS", "Azure", "BareMetal", "GCP", "Nutanix", "OpenStack", and "VSphere". + description: type is the underlying infrastructure provider for the load balancer. Allowed values are "AWS", "Azure", "BareMetal", "GCP", "IBM", "Nutanix", "OpenStack", and "VSphere". enum: - AWS - Azure @@ -827,8 +838,19 @@ spec: - Local type: string type: object + ibm: + description: "ibm provides configuration settings that are specific to IBM Cloud load balancers. \n If empty, defaults will be applied. See specific ibm fields for details about their defaults." + properties: + protocol: + description: "protocol specifies whether the load balancer uses PROXY protocol to forward connections to the IngressController. See \"service.kubernetes.io/ibm-load-balancer-cloud-provider-enable-features: \"proxy-protocol\"\" at https://cloud.ibm.com/docs/containers?topic=containers-vpc-lbaas\" \n PROXY protocol can be used with load balancers that support it to communicate the source addresses of client connections when forwarding those connections to the IngressController. Using PROXY protocol enables the IngressController to report those source addresses instead of reporting the load balancer's address in HTTP headers and logs. Note that enabling PROXY protocol on the IngressController will cause connections to fail if you are not using a load balancer that uses PROXY protocol to forward connections to the IngressController. See http://www.haproxy.org/download/2.2/doc/proxy-protocol.txt for information about PROXY protocol. \n Valid values for protocol are TCP, PROXY and omitted. When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time. The current default is TCP, without the proxy protocol enabled." + enum: + - "" + - TCP + - PROXY + type: string + type: object type: - description: type is the underlying infrastructure provider for the load balancer. Allowed values are "AWS", "Azure", "BareMetal", "GCP", "Nutanix", "OpenStack", and "VSphere". + description: type is the underlying infrastructure provider for the load balancer. Allowed values are "AWS", "Azure", "BareMetal", "GCP", "IBM", "Nutanix", "OpenStack", and "VSphere". enum: - AWS - Azure diff --git a/vendor/github.com/openshift/api/operator/v1/types_ingress.go b/vendor/github.com/openshift/api/operator/v1/types_ingress.go index 0a0b3ca74d..f69f8a8c32 100644 --- a/vendor/github.com/openshift/api/operator/v1/types_ingress.go +++ b/vendor/github.com/openshift/api/operator/v1/types_ingress.go @@ -280,18 +280,18 @@ type HTTPCompressionPolicy struct { // // The format should follow the Content-Type definition in RFC 1341: // Content-Type := type "/" subtype *[";" parameter] -// - The type in Content-Type can be one of: -// application, audio, image, message, multipart, text, video, or a custom -// type preceded by "X-" and followed by a token as defined below. -// - The token is a string of at least one character, and not containing white -// space, control characters, or any of the characters in the tspecials set. -// - The tspecials set contains the characters ()<>@,;:\"/[]?.= -// - The subtype in Content-Type is also a token. -// - The optional parameter/s following the subtype are defined as: -// token "=" (token / quoted-string) -// - The quoted-string, as defined in RFC 822, is surrounded by double quotes -// and can contain white space plus any character EXCEPT \, ", and CR. -// It can also contain any single ASCII character as long as it is escaped by \. +// - The type in Content-Type can be one of: +// application, audio, image, message, multipart, text, video, or a custom +// type preceded by "X-" and followed by a token as defined below. +// - The token is a string of at least one character, and not containing white +// space, control characters, or any of the characters in the tspecials set. +// - The tspecials set contains the characters ()<>@,;:\"/[]?.= +// - The subtype in Content-Type is also a token. +// - The optional parameter/s following the subtype are defined as: +// token "=" (token / quoted-string) +// - The quoted-string, as defined in RFC 822, is surrounded by double quotes +// and can contain white space plus any character EXCEPT \, ", and CR. +// It can also contain any single ASCII character as long as it is escaped by \. // // +kubebuilder:validation:Pattern=`^(?i)(x-[^][ ()\\<>@,;:"/?.=\x00-\x1F\x7F]+|application|audio|image|message|multipart|text|video)/[^][ ()\\<>@,;:"/?.=\x00-\x1F\x7F]+(; *[^][ ()\\<>@,;:"/?.=\x00-\x1F\x7F]+=([^][ ()\\<>@,;:"/?.=\x00-\x1F\x7F]+|"(\\[\x00-\x7F]|[^\x0D"\\])*"))*$` type CompressionMIMEType string @@ -448,7 +448,7 @@ const ( // +union type ProviderLoadBalancerParameters struct { // type is the underlying infrastructure provider for the load balancer. - // Allowed values are "AWS", "Azure", "BareMetal", "GCP", "Nutanix", + // Allowed values are "AWS", "Azure", "BareMetal", "GCP", "IBM", "Nutanix", // "OpenStack", and "VSphere". // // +unionDiscriminator @@ -473,10 +473,19 @@ type ProviderLoadBalancerParameters struct { // // +optional GCP *GCPLoadBalancerParameters `json:"gcp,omitempty"` + + // ibm provides configuration settings that are specific to IBM Cloud + // load balancers. + // + // If empty, defaults will be applied. See specific ibm fields for + // details about their defaults. + // + // +optional + IBM *IBMLoadBalancerParameters `json:"ibm,omitempty"` } // LoadBalancerProviderType is the underlying infrastructure provider for the -// load balancer. Allowed values are "AWS", "Azure", "BareMetal", "GCP", "Nutanix", +// load balancer. Allowed values are "AWS", "Azure", "BareMetal", "GCP", "IBM", "Nutanix", // "OpenStack", and "VSphere". // // +kubebuilder:validation:Enum=AWS;Azure;BareMetal;GCP;Nutanix;OpenStack;VSphere;IBM @@ -573,6 +582,33 @@ const ( GCPLocalAccess GCPClientAccess = "Local" ) +// IBMLoadBalancerParameters provides configuration settings that are +// specific to IBM Cloud load balancers. +type IBMLoadBalancerParameters struct { + // protocol specifies whether the load balancer uses PROXY protocol to forward connections to + // the IngressController. See "service.kubernetes.io/ibm-load-balancer-cloud-provider-enable-features: + // "proxy-protocol"" at https://cloud.ibm.com/docs/containers?topic=containers-vpc-lbaas" + // + // PROXY protocol can be used with load balancers that support it to + // communicate the source addresses of client connections when + // forwarding those connections to the IngressController. Using PROXY + // protocol enables the IngressController to report those source + // addresses instead of reporting the load balancer's address in HTTP + // headers and logs. Note that enabling PROXY protocol on the + // IngressController will cause connections to fail if you are not using + // a load balancer that uses PROXY protocol to forward connections to + // the IngressController. See + // http://www.haproxy.org/download/2.2/doc/proxy-protocol.txt for + // information about PROXY protocol. + // + // Valid values for protocol are TCP, PROXY and omitted. + // When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time. + // The current default is TCP, without the proxy protocol enabled. + // + // +optional + Protocol IngressControllerProtocol `json:"protocol,omitempty"` +} + // AWSClassicLoadBalancerParameters holds configuration parameters for an // AWS Classic load balancer. type AWSClassicLoadBalancerParameters struct { diff --git a/vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go b/vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go index 5304a39011..2f59a3a451 100644 --- a/vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go +++ b/vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go @@ -1585,6 +1585,22 @@ func (in *HybridOverlayConfig) DeepCopy() *HybridOverlayConfig { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *IBMLoadBalancerParameters) DeepCopyInto(out *IBMLoadBalancerParameters) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new IBMLoadBalancerParameters. +func (in *IBMLoadBalancerParameters) DeepCopy() *IBMLoadBalancerParameters { + if in == nil { + return nil + } + out := new(IBMLoadBalancerParameters) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *IPAMConfig) DeepCopyInto(out *IPAMConfig) { *out = *in @@ -3454,6 +3470,11 @@ func (in *ProviderLoadBalancerParameters) DeepCopyInto(out *ProviderLoadBalancer *out = new(GCPLoadBalancerParameters) **out = **in } + if in.IBM != nil { + in, out := &in.IBM, &out.IBM + *out = new(IBMLoadBalancerParameters) + **out = **in + } return } diff --git a/vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go b/vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go index 50ecdf3723..5d42c6da38 100644 --- a/vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go +++ b/vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go @@ -717,6 +717,15 @@ func (HostNetworkStrategy) SwaggerDoc() map[string]string { return map_HostNetworkStrategy } +var map_IBMLoadBalancerParameters = map[string]string{ + "": "IBMLoadBalancerParameters provides configuration settings that are specific to IBM Cloud load balancers.", + "protocol": "protocol specifies whether the load balancer uses PROXY protocol to forward connections to the IngressController. See \"service.kubernetes.io/ibm-load-balancer-cloud-provider-enable-features: \"proxy-protocol\"\" at https://cloud.ibm.com/docs/containers?topic=containers-vpc-lbaas\"\n\nPROXY protocol can be used with load balancers that support it to communicate the source addresses of client connections when forwarding those connections to the IngressController. Using PROXY protocol enables the IngressController to report those source addresses instead of reporting the load balancer's address in HTTP headers and logs. Note that enabling PROXY protocol on the IngressController will cause connections to fail if you are not using a load balancer that uses PROXY protocol to forward connections to the IngressController. See http://www.haproxy.org/download/2.2/doc/proxy-protocol.txt for information about PROXY protocol.\n\nValid values for protocol are TCP, PROXY and omitted. When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time. The current default is TCP, without the proxy protocol enabled.", +} + +func (IBMLoadBalancerParameters) SwaggerDoc() map[string]string { + return map_IBMLoadBalancerParameters +} + var map_IngressController = map[string]string{ "": "IngressController describes a managed ingress controller for the cluster. The controller can service OpenShift Route and Kubernetes Ingress resources.\n\nWhen an IngressController is created, a new ingress controller deployment is created to allow external traffic to reach the services that expose Ingress or Route resources. Updating this resource may lead to disruption for public facing network connections as a new ingress controller revision may be rolled out.\n\nhttps://kubernetes.io/docs/concepts/services-networking/ingress-controllers\n\nWhenever possible, sensible defaults for the platform are used. See each field for more details.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "spec": "spec is the specification of the desired behavior of the IngressController.", @@ -920,9 +929,10 @@ func (PrivateStrategy) SwaggerDoc() map[string]string { var map_ProviderLoadBalancerParameters = map[string]string{ "": "ProviderLoadBalancerParameters holds desired load balancer information specific to the underlying infrastructure provider.", - "type": "type is the underlying infrastructure provider for the load balancer. Allowed values are \"AWS\", \"Azure\", \"BareMetal\", \"GCP\", \"Nutanix\", \"OpenStack\", and \"VSphere\".", + "type": "type is the underlying infrastructure provider for the load balancer. Allowed values are \"AWS\", \"Azure\", \"BareMetal\", \"GCP\", \"IBM\", \"Nutanix\", \"OpenStack\", and \"VSphere\".", "aws": "aws provides configuration settings that are specific to AWS load balancers.\n\nIf empty, defaults will be applied. See specific aws fields for details about their defaults.", "gcp": "gcp provides configuration settings that are specific to GCP load balancers.\n\nIf empty, defaults will be applied. See specific gcp fields for details about their defaults.", + "ibm": "ibm provides configuration settings that are specific to IBM Cloud load balancers.\n\nIf empty, defaults will be applied. See specific ibm fields for details about their defaults.", } func (ProviderLoadBalancerParameters) SwaggerDoc() map[string]string { diff --git a/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go b/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go index a4ef2fbb3c..07e120d787 100644 --- a/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go +++ b/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go @@ -170,7 +170,7 @@ cluster's shared state through which all other components interact.`, } // add feature enablement metrics utilfeature.DefaultMutableFeatureGate.AddMetrics() - return Run(completedOptions, cmd.Context().Done()) + return Run(completedOptions, genericapiserver.SetupSignalHandlerIgnoringFurtherSignals()) }, Args: func(cmd *cobra.Command, args []string) error { for _, arg := range args { diff --git a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go index c281a5bfe8..acb364d1e8 100644 --- a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go +++ b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go @@ -35,6 +35,7 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/wait" genericfeatures "k8s.io/apiserver/pkg/features" + "k8s.io/apiserver/pkg/server" "k8s.io/apiserver/pkg/server/healthz" "k8s.io/apiserver/pkg/server/mux" utilfeature "k8s.io/apiserver/pkg/util/feature" @@ -153,7 +154,8 @@ controller, and serviceaccounts controller.`, // add feature enablement metrics utilfeature.DefaultMutableFeatureGate.AddMetrics() - return Run(c.Complete(), cmd.Context().Done()) + stopCh := server.SetupSignalHandler() + return Run(c.Complete(), stopCh) }, Args: func(cmd *cobra.Command, args []string) error { for _, arg := range args { diff --git a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go index 510c99f923..1b6e863c10 100644 --- a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go +++ b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go @@ -12,6 +12,7 @@ import ( "github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccadmission" authorizationrestrictusers "k8s.io/kubernetes/openshift-kube-apiserver/admission/authorization/restrictusers" quotaclusterresourceoverride "k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/clusterresourceoverride" + "k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/managednode" "k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/managementcpusoverride" quotarunonceduration "k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/runonceduration" "k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/customresourcevalidationregistration" @@ -30,6 +31,7 @@ func RegisterOpenshiftKubeAdmissionPlugins(plugins *admission.Plugins) { imagepolicy.Register(plugins) ingressadmission.Register(plugins) managementcpusoverride.Register(plugins) + managednode.Register(plugins) projectnodeenv.Register(plugins) quotaclusterresourceoverride.Register(plugins) quotaclusterresourcequota.Register(plugins) @@ -71,6 +73,7 @@ var ( "route.openshift.io/IngressAdmission", hostassignment.PluginName, // "route.openshift.io/RouteHostAssignment" csiinlinevolumesecurity.PluginName, // "storage.openshift.io/CSIInlineVolumeSecurity" + managednode.PluginName, // "autoscaling.openshift.io/ManagedNode" } // openshiftAdmissionPluginsForKubeAfterResourceQuota are the plugins to add after ResourceQuota plugin diff --git a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/managednode/admission.go b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/managednode/admission.go new file mode 100644 index 0000000000..d89c6423a0 --- /dev/null +++ b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/managednode/admission.go @@ -0,0 +1,136 @@ +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 new file mode 100644 index 0000000000..512a5f8d03 --- /dev/null +++ b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/managednode/initializers.go @@ -0,0 +1,28 @@ +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 b10969a75f..c672aeced2 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,6 +179,16 @@ 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 @@ -196,26 +206,8 @@ func (a *managementCPUsOverride) Admit(ctx context.Context, attr admission.Attri return nil } - // 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 { + // Check if we are in CPU Partitioning mode for AllNodes + if !isCPUPartitioning(clusterInfra.Status, nodes, workloadType) { return nil } @@ -284,6 +276,21 @@ 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 { @@ -312,7 +319,7 @@ func (a *managementCPUsOverride) waitForSyncedStore(timeout <-chan time.Time) bo select { case <-time.After(100 * time.Millisecond): case <-timeout: - return a.nsListerSynced() && a.nodeListSynced() + return a.nsListerSynced() && a.nodeListSynced() && a.infraConfigListSynced() } } @@ -442,17 +449,6 @@ 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..45baad88b8 100644 --- a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go +++ b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go @@ -6,17 +6,36 @@ import ( "github.com/openshift/apiserver-library-go/pkg/admission/imagepolicy" "github.com/openshift/apiserver-library-go/pkg/admission/imagepolicy/imagereferencemutators" + "github.com/openshift/apiserver-library-go/pkg/admission/quota/clusterresourcequota" "github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccadmission" + apiclientv1 "github.com/openshift/client-go/apiserver/clientset/versioned/typed/apiserver/v1" + configclient "github.com/openshift/client-go/config/clientset/versioned" + configv1informer "github.com/openshift/client-go/config/informers/externalversions" + quotaclient "github.com/openshift/client-go/quota/clientset/versioned" + quotainformer "github.com/openshift/client-go/quota/informers/externalversions" + quotav1informer "github.com/openshift/client-go/quota/informers/externalversions/quota/v1" securityv1client "github.com/openshift/client-go/security/clientset/versioned" securityv1informer "github.com/openshift/client-go/security/informers/externalversions" + userclient "github.com/openshift/client-go/user/clientset/versioned" + userinformer "github.com/openshift/client-go/user/informers/externalversions" "github.com/openshift/library-go/pkg/apiserver/admission/admissionrestconfig" "github.com/openshift/library-go/pkg/apiserver/apiserverconfig" + "github.com/openshift/library-go/pkg/quota/clusterquotamapping" "k8s.io/apiserver/pkg/admission" + "k8s.io/apiserver/pkg/quota/v1/generic" genericapiserver "k8s.io/apiserver/pkg/server" clientgoinformers "k8s.io/client-go/informers" + corev1informers "k8s.io/client-go/informers/core/v1" "k8s.io/client-go/rest" + "k8s.io/client-go/tools/cache" + "k8s.io/kubernetes/openshift-kube-apiserver/admission/authorization/restrictusers" + "k8s.io/kubernetes/openshift-kube-apiserver/admission/authorization/restrictusers/usercache" + "k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/managednode" + "k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/managementcpusoverride" "k8s.io/kubernetes/openshift-kube-apiserver/admission/scheduler/nodeenv" "k8s.io/kubernetes/openshift-kube-apiserver/enablement" + "k8s.io/kubernetes/openshift-kube-apiserver/filters/apirequestcount" + "k8s.io/kubernetes/pkg/quota/v1/install" // magnet to get authorizer package in hack/update-vendor.sh _ "github.com/openshift/library-go/pkg/authorization/hardcodedauthorizer" @@ -41,12 +60,25 @@ func OpenShiftKubeAPIServerConfigPatch(genericConfig *genericapiserver.Config, k genericConfig.LongRunningFunc = apiserverconfig.IsLongRunningRequest // ADMISSION + clusterQuotaMappingController := newClusterQuotaMappingController(kubeInformers.Core().V1().Namespaces(), openshiftInformers.OpenshiftQuotaInformers.Quota().V1().ClusterResourceQuotas()) + genericConfig.AddPostStartHookOrDie("quota.openshift.io-clusterquotamapping", func(context genericapiserver.PostStartHookContext) error { + go clusterQuotaMappingController.Run(5, context.StopCh) + return nil + }) *pluginInitializers = append(*pluginInitializers, imagepolicy.NewInitializer(imagereferencemutators.KubeImageMutators{}, enablement.OpenshiftConfig().ImagePolicyConfig.InternalRegistryHostname), + restrictusers.NewInitializer(openshiftInformers.getOpenshiftUserInformers()), sccadmission.NewInitializer(openshiftInformers.getOpenshiftSecurityInformers().Security().V1().SecurityContextConstraints()), + clusterresourcequota.NewInitializer( + openshiftInformers.getOpenshiftQuotaInformers().Quota().V1().ClusterResourceQuotas(), + clusterQuotaMappingController.GetClusterQuotaMapper(), + generic.NewRegistry(install.NewQuotaConfigurationForAdmission().Evaluators()), + ), nodeenv.NewInitializer(enablement.OpenshiftConfig().ProjectConfig.DefaultNodeSelector), admissionrestconfig.NewInitializer(*rest.CopyConfig(genericConfig.LoopbackClientConfig)), + managementcpusoverride.NewInitializer(openshiftInformers.getOpenshiftInfraInformers().Config().V1().Infrastructures()), + managednode.NewInitializer(openshiftInformers.getOpenshiftInfraInformers().Config().V1().Infrastructures()), ) // This is needed in order to have the correct initializers for the SCC admission plugin which is used to mutate @@ -56,6 +88,26 @@ func OpenShiftKubeAPIServerConfigPatch(genericConfig *genericapiserver.Config, k enablement.SCCAdmissionPlugin.SetExternalKubeInformerFactory(kubeInformers) // END ADMISSION + // HANDLER CHAIN (with oauth server and web console) + apiserverClient, err := apiclientv1.NewForConfig(makeJSONRESTConfig(genericConfig.LoopbackClientConfig)) + if err != nil { + return err + } + apiRequestCountController := apirequestcount.NewController(apiserverClient.APIRequestCounts(), nodeFor()) + genericConfig.AddPostStartHook("openshift.io-api-request-count-filter", func(context genericapiserver.PostStartHookContext) error { + go apiRequestCountController.Start(context.StopCh) + return nil + }) + genericConfig.BuildHandlerChainFunc, err = BuildHandlerChain( + enablement.OpenshiftConfig().AuthConfig.OAuthMetadataFile, + kubeInformers.Core().V1().ConfigMaps(), + apiRequestCountController, + ) + if err != nil { + return err + } + // END HANDLER CHAIN + openshiftAPIServiceReachabilityCheck := newOpenshiftAPIServiceReachabilityCheck() oauthAPIServiceReachabilityCheck := newOAuthPIServiceReachabilityCheck() genericConfig.ReadyzChecks = append(genericConfig.ReadyzChecks, openshiftAPIServiceReachabilityCheck, oauthAPIServiceReachabilityCheck) @@ -97,30 +149,69 @@ func newInformers(loopbackClientConfig *rest.Config) (*kubeAPIServerInformers, e // ClusterResourceQuota is served using CRD resource any status update must use JSON jsonLoopbackClientConfig := makeJSONRESTConfig(loopbackClientConfig) + quotaClient, err := quotaclient.NewForConfig(jsonLoopbackClientConfig) + if err != nil { + return nil, err + } securityClient, err := securityv1client.NewForConfig(jsonLoopbackClientConfig) if err != nil { return nil, err } + userClient, err := userclient.NewForConfig(loopbackClientConfig) + if err != nil { + return nil, err + } + configClient, err := configclient.NewForConfig(loopbackClientConfig) + if err != nil { + return nil, err + } // TODO find a single place to create and start informers. During the 1.7 rebase this will come more naturally in a config object, // before then we should try to eliminate our direct to storage access. It's making us do weird things. const defaultInformerResyncPeriod = 10 * time.Minute ret := &kubeAPIServerInformers{ + OpenshiftQuotaInformers: quotainformer.NewSharedInformerFactory(quotaClient, defaultInformerResyncPeriod), OpenshiftSecurityInformers: securityv1informer.NewSharedInformerFactory(securityClient, defaultInformerResyncPeriod), + OpenshiftUserInformers: userinformer.NewSharedInformerFactory(userClient, defaultInformerResyncPeriod), + OpenshiftConfigInformers: configv1informer.NewSharedInformerFactory(configClient, defaultInformerResyncPeriod), + } + if err := ret.OpenshiftUserInformers.User().V1().Groups().Informer().AddIndexers(cache.Indexers{ + usercache.ByUserIndexName: usercache.ByUserIndexKeys, + }); err != nil { + return nil, err } return ret, nil } type kubeAPIServerInformers struct { + OpenshiftQuotaInformers quotainformer.SharedInformerFactory OpenshiftSecurityInformers securityv1informer.SharedInformerFactory + OpenshiftUserInformers userinformer.SharedInformerFactory + OpenshiftConfigInformers configv1informer.SharedInformerFactory } +func (i *kubeAPIServerInformers) getOpenshiftQuotaInformers() quotainformer.SharedInformerFactory { + return i.OpenshiftQuotaInformers +} func (i *kubeAPIServerInformers) getOpenshiftSecurityInformers() securityv1informer.SharedInformerFactory { return i.OpenshiftSecurityInformers } +func (i *kubeAPIServerInformers) getOpenshiftUserInformers() userinformer.SharedInformerFactory { + return i.OpenshiftUserInformers +} +func (i *kubeAPIServerInformers) getOpenshiftInfraInformers() configv1informer.SharedInformerFactory { + return i.OpenshiftConfigInformers +} func (i *kubeAPIServerInformers) Start(stopCh <-chan struct{}) { + i.OpenshiftQuotaInformers.Start(stopCh) i.OpenshiftSecurityInformers.Start(stopCh) + i.OpenshiftUserInformers.Start(stopCh) + i.OpenshiftConfigInformers.Start(stopCh) +} + +func newClusterQuotaMappingController(nsInternalInformer corev1informers.NamespaceInformer, clusterQuotaInformer quotav1informer.ClusterResourceQuotaInformer) *clusterquotamapping.ClusterQuotaMappingController { + return clusterquotamapping.NewClusterQuotaMappingController(nsInternalInformer, clusterQuotaInformer) } diff --git a/vendor/modules.txt b/vendor/modules.txt index 2b0ff7c9f3..9f34e521e1 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -557,7 +557,7 @@ github.com/opencontainers/selinux/go-selinux github.com/opencontainers/selinux/go-selinux/label github.com/opencontainers/selinux/pkg/pwalk github.com/opencontainers/selinux/pkg/pwalkdir -# github.com/openshift/api v0.0.0-20230201213816-61d971884921 +# github.com/openshift/api v0.0.0-20230208193339-068b2ae5534f ## explicit; go 1.19 github.com/openshift/api github.com/openshift/api/apiserver @@ -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-20230221040739-518f3edfe79c +# k8s.io/api v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230223163248-89232647de67 ## 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-20230221040739-518f3edfe79c +# k8s.io/apiextensions-apiserver v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230223163248-89232647de67 ## 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-20230221040739-518f3edfe79c +# k8s.io/apimachinery v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230223163248-89232647de67 ## 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-20230221040739-518f3edfe79c +# k8s.io/apiserver v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230223163248-89232647de67 ## 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-20230221040739-518f3edfe79c +# k8s.io/cli-runtime v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230223163248-89232647de67 ## 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-20230221040739-518f3edfe79c +# k8s.io/client-go v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230223163248-89232647de67 ## 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-20230221040739-518f3edfe79c +# k8s.io/cloud-provider v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230223163248-89232647de67 ## 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-20230221040739-518f3edfe79c +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230223163248-89232647de67 ## 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-20230221040739-518f3edfe79c +# k8s.io/component-base v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230223163248-89232647de67 ## 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-20230221040739-518f3edfe79c +# k8s.io/component-helpers v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230223163248-89232647de67 ## 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-20230221040739-518f3edfe79c +# k8s.io/controller-manager v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230223163248-89232647de67 ## 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-20230221040739-518f3edfe79c +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230223163248-89232647de67 ## 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-20230221040739-518f3edfe79c +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230223163248-89232647de67 ## 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-20230221040739-518f3edfe79c +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230223163248-89232647de67 ## 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-20230221040739-518f3edfe79c +# k8s.io/kms v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230223163248-89232647de67 ## 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-20230221040739-518f3edfe79c +# k8s.io/kube-aggregator v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230223163248-89232647de67 ## 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-20230221040739-518f3edfe79c +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230223163248-89232647de67 ## 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-20230221040739-518f3edfe79c +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230223163248-89232647de67 ## 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-20230221040739-518f3edfe79c +# k8s.io/kubectl v0.26.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230223163248-89232647de67 ## 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-20230221040739-518f3edfe79c +# k8s.io/kubelet v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230223163248-89232647de67 ## 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-20230221040739-518f3edfe79c +# k8s.io/kubernetes v1.26.1 => github.com/openshift/kubernetes v0.0.0-20230223163248-89232647de67 ## explicit; go 1.19 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -2282,6 +2282,7 @@ 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 @@ -3047,7 +3048,7 @@ k8s.io/kubernetes/third_party/forked/gonum/graph k8s.io/kubernetes/third_party/forked/gonum/graph/internal/linear k8s.io/kubernetes/third_party/forked/gonum/graph/simple k8s.io/kubernetes/third_party/forked/gonum/graph/traverse -# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230221040739-518f3edfe79c +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230223163248-89232647de67 ## explicit; go 1.19 k8s.io/legacy-cloud-providers/aws k8s.io/legacy-cloud-providers/azure @@ -3090,7 +3091,7 @@ k8s.io/legacy-cloud-providers/gce/gcpcredential k8s.io/legacy-cloud-providers/vsphere k8s.io/legacy-cloud-providers/vsphere/vclib k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers -# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230221040739-518f3edfe79c +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230223163248-89232647de67 ## explicit; go 1.19 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3105,10 +3106,10 @@ k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1 k8s.io/metrics/pkg/client/custom_metrics k8s.io/metrics/pkg/client/custom_metrics/scheme k8s.io/metrics/pkg/client/external_metrics -# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230221040739-518f3edfe79c +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230223163248-89232647de67 ## 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-20230221040739-518f3edfe79c +# k8s.io/pod-security-admission v0.25.0 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230223163248-89232647de67 ## explicit; go 1.19 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3251,33 +3252,33 @@ sigs.k8s.io/structured-merge-diff/v4/value ## explicit; go 1.12 sigs.k8s.io/yaml # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.4.1-0.20221214150008-e73634cb3870 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230221040739-518f3edfe79c -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230221040739-518f3edfe79c -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230221040739-518f3edfe79c -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230221040739-518f3edfe79c -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230221040739-518f3edfe79c -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230221040739-518f3edfe79c -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230221040739-518f3edfe79c -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230221040739-518f3edfe79c -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230221040739-518f3edfe79c -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230221040739-518f3edfe79c -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230221040739-518f3edfe79c -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230221040739-518f3edfe79c -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230221040739-518f3edfe79c -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230221040739-518f3edfe79c -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230221040739-518f3edfe79c -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230221040739-518f3edfe79c -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230221040739-518f3edfe79c -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230221040739-518f3edfe79c -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230221040739-518f3edfe79c -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230221040739-518f3edfe79c -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230221040739-518f3edfe79c -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230221040739-518f3edfe79c -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230221040739-518f3edfe79c -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230221040739-518f3edfe79c -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230221040739-518f3edfe79c -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230221040739-518f3edfe79c -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230221040739-518f3edfe79c -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230221040739-518f3edfe79c -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230221040739-518f3edfe79c -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230221040739-518f3edfe79c +# 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