chore: clean-up and improve repository setup

PROJECT

@@ -31,14 +31,6 @@ resources:
   kind: RemoteClusterAccess
   path: github.com/SAP/metrics-operator/api/v1alpha1
   version: v1alpha1
-- api:
-    crdVersion: v1
-    namespaced: true
-  controller: true
-  domain: metrics.cloud.sap
-  kind: CompoundMetric
-  path: github.com/SAP/metrics-operator/api/v1beta1
-  version: v1beta1
 - api:
     crdVersion: v1
     namespaced: true
@@ -47,14 +39,6 @@ resources:
   kind: FederatedMetric
   path: github.com/SAP/metrics-operator/api/v1beta1
   version: v1beta1
-- api:
-    crdVersion: v1
-    namespaced: true
-  controller: true
-  domain: metrics.cloud.sap
-  kind: ClusterAccess
-  path: github.com/SAP/metrics-operator/api/v1beta1
-  version: v1beta1
 - api:
     crdVersion: v1
     namespaced: true

README.md

@@ -154,9 +154,9 @@ The projections are then translated to dimensions in the metric.
 apiVersion: metrics.cloud.sap/v1alpha1
 kind: Metric
 metadata:
-  name: comp-pod
+  name: pod
 spec:
-  name: comp-metric-pods
+  name: metric-pods
   description: Pods
   target:
     kind: Pod

charts/metrics-operator/values.yaml

@@ -1,11 +1,11 @@
-# Default values for co-metrics-operator.
+# Default values for metrics-operator.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
 replicaCount: 1
 
 image:
-  repository: deploy-releases-hyperspace-docker.common.cdn.repositories.cloud.sap/cloud-orchestration/co-metrics-operator
+  repository: ghcr.io/sap/github.com/sap/metrics-operator/images/metrics-operator
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: v0.5.2-dev

charts/metrics-operator/values.yaml.tpl

@@ -1,11 +1,11 @@
-# Default values for co-metrics-operator.
+# Default values for metrics-operator.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
 replicaCount: 1
 
 image:
-  repository: deploy-releases-hyperspace-docker.common.cdn.repositories.cloud.sap/cloud-orchestration/co-metrics-operator
+  repository: ghcr.io/sap/github.com/sap/metrics-operator/images/metrics-operator
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: $OPERATOR_VERSION

cmd/main.go

@@ -168,19 +168,14 @@ func main() {
 		os.Exit(1)
 	}
 
-	// TODO: to deprecate v1beta1 resources
 	setupMetricController(mgr)
+
 	setupManagedMetricController(mgr)
 
-	setupReconcilersV1beta1(mgr)
+	setupFederatedMetricController(mgr)
+
+	setupFederatedManagedMetricController(mgr)
 
-	if err = (&controller.ClusterAccessReconciler{
-		Client: mgr.GetClient(),
-		Scheme: mgr.GetScheme(),
-	}).SetupWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "ClusterAccess")
-		os.Exit(1)
-	}
 	//+kubebuilder:scaffold:builder
 
 	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
@@ -199,17 +194,18 @@ func main() {
 	}
 }
 
-func setupReconcilersV1beta1(mgr ctrl.Manager) {
+func setupFederatedMetricController(mgr ctrl.Manager) {
 	if err := (controller.NewFederatedMetricReconciler(mgr)).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create reconciler", "controller", "federated metric")
 		os.Exit(1)
 	}
+}
 
+func setupFederatedManagedMetricController(mgr ctrl.Manager) {
 	if err := (controller.NewFederatedManagedMetricReconciler(mgr)).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create reconciler", "controller", "federated managed metric")
 		os.Exit(1)
 	}
