Skip to content

NO-ISSUE: pkg: Deduplicate api/machineconfiguration/v1 imports #4091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Jan 9, 2024
Merged

NO-ISSUE: pkg: Deduplicate api/machineconfiguration/v1 imports #4091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions pkg/controller/node/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
helpers "github.com/openshift/machine-config-operator/pkg/helpers"

mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
v1 "github.com/openshift/api/machineconfiguration/v1"
"github.com/openshift/machine-config-operator/pkg/apihelpers"
ctrlcommon "github.com/openshift/machine-config-operator/pkg/controller/common"
"github.com/openshift/machine-config-operator/pkg/daemon/constants"
Expand Down Expand Up @@ -73,12 +72,12 @@ func (ctrl *Controller) syncStatusOnly(pool *mcfgv1.MachineConfigPool) error {
}

//nolint:gocyclo
func calculateStatus(mcs []*mcfgalphav1.MachineConfigNode, cconfig *v1.ControllerConfig, pool *mcfgv1.MachineConfigPool, nodes []*corev1.Node) mcfgv1.MachineConfigPoolStatus {
certExpirys := []v1.CertExpiry{}
func calculateStatus(mcs []*mcfgalphav1.MachineConfigNode, cconfig *mcfgv1.ControllerConfig, pool *mcfgv1.MachineConfigPool, nodes []*corev1.Node) mcfgv1.MachineConfigPoolStatus {
certExpirys := []mcfgv1.CertExpiry{}
if cconfig != nil {
for _, cert := range cconfig.Status.ControllerCertificates {
if cert.BundleFile == "KubeAPIServerServingCAData" {
certExpirys = append(certExpirys, v1.CertExpiry{
certExpirys = append(certExpirys, mcfgv1.CertExpiry{
Bundle: cert.BundleFile,
Subject: cert.Subject,
Expiry: cert.NotAfter,
Expand Down
11 changes: 5 additions & 6 deletions pkg/controller/template/template_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (

osev1 "github.com/openshift/api/config/v1"
mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
v1 "github.com/openshift/api/machineconfiguration/v1"
mcfgclientset "github.com/openshift/client-go/machineconfiguration/clientset/versioned"
"github.com/openshift/client-go/machineconfiguration/clientset/versioned/scheme"
mcfginformersv1 "github.com/openshift/client-go/machineconfiguration/informers/externalversions/machineconfiguration/v1"
Expand Down Expand Up @@ -437,8 +436,8 @@ func updateControllerConfigCerts(config *mcfgv1.ControllerConfig) bool {
config.Spec.RootCAData,
config.Spec.AdditionalTrustBundle,
}
newImgCerts := []v1.ControllerCertificate{}
newCtrlCerts := []v1.ControllerCertificate{}
newImgCerts := []mcfgv1.ControllerCertificate{}
newCtrlCerts := []mcfgv1.ControllerCertificate{}
for i, cert := range certs {
certs := createNewCert(cert, names[i])
if len(certs) > 0 {
Expand Down Expand Up @@ -486,8 +485,8 @@ func updateControllerConfigCerts(config *mcfgv1.ControllerConfig) bool {
return modified
}

func createNewCert(cert []byte, name string) []v1.ControllerCertificate {
certs := []v1.ControllerCertificate{}
func createNewCert(cert []byte, name string) []mcfgv1.ControllerCertificate {
certs := []mcfgv1.ControllerCertificate{}
for len(cert) > 0 {
b, next := pem.Decode(cert)
if b == nil {
Expand All @@ -500,7 +499,7 @@ func createNewCert(cert []byte, name string) []v1.ControllerCertificate {
continue
}
cert = next
certs = append(certs, v1.ControllerCertificate{
certs = append(certs, mcfgv1.ControllerCertificate{
Subject: c.Subject.String(),
Signer: c.Issuer.String(),
BundleFile: name,
Expand Down
7 changes: 3 additions & 4 deletions pkg/operator/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"k8s.io/apimachinery/pkg/labels"
"k8s.io/klog/v2"

v1 "github.com/openshift/api/machineconfiguration/v1"
"github.com/openshift/machine-config-operator/pkg/apihelpers"
ctrlcommon "github.com/openshift/machine-config-operator/pkg/controller/common"
"github.com/openshift/machine-config-operator/pkg/helpers"
Expand Down Expand Up @@ -370,7 +369,7 @@ func (optr *Operator) syncMetrics() error {
// set metrics per pool, we need to get the latest condition to log for the state
var latestTime metav1.Time
latestTime.Time = time.Time{}
var cond v1.MachineConfigPoolCondition
var cond mcfgv1.MachineConfigPoolCondition
for _, pool := range pools {
for _, condition := range pool.Status.Conditions {
if condition.Status == corev1.ConditionTrue && condition.LastTransitionTime.After(latestTime.Time) {
Expand All @@ -393,7 +392,7 @@ func (optr *Operator) syncMetrics() error {

// isKubeletSkewSupported checks the version skew of kube-apiserver and node kubelet version.
// Returns the skew status. version skew > 2 is not supported.
func (optr *Operator) isKubeletSkewSupported(pools []*v1.MachineConfigPool) (skewStatus string, coStatus configv1.ClusterOperatorStatusCondition, err error) {
func (optr *Operator) isKubeletSkewSupported(pools []*mcfgv1.MachineConfigPool) (skewStatus string, coStatus configv1.ClusterOperatorStatusCondition, err error) {
coStatus = configv1.ClusterOperatorStatusCondition{}
kubeAPIServerStatus, err := optr.configClient.ConfigV1().ClusterOperators().Get(context.TODO(), "kube-apiserver", metav1.GetOptions{})
if err != nil {
Expand Down Expand Up @@ -471,7 +470,7 @@ func (optr *Operator) isKubeletSkewSupported(pools []*v1.MachineConfigPool) (ske
}

// GetAllManagedNodes returns the nodes managed by MCO
func (optr *Operator) GetAllManagedNodes(pools []*v1.MachineConfigPool) ([]*corev1.Node, error) {
func (optr *Operator) GetAllManagedNodes(pools []*mcfgv1.MachineConfigPool) ([]*corev1.Node, error) {
nodes := []*corev1.Node{}
for _, pool := range pools {
selector, err := metav1.LabelSelectorAsSelector(pool.Spec.NodeSelector)
Expand Down
17 changes: 8 additions & 9 deletions pkg/operator/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import (

configv1 "github.com/openshift/api/config/v1"
mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
v1 "github.com/openshift/api/machineconfiguration/v1"
v1alpha1 "github.com/openshift/api/machineconfiguration/v1alpha1"

"github.com/openshift/library-go/pkg/operator/resource/resourceapply"
Expand Down Expand Up @@ -281,7 +280,7 @@ func (optr *Operator) syncRenderConfig(_ *renderConfig) error {
if err != nil {
return err
}
imgRegistryUsrData := []v1.ImageRegistryBundle{}
imgRegistryUsrData := []mcfgv1.ImageRegistryBundle{}
if cfg.Spec.AdditionalTrustedCA.Name != "" {
cm, err := optr.clusterCmLister.ConfigMaps("openshift-config").Get(cfg.Spec.AdditionalTrustedCA.Name)
if err != nil {
Expand All @@ -292,47 +291,47 @@ func (optr *Operator) syncRenderConfig(_ *renderConfig) error {
for _, key := range newKeys {
raw, err := base64.StdEncoding.DecodeString(cm.Data[key])
if err != nil {
imgRegistryUsrData = append(imgRegistryUsrData, v1.ImageRegistryBundle{
imgRegistryUsrData = append(imgRegistryUsrData, mcfgv1.ImageRegistryBundle{
File: key,
Data: []byte(cm.Data[key]),
})
} else {
imgRegistryUsrData = append(imgRegistryUsrData, v1.ImageRegistryBundle{
imgRegistryUsrData = append(imgRegistryUsrData, mcfgv1.ImageRegistryBundle{
File: key,
Data: raw,
})
}
}
for _, key := range newBinaryKeys {
imgRegistryUsrData = append(imgRegistryUsrData, v1.ImageRegistryBundle{
imgRegistryUsrData = append(imgRegistryUsrData, mcfgv1.ImageRegistryBundle{
File: key,
Data: cm.BinaryData[key],
})
}
}
}

imgRegistryData := []v1.ImageRegistryBundle{}
imgRegistryData := []mcfgv1.ImageRegistryBundle{}
cm, err := optr.clusterCmLister.ConfigMaps("openshift-config-managed").Get("image-registry-ca")
if err == nil {
newKeys := sets.StringKeySet(cm.Data).List()
newBinaryKeys := sets.StringKeySet(cm.BinaryData).List()
for _, key := range newKeys {
raw, err := base64.StdEncoding.DecodeString(cm.Data[key])
if err != nil {
imgRegistryData = append(imgRegistryData, v1.ImageRegistryBundle{
imgRegistryData = append(imgRegistryData, mcfgv1.ImageRegistryBundle{
File: key,
Data: []byte(cm.Data[key]),
})
} else {
imgRegistryData = append(imgRegistryData, v1.ImageRegistryBundle{
imgRegistryData = append(imgRegistryData, mcfgv1.ImageRegistryBundle{
File: key,
Data: raw,
})
}
}
for _, key := range newBinaryKeys {
imgRegistryData = append(imgRegistryData, v1.ImageRegistryBundle{
imgRegistryData = append(imgRegistryData, mcfgv1.ImageRegistryBundle{
File: key,
Data: cm.BinaryData[key],
})
Expand Down