Merge pull request #2569 from leelavg/remove-rotate

remove rotation of keys endpoint from ux-backend
red-hat-storage · Apr 22, 2024 · 81bee97 · 81bee97
2 parents faced96 + a209a03
commit 81bee97
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 135 deletions.
diff --git a/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml b/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml
@@ -679,10 +679,6 @@ spec:
                 - name: ONBOARDING_TOKEN_LIFETIME
                 - name: UX_BACKEND_PORT
                 - name: TLS_ENABLED
-                - name: POD_NAMESPACE
-                  valueFrom:
-                    fieldRef:
-                      fieldPath: metadata.namespace
                 image: quay.io/ocs-dev/ocs-operator:latest
                 imagePullPolicy: IfNotPresent
                 name: ux-backend-server

diff --git a/deploy/ocs-operator/manifests/ux_backend_role.yaml b/deploy/ocs-operator/manifests/ux_backend_role.yaml
@@ -14,11 +14,3 @@ rules:
   verbs:
     - get
     - list
-- apiGroups:
-  - ""
-  resources:
-  - secrets
-  resourceNames:
-  - onboarding-ticket-key
-  verbs:
-  - delete
diff --git a/rbac/ux_backend_role.yaml b/rbac/ux_backend_role.yaml
@@ -14,11 +14,3 @@ rules:
   verbs:
     - get
     - list
-- apiGroups:
-  - ""
-  resources:
-  - secrets
-  resourceNames:
-  - onboarding-ticket-key
-  verbs:
-  - delete
diff --git a/services/ux-backend/handlers/common.go b/services/ux-backend/handlers/common.go
@@ -1,23 +1,5 @@
 package handlers
 
-import (
-	"os"
-)
-
 const (
 	ContentTypeTextPlain = "text/plain"
 )
-
-var namespace string
-
-// returns namespace found in env value, will panic if value is empty
-func GetPodNamespace() string {
-	if namespace != "" {
-		return namespace
-	}
-	if ns := os.Getenv("POD_NAMESPACE"); ns != "" {
-		namespace = ns
-		return namespace
-	}
-	panic("Value for env var 'POD_NAMESPACE' is empty")
-}
diff --git a/services/ux-backend/handlers/rotatekeys/handler.go b/services/ux-backend/handlers/rotatekeys/handler.go
diff --git a/services/ux-backend/main.go b/services/ux-backend/main.go
@@ -10,9 +10,6 @@ import (
 	"k8s.io/klog/v2"
 
 	"github.com/red-hat-storage/ocs-operator/v4/services/ux-backend/handlers/onboardingtokens"
-	"github.com/red-hat-storage/ocs-operator/v4/services/ux-backend/handlers/rotatekeys"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/client/config"
 )
 
 type serverConfig struct {
@@ -54,20 +51,6 @@ func loadAndValidateServerConfig() (*serverConfig, error) {
 	return &config, nil
 }
 
-func newKubeClient() (client.Client, error) {
-	cfg, err := config.GetConfig()
-	if err != nil {
-		return nil, err
-	}
-
-	newClient, err := client.New(cfg, client.Options{})
-	if err != nil {
-		return nil, err
-	}
-
-	return newClient, nil
-}
-
 func main() {
 
 	klog.Info("Starting ux backend server")
@@ -78,19 +61,9 @@ func main() {
 		klog.Info("shutting down!")
 		os.Exit(-1)
 	}
-
-	cl, err := newKubeClient()
-	if err != nil {
-		klog.Errorf("failed to create kubernetes api client: %v", err)
-		klog.Exit("shutting down!")
-	}
-
 	http.HandleFunc("/onboarding-tokens", func(w http.ResponseWriter, r *http.Request) {
 		onboardingtokens.HandleMessage(w, r, config.tokenLifetimeInHours)
 	})
-	http.HandleFunc("/rotate-keys", func(w http.ResponseWriter, r *http.Request) {
-		rotatekeys.HandleMessage(w, r, cl)
-	})
 
 	klog.Info("ux backend server listening on port ", config.listenPort)
 

diff --git a/tools/csv-merger/csv-merger.go b/tools/csv-merger/csv-merger.go
@@ -663,14 +663,6 @@ func getUXBackendServerDeployment() appsv1.DeploymentSpec {
 								Name:  "TLS_ENABLED",
 								Value: os.Getenv("TLS_ENABLED"),
 							},
-							{
-								Name: "POD_NAMESPACE",
-								ValueFrom: &corev1.EnvVarSource{
-									FieldRef: &corev1.ObjectFieldSelector{
-										FieldPath: "metadata.namespace",
-									},
-								},
-							},
 						},
 						SecurityContext: &corev1.SecurityContext{
 							RunAsNonRoot:           ptr.To(true),