-
 }
 
 func setupMetricController(mgr ctrl.Manager) {

config/default/kustomization.yaml

@@ -1,12 +1,12 @@
 # Adds namespace to all resources.
-namespace: co-metrics-operator-system
+namespace: metrics-operator-system
 
 # Value of this field is prepended to the
 # names of all resources, e.g. a deployment named
 # "wordpress" becomes "alices-wordpress".
 # Note that it should also match with the prefix (text before '-') of the namespace
 # field above.
-namePrefix: co-metrics-operator-
+namePrefix: metrics-operator-
 
 # Labels to add to all resources and selectors.
 #labels:

config/manager/kustomization.yaml

@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: co-metrics-operator
+  newName: metrics-operator
   newTag: dev

config/manager/manager.yaml

@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/name: namespace
     app.kubernetes.io/instance: system
     app.kubernetes.io/component: manager
-    app.kubernetes.io/created-by: co-metrics-operator
-    app.kubernetes.io/part-of: co-metrics-operator
+    app.kubernetes.io/created-by: metrics-operator
+    app.kubernetes.io/part-of: metrics-operator
     app.kubernetes.io/managed-by: kustomize
   name: system
 ---
@@ -21,8 +21,8 @@ metadata:
     app.kubernetes.io/name: deployment
     app.kubernetes.io/instance: controller-manager
     app.kubernetes.io/component: manager
-    app.kubernetes.io/created-by: co-metrics-operator
-    app.kubernetes.io/part-of: co-metrics-operator
+    app.kubernetes.io/created-by: metrics-operator
+    app.kubernetes.io/part-of: metrics-operator
     app.kubernetes.io/managed-by: kustomize
 spec:
   selector:

config/prometheus/monitor.yaml

@@ -8,8 +8,8 @@ metadata:
     app.kubernetes.io/name: servicemonitor
     app.kubernetes.io/instance: controller-manager-metrics-monitor
     app.kubernetes.io/component: metrics
-    app.kubernetes.io/created-by: co-metrics-operator
-    app.kubernetes.io/part-of: co-metrics-operator
+    app.kubernetes.io/created-by: metrics-operator
+    app.kubernetes.io/part-of: metrics-operator
     app.kubernetes.io/managed-by: kustomize
   name: controller-manager-metrics-monitor
   namespace: system

config/rbac/auth_proxy_client_clusterrole.yaml

@@ -5,8 +5,8 @@ metadata:
     app.kubernetes.io/name: clusterrole
     app.kubernetes.io/instance: metrics-reader
     app.kubernetes.io/component: kube-rbac-proxy
-    app.kubernetes.io/created-by: co-metrics-operator
-    app.kubernetes.io/part-of: co-metrics-operator
+    app.kubernetes.io/created-by: metrics-operator
+    app.kubernetes.io/part-of: metrics-operator
     app.kubernetes.io/managed-by: kustomize
   name: metrics-reader
 rules:

config/rbac/auth_proxy_role.yaml

@@ -5,8 +5,8 @@ metadata:
     app.kubernetes.io/name: clusterrole
     app.kubernetes.io/instance: proxy-role
     app.kubernetes.io/component: kube-rbac-proxy
-    app.kubernetes.io/created-by: co-metrics-operator
-    app.kubernetes.io/part-of: co-metrics-operator
+    app.kubernetes.io/created-by: metrics-operator
+    app.kubernetes.io/part-of: metrics-operator
     app.kubernetes.io/managed-by: kustomize
   name: proxy-role
 rules:

config/rbac/auth_proxy_role_binding.yaml

@@ -5,8 +5,8 @@ metadata:
     app.kubernetes.io/name: clusterrolebinding
     app.kubernetes.io/instance: proxy-rolebinding
     app.kubernetes.io/component: kube-rbac-proxy
-    app.kubernetes.io/created-by: co-metrics-operator
-    app.kubernetes.io/part-of: co-metrics-operator
+    app.kubernetes.io/created-by: metrics-operator
+    app.kubernetes.io/part-of: metrics-operator
     app.kubernetes.io/managed-by: kustomize
   name: proxy-rolebinding
 roleRef:

config/rbac/auth_proxy_service.yaml

@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/name: service
     app.kubernetes.io/instance: controller-manager-metrics-service
     app.kubernetes.io/component: kube-rbac-proxy
-    app.kubernetes.io/created-by: co-metrics-operator
-    app.kubernetes.io/part-of: co-metrics-operator
+    app.kubernetes.io/created-by: metrics-operator
+    app.kubernetes.io/part-of: metrics-operator
     app.kubernetes.io/managed-by: kustomize
   name: controller-manager-metrics-service
   namespace: system

config/rbac/clientconfig_editor_role.yaml

@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/name: clusterrole
     app.kubernetes.io/instance: clientconfig-editor-role
     app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: co-metrics-operator
-    app.kubernetes.io/part-of: co-metrics-operator
+    app.kubernetes.io/created-by: metrics-operator
+    app.kubernetes.io/part-of: metrics-operator
     app.kubernetes.io/managed-by: kustomize
   name: clientconfig-editor-role
 rules: