diff --git a/api/v1alpha1/groupversion_info.go b/api/v1alpha1/groupversion_info.go index 2318e90..9dd3cc1 100644 --- a/api/v1alpha1/groupversion_info.go +++ b/api/v1alpha1/groupversion_info.go @@ -16,7 +16,7 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the infrastructure v1alpha1 API group // +kubebuilder:object:generate=true -// +groupName=infrastructure.flintlock.x-k8s.io +// +groupName=infrastructure.liquid-metal.io package v1alpha1 import ( @@ -26,7 +26,7 @@ import ( var ( // GroupVersion is group version used to register these objects - GroupVersion = schema.GroupVersion{Group: "infrastructure.flintlock.x-k8s.io", Version: "v1alpha1"} + GroupVersion = schema.GroupVersion{Group: "infrastructure.liquid-metal.io", Version: "v1alpha1"} // SchemeBuilder is used to add go types to the GroupVersionKind scheme SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion} diff --git a/config/crd/bases/infrastructure.flintlock.x-k8s.io_microvmreplicasets.yaml b/config/crd/bases/infrastructure.liquid-metal.io_microvmreplicasets.yaml similarity index 99% rename from config/crd/bases/infrastructure.flintlock.x-k8s.io_microvmreplicasets.yaml rename to config/crd/bases/infrastructure.liquid-metal.io_microvmreplicasets.yaml index 0a45424..17856c4 100644 --- a/config/crd/bases/infrastructure.flintlock.x-k8s.io_microvmreplicasets.yaml +++ b/config/crd/bases/infrastructure.liquid-metal.io_microvmreplicasets.yaml @@ -5,9 +5,9 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.9.2 creationTimestamp: null - name: microvmreplicasets.infrastructure.flintlock.x-k8s.io + name: microvmreplicasets.infrastructure.liquid-metal.io spec: - group: infrastructure.flintlock.x-k8s.io + group: infrastructure.liquid-metal.io names: kind: MicrovmReplicaSet listKind: MicrovmReplicaSetList diff --git a/config/crd/bases/infrastructure.flintlock.x-k8s.io_microvms.yaml b/config/crd/bases/infrastructure.liquid-metal.io_microvms.yaml similarity index 99% rename from config/crd/bases/infrastructure.flintlock.x-k8s.io_microvms.yaml rename to config/crd/bases/infrastructure.liquid-metal.io_microvms.yaml index 7899ae5..c531193 100644 --- a/config/crd/bases/infrastructure.flintlock.x-k8s.io_microvms.yaml +++ b/config/crd/bases/infrastructure.liquid-metal.io_microvms.yaml @@ -5,9 +5,9 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.9.2 creationTimestamp: null - name: microvms.infrastructure.flintlock.x-k8s.io + name: microvms.infrastructure.liquid-metal.io spec: - group: infrastructure.flintlock.x-k8s.io + group: infrastructure.liquid-metal.io names: kind: Microvm listKind: MicrovmList diff --git a/config/crd/bases/infrastructure.flintlock.x-k8s.io_microvmtemplates.yaml b/config/crd/bases/infrastructure.liquid-metal.io_microvmtemplates.yaml similarity index 99% rename from config/crd/bases/infrastructure.flintlock.x-k8s.io_microvmtemplates.yaml rename to config/crd/bases/infrastructure.liquid-metal.io_microvmtemplates.yaml index bfba63f..8468544 100644 --- a/config/crd/bases/infrastructure.flintlock.x-k8s.io_microvmtemplates.yaml +++ b/config/crd/bases/infrastructure.liquid-metal.io_microvmtemplates.yaml @@ -5,9 +5,9 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.9.2 creationTimestamp: null - name: microvmtemplates.infrastructure.flintlock.x-k8s.io + name: microvmtemplates.infrastructure.liquid-metal.io spec: - group: infrastructure.flintlock.x-k8s.io + group: infrastructure.liquid-metal.io names: kind: MicrovmTemplate listKind: MicrovmTemplateList diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index 1c0ad57..028df3b 100644 --- a/config/crd/kustomization.yaml +++ b/config/crd/kustomization.yaml @@ -2,9 +2,9 @@ # since it depends on service name and namespace that are out of this kustomize package. # It should be run by config/default resources: -- bases/infrastructure.flintlock.x-k8s.io_microvms.yaml -- bases/infrastructure.flintlock.x-k8s.io_microvmreplicasets.yaml -- bases/infrastructure.flintlock.x-k8s.io_microvmtemplates.yaml +- bases/infrastructure.liquid-metal.io_microvms.yaml +- bases/infrastructure.liquid-metal.io_microvmreplicasets.yaml +- bases/infrastructure.liquid-metal.io_microvmtemplates.yaml #+kubebuilder:scaffold:crdkustomizeresource patchesStrategicMerge: diff --git a/config/crd/patches/cainjection_in_microvmreplicasets.yaml b/config/crd/patches/cainjection_in_microvmreplicasets.yaml index 45317fb..8466596 100644 --- a/config/crd/patches/cainjection_in_microvmreplicasets.yaml +++ b/config/crd/patches/cainjection_in_microvmreplicasets.yaml @@ -4,4 +4,4 @@ kind: CustomResourceDefinition metadata: annotations: cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME) - name: microvmreplicasets.infrastructure.flintlock.x-k8s.io + name: microvmreplicasets.infrastructure.liquid-metal.io diff --git a/config/crd/patches/cainjection_in_microvms.yaml b/config/crd/patches/cainjection_in_microvms.yaml index 864db8e..58340c4 100644 --- a/config/crd/patches/cainjection_in_microvms.yaml +++ b/config/crd/patches/cainjection_in_microvms.yaml @@ -4,4 +4,4 @@ kind: CustomResourceDefinition metadata: annotations: cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME) - name: microvms.infrastructure.flintlock.x-k8s.io + name: microvms.infrastructure.liquid-metal.io diff --git a/config/crd/patches/cainjection_in_microvmtemplates.yaml b/config/crd/patches/cainjection_in_microvmtemplates.yaml index f9f4929..8616fa3 100644 --- a/config/crd/patches/cainjection_in_microvmtemplates.yaml +++ b/config/crd/patches/cainjection_in_microvmtemplates.yaml @@ -4,4 +4,4 @@ kind: CustomResourceDefinition metadata: annotations: cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME) - name: microvmtemplates.infrastructure.flintlock.x-k8s.io + name: microvmtemplates.infrastructure.liquid-metal.io diff --git a/config/crd/patches/webhook_in_microvmreplicasets.yaml b/config/crd/patches/webhook_in_microvmreplicasets.yaml index be4f748..69541b3 100644 --- a/config/crd/patches/webhook_in_microvmreplicasets.yaml +++ b/config/crd/patches/webhook_in_microvmreplicasets.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: microvmreplicasets.infrastructure.flintlock.x-k8s.io + name: microvmreplicasets.infrastructure.liquid-metal.io spec: conversion: strategy: Webhook diff --git a/config/crd/patches/webhook_in_microvms.yaml b/config/crd/patches/webhook_in_microvms.yaml index bb44983..81dfe93 100644 --- a/config/crd/patches/webhook_in_microvms.yaml +++ b/config/crd/patches/webhook_in_microvms.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: microvms.infrastructure.flintlock.x-k8s.io + name: microvms.infrastructure.liquid-metal.io spec: conversion: strategy: Webhook diff --git a/config/crd/patches/webhook_in_microvmtemplates.yaml b/config/crd/patches/webhook_in_microvmtemplates.yaml index f45c4c9..4fefe2f 100644 --- a/config/crd/patches/webhook_in_microvmtemplates.yaml +++ b/config/crd/patches/webhook_in_microvmtemplates.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: microvmtemplates.infrastructure.flintlock.x-k8s.io + name: microvmtemplates.infrastructure.liquid-metal.io spec: conversion: strategy: Webhook diff --git a/config/rbac/microvm_editor_role.yaml b/config/rbac/microvm_editor_role.yaml index 346ee0a..262ed93 100644 --- a/config/rbac/microvm_editor_role.yaml +++ b/config/rbac/microvm_editor_role.yaml @@ -12,7 +12,7 @@ metadata: name: microvm-editor-role rules: - apiGroups: - - infrastructure.flintlock.x-k8s.io + - infrastructure.liquid-metal.io resources: - microvms verbs: @@ -24,7 +24,7 @@ rules: - update - watch - apiGroups: - - infrastructure.flintlock.x-k8s.io + - infrastructure.liquid-metal.io resources: - microvms/status verbs: diff --git a/config/rbac/microvm_viewer_role.yaml b/config/rbac/microvm_viewer_role.yaml index 09dd67f..6d0df34 100644 --- a/config/rbac/microvm_viewer_role.yaml +++ b/config/rbac/microvm_viewer_role.yaml @@ -12,7 +12,7 @@ metadata: name: microvm-viewer-role rules: - apiGroups: - - infrastructure.flintlock.x-k8s.io + - infrastructure.liquid-metal.io resources: - microvms verbs: @@ -20,7 +20,7 @@ rules: - list - watch - apiGroups: - - infrastructure.flintlock.x-k8s.io + - infrastructure.liquid-metal.io resources: - microvms/status verbs: diff --git a/config/rbac/microvmreplicaset_editor_role.yaml b/config/rbac/microvmreplicaset_editor_role.yaml index 3dc938d..3307bb9 100644 --- a/config/rbac/microvmreplicaset_editor_role.yaml +++ b/config/rbac/microvmreplicaset_editor_role.yaml @@ -12,7 +12,7 @@ metadata: name: microvmreplicaset-editor-role rules: - apiGroups: - - infrastructure.flintlock.x-k8s.io + - infrastructure.liquid-metal.io resources: - microvmreplicasets verbs: @@ -24,7 +24,7 @@ rules: - update - watch - apiGroups: - - infrastructure.flintlock.x-k8s.io + - infrastructure.liquid-metal.io resources: - microvmreplicasets/status verbs: diff --git a/config/rbac/microvmreplicaset_viewer_role.yaml b/config/rbac/microvmreplicaset_viewer_role.yaml index 7523996..a7c7175 100644 --- a/config/rbac/microvmreplicaset_viewer_role.yaml +++ b/config/rbac/microvmreplicaset_viewer_role.yaml @@ -12,7 +12,7 @@ metadata: name: microvmreplicaset-viewer-role rules: - apiGroups: - - infrastructure.flintlock.x-k8s.io + - infrastructure.liquid-metal.io resources: - microvmreplicasets verbs: @@ -20,7 +20,7 @@ rules: - list - watch - apiGroups: - - infrastructure.flintlock.x-k8s.io + - infrastructure.liquid-metal.io resources: - microvmreplicasets/status verbs: diff --git a/config/rbac/microvmtemplate_editor_role.yaml b/config/rbac/microvmtemplate_editor_role.yaml index 9737591..2e9615c 100644 --- a/config/rbac/microvmtemplate_editor_role.yaml +++ b/config/rbac/microvmtemplate_editor_role.yaml @@ -12,7 +12,7 @@ metadata: name: microvmtemplate-editor-role rules: - apiGroups: - - infrastructure.flintlock.x-k8s.io + - infrastructure.liquid-metal.io resources: - microvmtemplates verbs: @@ -24,7 +24,7 @@ rules: - update - watch - apiGroups: - - infrastructure.flintlock.x-k8s.io + - infrastructure.liquid-metal.io resources: - microvmtemplates/status verbs: diff --git a/config/rbac/microvmtemplate_viewer_role.yaml b/config/rbac/microvmtemplate_viewer_role.yaml index 95f6ca4..f1f45c1 100644 --- a/config/rbac/microvmtemplate_viewer_role.yaml +++ b/config/rbac/microvmtemplate_viewer_role.yaml @@ -12,7 +12,7 @@ metadata: name: microvmtemplate-viewer-role rules: - apiGroups: - - infrastructure.flintlock.x-k8s.io + - infrastructure.liquid-metal.io resources: - microvmtemplates verbs: @@ -20,7 +20,7 @@ rules: - list - watch - apiGroups: - - infrastructure.flintlock.x-k8s.io + - infrastructure.liquid-metal.io resources: - microvmtemplates/status verbs: diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 40e02c1..f26d019 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -6,7 +6,7 @@ metadata: name: manager-role rules: - apiGroups: - - infrastructure.flintlock.x-k8s.io + - infrastructure.liquid-metal.io resources: - microvmreplicasets verbs: @@ -18,13 +18,13 @@ rules: - update - watch - apiGroups: - - infrastructure.flintlock.x-k8s.io + - infrastructure.liquid-metal.io resources: - microvmreplicasets/finalizers verbs: - update - apiGroups: - - infrastructure.flintlock.x-k8s.io + - infrastructure.liquid-metal.io resources: - microvmreplicasets/status verbs: @@ -32,7 +32,7 @@ rules: - patch - update - apiGroups: - - infrastructure.flintlock.x-k8s.io + - infrastructure.liquid-metal.io resources: - microvms verbs: @@ -44,13 +44,13 @@ rules: - update - watch - apiGroups: - - infrastructure.flintlock.x-k8s.io + - infrastructure.liquid-metal.io resources: - microvms/finalizers verbs: - update - apiGroups: - - infrastructure.flintlock.x-k8s.io + - infrastructure.liquid-metal.io resources: - microvms/status verbs: diff --git a/config/samples/infrastructure_v1alpha1_microvm.yaml b/config/samples/infrastructure_v1alpha1_microvm.yaml index b044814..f93738c 100644 --- a/config/samples/infrastructure_v1alpha1_microvm.yaml +++ b/config/samples/infrastructure_v1alpha1_microvm.yaml @@ -1,4 +1,4 @@ -apiVersion: infrastructure.flintlock.x-k8s.io/v1alpha1 +apiVersion: infrastructure.liquid-metal.io/v1alpha1 kind: Microvm metadata: labels: diff --git a/config/samples/infrastructure_v1alpha1_microvmreplicaset.yaml b/config/samples/infrastructure_v1alpha1_microvmreplicaset.yaml index 9c0be83..fe062db 100644 --- a/config/samples/infrastructure_v1alpha1_microvmreplicaset.yaml +++ b/config/samples/infrastructure_v1alpha1_microvmreplicaset.yaml @@ -1,4 +1,4 @@ -apiVersion: infrastructure.flintlock.x-k8s.io/v1alpha1 +apiVersion: infrastructure.liquid-metal.io/v1alpha1 kind: MicrovmReplicaSet metadata: labels: diff --git a/config/samples/infrastructure_v1alpha1_microvmtemplate.yaml b/config/samples/infrastructure_v1alpha1_microvmtemplate.yaml index 332b0fa..20cedc3 100644 --- a/config/samples/infrastructure_v1alpha1_microvmtemplate.yaml +++ b/config/samples/infrastructure_v1alpha1_microvmtemplate.yaml @@ -1,4 +1,4 @@ -apiVersion: infrastructure.flintlock.x-k8s.io/v1alpha1 +apiVersion: infrastructure.liquid-metal.io/v1alpha1 kind: MicrovmTemplate metadata: labels: diff --git a/controllers/microvm_controller.go b/controllers/microvm_controller.go index 01a5cfa..81f8e65 100644 --- a/controllers/microvm_controller.go +++ b/controllers/microvm_controller.go @@ -50,9 +50,9 @@ type MicrovmReconciler struct { MvmClientFunc flclient.FactoryFunc } -//+kubebuilder:rbac:groups=infrastructure.flintlock.x-k8s.io,resources=microvms,verbs=get;list;watch;create;update;patch;delete -//+kubebuilder:rbac:groups=infrastructure.flintlock.x-k8s.io,resources=microvms/status,verbs=get;update;patch -//+kubebuilder:rbac:groups=infrastructure.flintlock.x-k8s.io,resources=microvms/finalizers,verbs=update +//+kubebuilder:rbac:groups=infrastructure.liquid-metal.io,resources=microvms,verbs=get;list;watch;create;update;patch;delete +//+kubebuilder:rbac:groups=infrastructure.liquid-metal.io,resources=microvms/status,verbs=get;update;patch +//+kubebuilder:rbac:groups=infrastructure.liquid-metal.io,resources=microvms/finalizers,verbs=update func (r *MicrovmReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { log := log.FromContext(ctx) diff --git a/controllers/microvmreplicaset_controller.go b/controllers/microvmreplicaset_controller.go index 21214c2..b80c701 100644 --- a/controllers/microvmreplicaset_controller.go +++ b/controllers/microvmreplicaset_controller.go @@ -33,9 +33,9 @@ type MicrovmReplicaSetReconciler struct { Scheme *runtime.Scheme } -//+kubebuilder:rbac:groups=infrastructure.flintlock.x-k8s.io,resources=microvmreplicasets,verbs=get;list;watch;create;update;patch;delete -//+kubebuilder:rbac:groups=infrastructure.flintlock.x-k8s.io,resources=microvmreplicasets/status,verbs=get;update;patch -//+kubebuilder:rbac:groups=infrastructure.flintlock.x-k8s.io,resources=microvmreplicasets/finalizers,verbs=update +//+kubebuilder:rbac:groups=infrastructure.liquid-metal.io,resources=microvmreplicasets,verbs=get;list;watch;create;update;patch;delete +//+kubebuilder:rbac:groups=infrastructure.liquid-metal.io,resources=microvmreplicasets/status,verbs=get;update;patch +//+kubebuilder:rbac:groups=infrastructure.liquid-metal.io,resources=microvmreplicasets/finalizers,verbs=update // Reconcile is part of the main kubernetes reconciliation loop which aims to // move the current state of the cluster closer to the desired state.