fix(operator): refactored metric adapter for helm generation (#725)

operator/cmd/metrics/adapter/adapter.go

@@ -26,6 +26,7 @@ var (
 
 type MetricsAdapter struct {
 	basecmd.AdapterBase
+	KltNamespace string
 }
 
 // RunAdapter starts the Keptn Metrics adapter to provide KeptnMetrics via the Kubernetes Custom Metrics API.
@@ -69,7 +70,7 @@ func (a *MetricsAdapter) makeProviderOrDie(ctx context.Context) provider.CustomM
 		klog.Fatalf("unable to construct dynamic client: %v", err)
 	}
 
-	return kmprovider.NewProvider(ctx, client)
+	return kmprovider.NewProvider(ctx, client, a.KltNamespace)
 }
 
 func addFlags() {

operator/cmd/metrics/adapter/provider/provider.go

@@ -25,18 +25,17 @@ import (
 	"sigs.k8s.io/custom-metrics-apiserver/pkg/provider"
 )
 
-const kltNamespace = "keptn-lifecycle-toolkit-system"
-
 var keptnMetricGroupVersionResource = schema.GroupVersionResource{Group: "metrics.keptn.sh", Version: "v1alpha1", Resource: "keptnmetrics"}
 
 var providerInstance *keptnMetricsProvider
 
 var providerOnce sync.Once
 
 type keptnMetricsProvider struct {
-	client dynamic.Interface
-	scheme *runtime.Scheme
-	logger logr.Logger
+	client       dynamic.Interface
+	scheme       *runtime.Scheme
+	logger       logr.Logger
+	KltNamespace string
 
 	// cache is being populated via the updates received by the provider's dynamic informer
 	// this way, we avoid sending a request to the Kubernetes API each time a custom metric value should be retrieved
@@ -45,7 +44,7 @@ type keptnMetricsProvider struct {
 
 // NewProvider creates and starts a new keptnMetricsProvider. The provider will run until the given context is cancelled.
 // the client passed to this function will be used to set up a dynamic informer that listens for KeptnMetric CRDs and provides metric values that reflect their states.
-func NewProvider(ctx context.Context, client dynamic.Interface) provider.CustomMetricsProvider {
+func NewProvider(ctx context.Context, client dynamic.Interface, namespace string) provider.CustomMetricsProvider {
 	providerOnce.Do(func() {
 		scheme := runtime.NewScheme()
 
@@ -55,7 +54,8 @@ func NewProvider(ctx context.Context, client dynamic.Interface) provider.CustomM
 			cache: CustomMetricsCache{
 				metrics: map[string]CustomMetricValue{},
 			},
-			logger: ctrl.Log.WithName("provider"),
+			logger:       ctrl.Log.WithName("provider"),
+			KltNamespace: namespace,
 		}
 
 		if err := providerInstance.watchMetrics(ctx); err != nil {
@@ -110,7 +110,7 @@ func (p *keptnMetricsProvider) GetMetricBySelector(ctx context.Context, _ string
 }
 
 func (p *keptnMetricsProvider) watchMetrics(ctx context.Context) error {
-	factory := dynamicinformer.NewFilteredDynamicSharedInformerFactory(p.client, 0, kltNamespace, nil)
+	factory := dynamicinformer.NewFilteredDynamicSharedInformerFactory(p.client, 0, p.KltNamespace, nil)
 
 	informer := factory.ForResource(keptnMetricGroupVersionResource).Informer()
 

operator/cmd/metrics/adapter/provider/provider_test.go

@@ -15,6 +15,8 @@ import (
 	provider2 "sigs.k8s.io/custom-metrics-apiserver/pkg/provider"
 )
 
+const kltNamespace = "my-namespace"
+
 func TestProvider(t *testing.T) {
 	metricObj1 := getSampleKeptnMetric("my-metric", map[string]interface{}{})
 
@@ -24,7 +26,7 @@ func TestProvider(t *testing.T) {
 	scheme := runtime.NewScheme()
 	fakeClient := fake.NewSimpleDynamicClient(scheme, km)
 
-	provider := NewProvider(context.TODO(), fakeClient)
+	provider := NewProvider(context.TODO(), fakeClient, kltNamespace)
 
 	require.NotNil(t, provider)
 

operator/config/rbac/extra_roles.yaml

@@ -0,0 +1,10 @@
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: keptn-metrics-server-resources
+rules:
+  - apiGroups:
+      - custom.metrics.k8s.io
+    resources: ["*"]
+    verbs: ["*"]

operator/config/rbac/kustomization.yaml

@@ -8,6 +8,7 @@ resources:
 - role.yaml
 - role_binding.yaml
 - extra_role_binding.yaml
+- extra_roles.yaml
 - leader_election_role.yaml
 - leader_election_role_binding.yaml
 # Comment the following 4 lines if you want to disable

operator/config/rbac/role.yaml

@@ -373,13 +373,3 @@ rules:
   - secrets
   verbs:
   - get
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: keptn-metrics-server-resources
-rules:
-  - apiGroups:
-      - custom.metrics.k8s.io
-    resources: ["*"]
-    verbs: ["*"]

operator/main.go

@@ -203,7 +203,7 @@ func main() {
 	go serveMetrics()
 
 	// Start the custom metrics adapter
-	go startCustomMetricsAdapter()
+	go startCustomMetricsAdapter(env.PodNamespace)
 
 	// As recommended by the kubebuilder docs, webhook registration should be disabled if running locally. See https://book.kubebuilder.io/cronjob-tutorial/running.html#running-webhooks-locally for reference
 	flag.BoolVar(&disableWebhook, "disable-webhook", false, "Disable the registration of webhooks.")
@@ -579,10 +579,10 @@ func serveMetrics() {
 	}
 }
 
-func startCustomMetricsAdapter() {
+func startCustomMetricsAdapter(namespace string) {
 	ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGTERM)
 	defer cancel()
 
-	adapter := adapter.MetricsAdapter{}
+	adapter := adapter.MetricsAdapter{KltNamespace: namespace}
 	adapter.RunAdapter(ctx)
 }