diff --git a/Makefile b/Makefile index a3fdbb5..f511241 100644 --- a/Makefile +++ b/Makefile @@ -28,8 +28,8 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL) # This variable is used to construct full image tags for bundle and catalog images. # # For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both -# getontime.no/ontime-operator-bundle:$VERSION and getontime.no/ontime-operator-catalog:$VERSION. -IMAGE_TAG_BASE ?= getontime.no/ontime-operator +# getontime/ontime-operator-bundle:$VERSION and getontime/ontime-operator-catalog:$VERSION. +IMAGE_TAG_BASE ?= getontime/ontime-operator # BUNDLE_IMG defines the image:tag used for the bundle. # You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=/:) diff --git a/config/crd/bases/ontime.getontime.no_stages.yaml b/config/crd/bases/cloud.getontime.no_stages.yaml similarity index 96% rename from config/crd/bases/ontime.getontime.no_stages.yaml rename to config/crd/bases/cloud.getontime.no_stages.yaml index d65eb7d..68e593d 100644 --- a/config/crd/bases/ontime.getontime.no_stages.yaml +++ b/config/crd/bases/cloud.getontime.no_stages.yaml @@ -2,9 +2,9 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: stages.ontime.getontime.no + name: stages.cloud.getontime.no spec: - group: ontime.getontime.no + group: cloud.getontime.no names: kind: Stage listKind: StageList diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index c87a2a9..ff3d985 100644 --- a/config/crd/kustomization.yaml +++ b/config/crd/kustomization.yaml @@ -2,5 +2,5 @@ # since it depends on service name and namespace that are out of this kustomize package. # It should be run by config/default resources: -- bases/ontime.getontime.no_stages.yaml +- bases/cloud.getontime.no_stages.yaml # +kubebuilder:scaffold:crdkustomizeresource diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 531d9ec..ad13e96 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: - name: controller - newName: git.jwetzell.com/jwetzell/ontime-operator - newTag: v0.1.1 + newName: controller + newTag: latest diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index aed7c41..be33518 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -29,10 +29,10 @@ rules: - create ## -## Rules for ontime.getontime.no/v1, Kind: Stage +## Rules for cloud.getontime.no/v1, Kind: Stage ## - apiGroups: - - ontime.getontime.no + - cloud.getontime.no resources: - stages - stages/status diff --git a/config/rbac/stage_admin_role.yaml b/config/rbac/stage_admin_role.yaml index 2415520..04b0bf9 100644 --- a/config/rbac/stage_admin_role.yaml +++ b/config/rbac/stage_admin_role.yaml @@ -1,7 +1,7 @@ # This rule is not used by the project ontime-operator itself. # It is provided to allow the cluster admin to help manage permissions for users. # -# Grants full permissions ('*') over ontime.getontime.no. +# Grants full permissions ('*') over cloud.getontime.no. # This role is intended for users authorized to modify roles and bindings within the cluster, # enabling them to delegate specific permissions to other users or groups as needed. @@ -14,13 +14,13 @@ metadata: name: stage-admin-role rules: - apiGroups: - - ontime.getontime.no + - cloud.getontime.no resources: - stages verbs: - '*' - apiGroups: - - ontime.getontime.no + - cloud.getontime.no resources: - stages/status verbs: diff --git a/config/rbac/stage_editor_role.yaml b/config/rbac/stage_editor_role.yaml index c3c98a2..7cee64c 100644 --- a/config/rbac/stage_editor_role.yaml +++ b/config/rbac/stage_editor_role.yaml @@ -1,7 +1,7 @@ # This rule is not used by the project ontime-operator itself. # It is provided to allow the cluster admin to help manage permissions for users. # -# Grants permissions to create, update, and delete resources within the ontime.getontime.no. +# Grants permissions to create, update, and delete resources within the cloud.getontime.no. # This role is intended for users who need to manage these resources # but should not control RBAC or manage permissions for others. @@ -14,7 +14,7 @@ metadata: name: stage-editor-role rules: - apiGroups: - - ontime.getontime.no + - cloud.getontime.no resources: - stages verbs: @@ -26,7 +26,7 @@ rules: - update - watch - apiGroups: - - ontime.getontime.no + - cloud.getontime.no resources: - stages/status verbs: diff --git a/config/rbac/stage_viewer_role.yaml b/config/rbac/stage_viewer_role.yaml index 5913163..c61419a 100644 --- a/config/rbac/stage_viewer_role.yaml +++ b/config/rbac/stage_viewer_role.yaml @@ -1,7 +1,7 @@ # This rule is not used by the project ontime-operator itself. # It is provided to allow the cluster admin to help manage permissions for users. # -# Grants read-only access to ontime.getontime.no resources. +# Grants read-only access to cloud.getontime.no resources. # This role is intended for users who need visibility into these resources # without permissions to modify them. It is ideal for monitoring purposes and limited-access viewing. @@ -14,7 +14,7 @@ metadata: name: stage-viewer-role rules: - apiGroups: - - ontime.getontime.no + - cloud.getontime.no resources: - stages verbs: @@ -22,7 +22,7 @@ rules: - list - watch - apiGroups: - - ontime.getontime.no + - cloud.getontime.no resources: - stages/status verbs: diff --git a/config/samples/ontime_v1_stage.yaml b/config/samples/ontime_v1_stage.yaml index 78af8ec..6a1da3c 100644 --- a/config/samples/ontime_v1_stage.yaml +++ b/config/samples/ontime_v1_stage.yaml @@ -1,10 +1,10 @@ -apiVersion: ontime.getontime.no/v1 +apiVersion: cloud.getontime.no/v1 kind: Stage metadata: name: stage-sample spec: ontime: - prefix: "" + prefix: "test" version: 4.0.2 diff --git a/watches.yaml b/watches.yaml index f62f277..f380bdd 100644 --- a/watches.yaml +++ b/watches.yaml @@ -1,5 +1,5 @@ # Use the 'create api' subcommand to add watches to this file. -- group: ontime.getontime.no +- group: cloud.getontime.no version: v1 kind: Stage chart: helm-charts/stage