diff --git a/api/v1/multiclusterengine_types.go b/api/v1/multiclusterengine_types.go index 0967407e5..1ab7f658d 100644 --- a/api/v1/multiclusterengine_types.go +++ b/api/v1/multiclusterengine_types.go @@ -251,23 +251,23 @@ type MultiClusterEngineList struct { } // +kubebuilder:object:root=true -// +operator-sdk:csv:customresourcedefinitions:displayName="InternalHubComponent" -type InternalHubComponent struct { +// +operator-sdk:csv:customresourcedefinitions:displayName="InternalEngineComponent" +type InternalEngineComponent struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` - Spec InternalHubComponentSpec `json:"spec,omitempty"` + Spec InternalEngineComponentSpec `json:"spec,omitempty"` } // +kubebuilder:object:root=true -type InternalHubComponentList struct { +type InternalEngineComponentList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` - Items []InternalHubComponent `json:"items"` + Items []InternalEngineComponent `json:"items"` } -type InternalHubComponentSpec struct{} +type InternalEngineComponentSpec struct{} func init() { SchemeBuilder.Register(&MultiClusterEngine{}, &MultiClusterEngineList{}) - SchemeBuilder.Register(&InternalHubComponent{}, &InternalHubComponentList{}) + SchemeBuilder.Register(&InternalEngineComponent{}, &InternalEngineComponentList{}) } diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go index f96e3ef36..08c43f1e2 100644 --- a/api/v1/zz_generated.deepcopy.go +++ b/api/v1/zz_generated.deepcopy.go @@ -58,25 +58,25 @@ func (in *ComponentConfig) DeepCopy() *ComponentConfig { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *InternalHubComponent) DeepCopyInto(out *InternalHubComponent) { +func (in *InternalEngineComponent) DeepCopyInto(out *InternalEngineComponent) { *out = *in out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) out.Spec = in.Spec } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new InternalHubComponent. -func (in *InternalHubComponent) DeepCopy() *InternalHubComponent { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new InternalEngineComponent. +func (in *InternalEngineComponent) DeepCopy() *InternalEngineComponent { if in == nil { return nil } - out := new(InternalHubComponent) + out := new(InternalEngineComponent) in.DeepCopyInto(out) return out } // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *InternalHubComponent) DeepCopyObject() runtime.Object { +func (in *InternalEngineComponent) DeepCopyObject() runtime.Object { if c := in.DeepCopy(); c != nil { return c } @@ -84,31 +84,31 @@ func (in *InternalHubComponent) DeepCopyObject() runtime.Object { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *InternalHubComponentList) DeepCopyInto(out *InternalHubComponentList) { +func (in *InternalEngineComponentList) DeepCopyInto(out *InternalEngineComponentList) { *out = *in out.TypeMeta = in.TypeMeta in.ListMeta.DeepCopyInto(&out.ListMeta) if in.Items != nil { in, out := &in.Items, &out.Items - *out = make([]InternalHubComponent, len(*in)) + *out = make([]InternalEngineComponent, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } } } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new InternalHubComponentList. -func (in *InternalHubComponentList) DeepCopy() *InternalHubComponentList { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new InternalEngineComponentList. +func (in *InternalEngineComponentList) DeepCopy() *InternalEngineComponentList { if in == nil { return nil } - out := new(InternalHubComponentList) + out := new(InternalEngineComponentList) in.DeepCopyInto(out) return out } // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *InternalHubComponentList) DeepCopyObject() runtime.Object { +func (in *InternalEngineComponentList) DeepCopyObject() runtime.Object { if c := in.DeepCopy(); c != nil { return c } @@ -116,16 +116,16 @@ func (in *InternalHubComponentList) DeepCopyObject() runtime.Object { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *InternalHubComponentSpec) DeepCopyInto(out *InternalHubComponentSpec) { +func (in *InternalEngineComponentSpec) DeepCopyInto(out *InternalEngineComponentSpec) { *out = *in } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new InternalHubComponentSpec. -func (in *InternalHubComponentSpec) DeepCopy() *InternalHubComponentSpec { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new InternalEngineComponentSpec. +func (in *InternalEngineComponentSpec) DeepCopy() *InternalEngineComponentSpec { if in == nil { return nil } - out := new(InternalHubComponentSpec) + out := new(InternalEngineComponentSpec) in.DeepCopyInto(out) return out } diff --git a/bundle/manifests/multicluster-engine.clusterserviceversion.yaml b/bundle/manifests/multicluster-engine.clusterserviceversion.yaml index ab00fcc27..168e25deb 100644 --- a/bundle/manifests/multicluster-engine.clusterserviceversion.yaml +++ b/bundle/manifests/multicluster-engine.clusterserviceversion.yaml @@ -82,7 +82,7 @@ spec: - apiGroups: - multicluster.openshift.io resources: - - internalhubcomponents + - internalenginecomponents verbs: - create - get diff --git a/config/crd/bases/multicluster.openshift.io_internalhubcomponents.yaml b/config/crd/bases/multicluster.openshift.io_internalenginecomponents.yaml similarity index 86% rename from config/crd/bases/multicluster.openshift.io_internalhubcomponents.yaml rename to config/crd/bases/multicluster.openshift.io_internalenginecomponents.yaml index 7768b4590..b044005d0 100644 --- a/config/crd/bases/multicluster.openshift.io_internalhubcomponents.yaml +++ b/config/crd/bases/multicluster.openshift.io_internalenginecomponents.yaml @@ -4,14 +4,14 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.15.0 - name: internalhubcomponents.multicluster.openshift.io + name: internalenginecomponents.multicluster.openshift.io spec: group: multicluster.openshift.io names: - kind: InternalHubComponent - listKind: InternalHubComponentList - plural: internalhubcomponents - singular: internalhubcomponent + kind: InternalEngineComponent + listKind: InternalEngineComponentList + plural: internalenginecomponents + singular: internalenginecomponent scope: Namespaced versions: - name: v1 diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index d4464dc7e..0c97d84ca 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -2044,7 +2044,7 @@ rules: - apiGroups: - multicluster.openshift.io resources: - - internalhubcomponents + - internalenginecomponents verbs: - create - delete diff --git a/controllers/backplaneconfig_controller.go b/controllers/backplaneconfig_controller.go index fb2c354a5..e3b8b5efe 100644 --- a/controllers/backplaneconfig_controller.go +++ b/controllers/backplaneconfig_controller.go @@ -152,8 +152,8 @@ var ( //+kubebuilder:rbac:groups="",resources=serviceaccounts/token,verbs=create //+kubebuilder:rbac:groups=authentication.k8s.io,resources=tokenrequests,verbs=create -// InternalHubComponent -// +kubebuilder:rbac:groups="multicluster.openshift.io",resources="internalhubcomponents",verbs=create;get;delete;patch;list;watch +// InternalEngineComponent +// +kubebuilder:rbac:groups="multicluster.openshift.io",resources="internalenginecomponents",verbs=create;get;delete;patch;list;watch // Reconcile is part of the main kubernetes reconciliation loop which aims to // move the current state of the cluster closer to the desired state. @@ -796,15 +796,15 @@ func (r *MultiClusterEngineReconciler) DeployAlwaysSubcomponents(ctx context.Con return ctrl.Result{}, nil } -func (r *MultiClusterEngineReconciler) ensureInternalHubComponent( +func (r *MultiClusterEngineReconciler) ensureInternalEngineComponent( ctx context.Context, backplaneConfig *backplanev1.MultiClusterEngine, component string) (ctrl.Result, error) { - componentCR := &backplanev1.InternalHubComponent{ + componentCR := &backplanev1.InternalEngineComponent{ TypeMeta: metav1.TypeMeta{ APIVersion: backplanev1.GroupVersion.String(), - Kind: "InternalHubComponent", + Kind: "InternalEngineComponent", }, ObjectMeta: metav1.ObjectMeta{ Name: component, @@ -822,25 +822,25 @@ func (r *MultiClusterEngineReconciler) ensureInternalHubComponent( return ctrl.Result{}, nil } -func (r *MultiClusterEngineReconciler) ensureNoInternalHubComponent( +func (r *MultiClusterEngineReconciler) ensureNoInternalEngineComponent( ctx context.Context, backplaneConfig *backplanev1.MultiClusterEngine, component string) (ctrl.Result, error) { - comp := &backplanev1.InternalHubComponent{} + comp := &backplanev1.InternalEngineComponent{} err := r.Client.Get(ctx, types.NamespacedName{Name: component, Namespace: backplaneConfig.Spec.TargetNamespace}, comp) if apierrors.IsNotFound(err) { return ctrl.Result{}, nil } if err != nil { - log.Error(err, fmt.Sprintf("Error getting InternalHubComponent. Error: %v: Component was: %v", err, comp)) + log.Error(err, fmt.Sprintf("Error getting InternalEngineComponent. Error: %v: Component was: %v", err, comp)) return reconcile.Result{Requeue: true}, err } - log.Info(fmt.Sprintf("Ensuring No InternalHubComponent: %s", component)) + log.Info(fmt.Sprintf("Ensuring No InternalEngineComponent: %s", component)) err = r.Client.Delete(ctx, comp) if err != nil && !apierrors.IsNotFound(err) { - log.Error(err, fmt.Sprintf("Error deleting InternalHubComponent. Error: %v", err)) + log.Error(err, fmt.Sprintf("Error deleting InternalEngineComponent. Error: %v", err)) return reconcile.Result{Requeue: true}, err } @@ -855,12 +855,12 @@ func (r *MultiClusterEngineReconciler) ensureToggleableComponents(ctx context.Co if backplaneConfig.Enabled(backplanev1.ManagedServiceAccount) { - result, err := r.ensureInternalHubComponent(ctx, backplaneConfig, backplanev1.ManagedServiceAccount) + result, err := r.ensureInternalEngineComponent(ctx, backplaneConfig, backplanev1.ManagedServiceAccount) if result != (ctrl.Result{}) { requeue = true } if err != nil { - errs[backplanev1.ManagedServiceAccount+"InternalHubComponent"] = err + errs[backplanev1.ManagedServiceAccount+"InternalEngineComponent"] = err } result, err = r.ensureManagedServiceAccount(ctx, backplaneConfig) if result != (ctrl.Result{}) { @@ -870,12 +870,12 @@ func (r *MultiClusterEngineReconciler) ensureToggleableComponents(ctx context.Co errs[backplanev1.ManagedServiceAccount] = err } } else { - result, err := r.ensureNoInternalHubComponent(ctx, backplaneConfig, backplanev1.ManagedServiceAccount) + result, err := r.ensureNoInternalEngineComponent(ctx, backplaneConfig, backplanev1.ManagedServiceAccount) if result != (ctrl.Result{}) { requeue = true } if err != nil { - errs[backplanev1.ManagedServiceAccount+"InternalHubComponent"] = err + errs[backplanev1.ManagedServiceAccount+"InternalEngineComponent"] = err } result, err = r.ensureNoManagedServiceAccount(ctx, backplaneConfig) if result != (ctrl.Result{}) { @@ -887,12 +887,12 @@ func (r *MultiClusterEngineReconciler) ensureToggleableComponents(ctx context.Co } if backplaneConfig.Enabled(backplanev1.ImageBasedInstallOperator) { - result, err := r.ensureInternalHubComponent(ctx, backplaneConfig, backplanev1.ImageBasedInstallOperator) + result, err := r.ensureInternalEngineComponent(ctx, backplaneConfig, backplanev1.ImageBasedInstallOperator) if result != (ctrl.Result{}) { requeue = true } if err != nil { - errs[backplanev1.ImageBasedInstallOperator+"InternalHubComponent"] = err + errs[backplanev1.ImageBasedInstallOperator+"InternalEngineComponent"] = err } result, err = r.ensureImageBasedInstallOperator(ctx, backplaneConfig) if result != (ctrl.Result{}) { @@ -902,12 +902,12 @@ func (r *MultiClusterEngineReconciler) ensureToggleableComponents(ctx context.Co errs[backplanev1.ImageBasedInstallOperator] = err } } else { - result, err := r.ensureNoInternalHubComponent(ctx, backplaneConfig, backplanev1.ImageBasedInstallOperator) + result, err := r.ensureNoInternalEngineComponent(ctx, backplaneConfig, backplanev1.ImageBasedInstallOperator) if result != (ctrl.Result{}) { requeue = true } if err != nil { - errs[backplanev1.ImageBasedInstallOperator+"InternalHubComponent"] = err + errs[backplanev1.ImageBasedInstallOperator+"InternalEngineComponent"] = err } result, err = r.ensureNoImageBasedInstallOperator(ctx, backplaneConfig) if result != (ctrl.Result{}) { @@ -919,12 +919,12 @@ func (r *MultiClusterEngineReconciler) ensureToggleableComponents(ctx context.Co } if backplaneConfig.Enabled(backplanev1.HyperShift) { - result, err := r.ensureInternalHubComponent(ctx, backplaneConfig, backplanev1.HyperShift) + result, err := r.ensureInternalEngineComponent(ctx, backplaneConfig, backplanev1.HyperShift) if result != (ctrl.Result{}) { requeue = true } if err != nil { - errs[backplanev1.HyperShift+"InternalHubComponent"] = err + errs[backplanev1.HyperShift+"InternalEngineComponent"] = err } result, err = r.ensureHyperShift(ctx, backplaneConfig) if result != (ctrl.Result{}) { @@ -934,12 +934,12 @@ func (r *MultiClusterEngineReconciler) ensureToggleableComponents(ctx context.Co errs[backplanev1.HyperShift] = err } } else { - result, err := r.ensureNoInternalHubComponent(ctx, backplaneConfig, backplanev1.HyperShift) + result, err := r.ensureNoInternalEngineComponent(ctx, backplaneConfig, backplanev1.HyperShift) if result != (ctrl.Result{}) { requeue = true } if err != nil { - errs[backplanev1.HyperShift+"InternalHubComponent"] = err + errs[backplanev1.HyperShift+"InternalEngineComponent"] = err } result, err = r.ensureNoHyperShift(ctx, backplaneConfig) if result != (ctrl.Result{}) { @@ -963,12 +963,12 @@ func (r *MultiClusterEngineReconciler) ensureToggleableComponents(ctx context.Co } if backplaneConfig.Enabled(backplanev1.ConsoleMCE) && ocpConsole { - result, err := r.ensureInternalHubComponent(ctx, backplaneConfig, backplanev1.ConsoleMCE) + result, err := r.ensureInternalEngineComponent(ctx, backplaneConfig, backplanev1.ConsoleMCE) if result != (ctrl.Result{}) { requeue = true } if err != nil { - errs[backplanev1.ConsoleMCE+"InternalHubComponent"] = err + errs[backplanev1.ConsoleMCE+"InternalEngineComponent"] = err } result, err = r.ensureConsoleMCE(ctx, backplaneConfig) if result != (ctrl.Result{}) { @@ -978,12 +978,12 @@ func (r *MultiClusterEngineReconciler) ensureToggleableComponents(ctx context.Co errs[backplanev1.ConsoleMCE] = err } } else { - result, err := r.ensureNoInternalHubComponent(ctx, backplaneConfig, backplanev1.ConsoleMCE) + result, err := r.ensureNoInternalEngineComponent(ctx, backplaneConfig, backplanev1.ConsoleMCE) if result != (ctrl.Result{}) { requeue = true } if err != nil { - errs[backplanev1.ConsoleMCE+"InternalHubComponent"] = err + errs[backplanev1.ConsoleMCE+"InternalEngineComponent"] = err } result, err = r.ensureNoConsoleMCE(ctx, backplaneConfig, ocpConsole) if result != (ctrl.Result{}) { @@ -995,12 +995,12 @@ func (r *MultiClusterEngineReconciler) ensureToggleableComponents(ctx context.Co } if backplaneConfig.Enabled(backplanev1.Discovery) { - result, err := r.ensureInternalHubComponent(ctx, backplaneConfig, backplanev1.Discovery) + result, err := r.ensureInternalEngineComponent(ctx, backplaneConfig, backplanev1.Discovery) if result != (ctrl.Result{}) { requeue = true } if err != nil { - errs[backplanev1.Discovery+"InternalHubComponent"] = err + errs[backplanev1.Discovery+"InternalEngineComponent"] = err } result, err = r.ensureDiscovery(ctx, backplaneConfig) if result != (ctrl.Result{}) { @@ -1010,12 +1010,12 @@ func (r *MultiClusterEngineReconciler) ensureToggleableComponents(ctx context.Co errs[backplanev1.Discovery] = err } } else { - result, err := r.ensureNoInternalHubComponent(ctx, backplaneConfig, backplanev1.Discovery) + result, err := r.ensureNoInternalEngineComponent(ctx, backplaneConfig, backplanev1.Discovery) if result != (ctrl.Result{}) { requeue = true } if err != nil { - errs[backplanev1.Discovery+"InternalHubComponent"] = err + errs[backplanev1.Discovery+"InternalEngineComponent"] = err } result, err = r.ensureNoDiscovery(ctx, backplaneConfig) if result != (ctrl.Result{}) { @@ -1027,12 +1027,12 @@ func (r *MultiClusterEngineReconciler) ensureToggleableComponents(ctx context.Co } if backplaneConfig.Enabled(backplanev1.Hive) { - result, err := r.ensureInternalHubComponent(ctx, backplaneConfig, backplanev1.Hive) + result, err := r.ensureInternalEngineComponent(ctx, backplaneConfig, backplanev1.Hive) if result != (ctrl.Result{}) { requeue = true } if err != nil { - errs[backplanev1.Hive+"InternalHubComponent"] = err + errs[backplanev1.Hive+"InternalEngineComponent"] = err } result, err = r.ensureHive(ctx, backplaneConfig) if result != (ctrl.Result{}) { @@ -1042,12 +1042,12 @@ func (r *MultiClusterEngineReconciler) ensureToggleableComponents(ctx context.Co errs[backplanev1.Hive] = err } } else { - result, err := r.ensureNoInternalHubComponent(ctx, backplaneConfig, backplanev1.Hive) + result, err := r.ensureNoInternalEngineComponent(ctx, backplaneConfig, backplanev1.Hive) if result != (ctrl.Result{}) { requeue = true } if err != nil { - errs[backplanev1.Hive+"InternalHubComponent"] = err + errs[backplanev1.Hive+"InternalEngineComponent"] = err } result, err = r.ensureNoHive(ctx, backplaneConfig) if result != (ctrl.Result{}) { @@ -1059,12 +1059,12 @@ func (r *MultiClusterEngineReconciler) ensureToggleableComponents(ctx context.Co } if backplaneConfig.Enabled(backplanev1.AssistedService) { - result, err := r.ensureInternalHubComponent(ctx, backplaneConfig, backplanev1.AssistedService) + result, err := r.ensureInternalEngineComponent(ctx, backplaneConfig, backplanev1.AssistedService) if result != (ctrl.Result{}) { requeue = true } if err != nil { - errs[backplanev1.AssistedService+"InternalHubComponent"] = err + errs[backplanev1.AssistedService+"InternalEngineComponent"] = err } result, err = r.ensureAssistedService(ctx, backplaneConfig) if result != (ctrl.Result{}) { @@ -1074,12 +1074,12 @@ func (r *MultiClusterEngineReconciler) ensureToggleableComponents(ctx context.Co errs[backplanev1.AssistedService] = err } } else { - result, err := r.ensureNoInternalHubComponent(ctx, backplaneConfig, backplanev1.AssistedService) + result, err := r.ensureNoInternalEngineComponent(ctx, backplaneConfig, backplanev1.AssistedService) if result != (ctrl.Result{}) { requeue = true } if err != nil { - errs[backplanev1.AssistedService+"InternalHubComponent"] = err + errs[backplanev1.AssistedService+"InternalEngineComponent"] = err } result, err = r.ensureNoAssistedService(ctx, backplaneConfig) if result != (ctrl.Result{}) { @@ -1091,12 +1091,12 @@ func (r *MultiClusterEngineReconciler) ensureToggleableComponents(ctx context.Co } if backplaneConfig.Enabled(backplanev1.ClusterLifecycle) { - result, err := r.ensureInternalHubComponent(ctx, backplaneConfig, backplanev1.ClusterLifecycle) + result, err := r.ensureInternalEngineComponent(ctx, backplaneConfig, backplanev1.ClusterLifecycle) if result != (ctrl.Result{}) { requeue = true } if err != nil { - errs[backplanev1.ClusterLifecycle+"InternalHubComponent"] = err + errs[backplanev1.ClusterLifecycle+"InternalEngineComponent"] = err } result, err = r.ensureClusterLifecycle(ctx, backplaneConfig) if result != (ctrl.Result{}) { @@ -1106,12 +1106,12 @@ func (r *MultiClusterEngineReconciler) ensureToggleableComponents(ctx context.Co errs[backplanev1.ClusterLifecycle] = err } } else { - result, err := r.ensureNoInternalHubComponent(ctx, backplaneConfig, backplanev1.ClusterLifecycle) + result, err := r.ensureNoInternalEngineComponent(ctx, backplaneConfig, backplanev1.ClusterLifecycle) if result != (ctrl.Result{}) { requeue = true } if err != nil { - errs[backplanev1.ClusterLifecycle+"InternalHubComponent"] = err + errs[backplanev1.ClusterLifecycle+"InternalEngineComponent"] = err } result, err = r.ensureNoClusterLifecycle(ctx, backplaneConfig) if result != (ctrl.Result{}) { @@ -1123,12 +1123,12 @@ func (r *MultiClusterEngineReconciler) ensureToggleableComponents(ctx context.Co } if backplaneConfig.Enabled(backplanev1.ClusterManager) { - result, err := r.ensureInternalHubComponent(ctx, backplaneConfig, backplanev1.ClusterManager) + result, err := r.ensureInternalEngineComponent(ctx, backplaneConfig, backplanev1.ClusterManager) if result != (ctrl.Result{}) { requeue = true } if err != nil { - errs[backplanev1.ClusterManager+"InternalHubComponent"] = err + errs[backplanev1.ClusterManager+"InternalEngineComponent"] = err } result, err = r.ensureClusterManager(ctx, backplaneConfig) if result != (ctrl.Result{}) { @@ -1138,12 +1138,12 @@ func (r *MultiClusterEngineReconciler) ensureToggleableComponents(ctx context.Co errs[backplanev1.ClusterManager] = err } } else { - result, err := r.ensureNoInternalHubComponent(ctx, backplaneConfig, backplanev1.ClusterManager) + result, err := r.ensureNoInternalEngineComponent(ctx, backplaneConfig, backplanev1.ClusterManager) if result != (ctrl.Result{}) { requeue = true } if err != nil { - errs[backplanev1.ClusterManager+"InternalHubComponent"] = err + errs[backplanev1.ClusterManager+"InternalEngineComponent"] = err } result, err = r.ensureNoClusterManager(ctx, backplaneConfig) if result != (ctrl.Result{}) { @@ -1155,12 +1155,12 @@ func (r *MultiClusterEngineReconciler) ensureToggleableComponents(ctx context.Co } if backplaneConfig.Enabled(backplanev1.ServerFoundation) { - result, err := r.ensureInternalHubComponent(ctx, backplaneConfig, backplanev1.ServerFoundation) + result, err := r.ensureInternalEngineComponent(ctx, backplaneConfig, backplanev1.ServerFoundation) if result != (ctrl.Result{}) { requeue = true } if err != nil { - errs[backplanev1.ServerFoundation+"InternalHubComponent"] = err + errs[backplanev1.ServerFoundation+"InternalEngineComponent"] = err } result, err = r.ensureServerFoundation(ctx, backplaneConfig) if result != (ctrl.Result{}) { @@ -1170,12 +1170,12 @@ func (r *MultiClusterEngineReconciler) ensureToggleableComponents(ctx context.Co errs[backplanev1.ServerFoundation] = err } } else { - result, err := r.ensureNoInternalHubComponent(ctx, backplaneConfig, backplanev1.ServerFoundation) + result, err := r.ensureNoInternalEngineComponent(ctx, backplaneConfig, backplanev1.ServerFoundation) if result != (ctrl.Result{}) { requeue = true } if err != nil { - errs[backplanev1.ServerFoundation+"InternalHubComponent"] = err + errs[backplanev1.ServerFoundation+"InternalEngineComponent"] = err } result, err = r.ensureNoServerFoundation(ctx, backplaneConfig) if result != (ctrl.Result{}) { @@ -1187,12 +1187,12 @@ func (r *MultiClusterEngineReconciler) ensureToggleableComponents(ctx context.Co } if backplaneConfig.Enabled(backplanev1.ClusterProxyAddon) { - result, err := r.ensureInternalHubComponent(ctx, backplaneConfig, backplanev1.ClusterProxyAddon) + result, err := r.ensureInternalEngineComponent(ctx, backplaneConfig, backplanev1.ClusterProxyAddon) if result != (ctrl.Result{}) { requeue = true } if err != nil { - errs[backplanev1.ClusterProxyAddon+"InternalHubComponent"] = err + errs[backplanev1.ClusterProxyAddon+"InternalEngineComponent"] = err } result, err = r.ensureClusterProxyAddon(ctx, backplaneConfig) if result != (ctrl.Result{}) { @@ -1202,12 +1202,12 @@ func (r *MultiClusterEngineReconciler) ensureToggleableComponents(ctx context.Co errs[backplanev1.ClusterProxyAddon] = err } } else { - result, err := r.ensureNoInternalHubComponent(ctx, backplaneConfig, backplanev1.ClusterProxyAddon) + result, err := r.ensureNoInternalEngineComponent(ctx, backplaneConfig, backplanev1.ClusterProxyAddon) if result != (ctrl.Result{}) { requeue = true } if err != nil { - errs[backplanev1.ClusterProxyAddon+"InternalHubComponent"] = err + errs[backplanev1.ClusterProxyAddon+"InternalEngineComponent"] = err } result, err = r.ensureNoClusterProxyAddon(ctx, backplaneConfig) if result != (ctrl.Result{}) { @@ -1219,12 +1219,12 @@ func (r *MultiClusterEngineReconciler) ensureToggleableComponents(ctx context.Co } if backplaneConfig.Enabled(backplanev1.LocalCluster) { - // result, err := r.ensureInternalHubComponent(ctx, backplaneConfig, backplanev1.LocalCluster) + // result, err := r.ensureInternalEngineComponent(ctx, backplaneConfig, backplanev1.LocalCluster) // if result != (ctrl.Result{}) { // requeue = true // } // if err != nil { - // errs[backplanev1.LocalCluster+"InternalHubComponent"] = err + // errs[backplanev1.LocalCluster+"InternalEngineComponent"] = err // } result, err := r.ensureLocalCluster(ctx, backplaneConfig) if result != (ctrl.Result{}) { @@ -1234,12 +1234,12 @@ func (r *MultiClusterEngineReconciler) ensureToggleableComponents(ctx context.Co errs[backplanev1.LocalCluster] = err } } else { - // result, err := r.ensureNoInternalHubComponent(ctx, backplaneConfig, backplanev1.LocalCluster) + // result, err := r.ensureNoInternalEngineComponent(ctx, backplaneConfig, backplanev1.LocalCluster) // if result != (ctrl.Result{}) { // requeue = true // } // if err != nil { - // errs[backplanev1.LocalCluster+"InternalHubComponent"] = err + // errs[backplanev1.LocalCluster+"InternalEngineComponent"] = err // } result, err := r.ensureNoLocalCluster(ctx, backplaneConfig) if result != (ctrl.Result{}) { diff --git a/controllers/backplaneconfig_controller_test.go b/controllers/backplaneconfig_controller_test.go index 1abced98d..4e8fbdc98 100644 --- a/controllers/backplaneconfig_controller_test.go +++ b/controllers/backplaneconfig_controller_test.go @@ -534,7 +534,7 @@ var _ = Describe("BackplaneConfig controller", func() { }) }) - Context("ensuring InternalHubComponent CRs", func() { + Context("ensuring InternalEngineComponent CRs", func() { It("should deploy sub components", func() { createCtx := context.Background() By("creating the backplane config with everything enabled") @@ -607,11 +607,11 @@ var _ = Describe("BackplaneConfig controller", func() { } Expect(k8sClient.Create(createCtx, backplaneConfig)).Should(Succeed()) - By("ensuring the InternalHubComponent CRD is created") + By("ensuring the InternalEngineComponent CRD is created") ctx := context.Background() - ihcCRD := &apixv1.CustomResourceDefinition{} + iecCRD := &apixv1.CustomResourceDefinition{} - Eventually(k8sClient.Get(ctx, types.NamespacedName{Name: "internalhubcomponents.multicluster.openshift.io"}, ihcCRD)).Should(Succeed()) + Eventually(k8sClient.Get(ctx, types.NamespacedName{Name: "internalenginecomponents.multicluster.openshift.io"}, iecCRD)).Should(Succeed()) By("ensuring togglable components") _, err := reconciler.ensureToggleableComponents(ctx, backplaneConfig) @@ -621,7 +621,7 @@ var _ = Describe("BackplaneConfig controller", func() { for _, mcecomponent := range backplanev1.MCEComponents { if backplaneConfig.Enabled(mcecomponent) { By(fmt.Sprintf("ensuring %s CR is created", mcecomponent)) - Eventually(k8sClient.Get(ctx, types.NamespacedName{Name: mcecomponent, Namespace: backplaneConfig.Spec.TargetNamespace}, &backplanev1.InternalHubComponent{})).Should(Succeed()) + Eventually(k8sClient.Get(ctx, types.NamespacedName{Name: mcecomponent, Namespace: backplaneConfig.Spec.TargetNamespace}, &backplanev1.InternalEngineComponent{})).Should(Succeed()) } } @@ -629,13 +629,13 @@ var _ = Describe("BackplaneConfig controller", func() { for _, mcecomponent := range backplanev1.MCEComponents { if !backplaneConfig.Enabled(mcecomponent) { By(fmt.Sprintf("ensuring %s CR is not present", mcecomponent)) - Eventually(k8sClient.Get(ctx, types.NamespacedName{Name: mcecomponent, Namespace: backplaneConfig.Spec.TargetNamespace}, &backplanev1.InternalHubComponent{})).Should(Not(Succeed())) + Eventually(k8sClient.Get(ctx, types.NamespacedName{Name: mcecomponent, Namespace: backplaneConfig.Spec.TargetNamespace}, &backplanev1.InternalEngineComponent{})).Should(Not(Succeed())) } } }) }) - Context("ensuring No InternalHubComponent CRs", func() { + Context("ensuring No InternalEngineComponent CRs", func() { It("should deploy sub components", func() { createCtx := context.Background() By("creating the backplane config with everything enabled") @@ -706,11 +706,11 @@ var _ = Describe("BackplaneConfig controller", func() { } Expect(k8sClient.Create(createCtx, backplaneConfig)).Should(Succeed()) - By("ensuring the InternalHubComponent CRD is created") + By("ensuring the InternalEngineComponent CRD is created") ctx := context.Background() - ihcCRD := &apixv1.CustomResourceDefinition{} + iecCRD := &apixv1.CustomResourceDefinition{} - Eventually(k8sClient.Get(ctx, types.NamespacedName{Name: "internalhubcomponents.multicluster.openshift.io"}, ihcCRD)).Should(Succeed()) + Eventually(k8sClient.Get(ctx, types.NamespacedName{Name: "internalenginecomponents.multicluster.openshift.io"}, iecCRD)).Should(Succeed()) By("ensuring togglable components") _, err := reconciler.ensureToggleableComponents(ctx, backplaneConfig) @@ -720,7 +720,7 @@ var _ = Describe("BackplaneConfig controller", func() { for _, mcecomponent := range backplanev1.MCEComponents { if backplaneConfig.Enabled(mcecomponent) { By(fmt.Sprintf("ensuring %s CR is created", mcecomponent)) - Eventually(k8sClient.Get(ctx, types.NamespacedName{Name: mcecomponent, Namespace: backplaneConfig.Spec.TargetNamespace}, &backplanev1.InternalHubComponent{})).Should(Succeed()) + Eventually(k8sClient.Get(ctx, types.NamespacedName{Name: mcecomponent, Namespace: backplaneConfig.Spec.TargetNamespace}, &backplanev1.InternalEngineComponent{})).Should(Succeed()) } } @@ -728,7 +728,7 @@ var _ = Describe("BackplaneConfig controller", func() { for _, mcecomponent := range backplanev1.MCEComponents { if !backplaneConfig.Enabled(mcecomponent) { By(fmt.Sprintf("ensuring %s CR is not present", mcecomponent)) - component := &backplanev1.InternalHubComponent{} + component := &backplanev1.InternalEngineComponent{} err := k8sClient.Get(ctx, types.NamespacedName{Name: mcecomponent, Namespace: backplaneConfig.Spec.TargetNamespace}, component) log.Info(fmt.Sprintf("component and error: %v :: %v", component, err)) Expect(err).NotTo(BeNil()) diff --git a/pkg/templates/crds/internal/internal-hub-component.yaml b/pkg/templates/crds/internal/internal-engine-component.yaml similarity index 85% rename from pkg/templates/crds/internal/internal-hub-component.yaml rename to pkg/templates/crds/internal/internal-engine-component.yaml index 5d6f9b152..76d897967 100644 --- a/pkg/templates/crds/internal/internal-hub-component.yaml +++ b/pkg/templates/crds/internal/internal-engine-component.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: # name must match the spec fields below, and be in the form: . - name: internalhubcomponents.multicluster.openshift.io + name: internalenginecomponents.multicluster.openshift.io spec: # group name to use for REST API: /apis// group: multicluster.openshift.io @@ -23,11 +23,11 @@ spec: scope: Namespaced names: # plural name to be used in the URL: /apis/// - plural: internalhubcomponents + plural: internalenginecomponents # singular name to be used as an alias on the CLI and for display - singular: internalhubcomponent + singular: internalenginecomponent # kind is normally the CamelCased singular type. Your resource manifests use this. - kind: InternalHubComponent + kind: InternalEngineComponent # shortNames allow shorter string to match your resource on the CLI shortNames: - - ihc \ No newline at end of file + - iec \ No newline at end of file