Change dashboard api group to elasticsearch (#794)

Signed-off-by: Tamal Saha <tamal@appscode.com>
kubedb · Jan 17, 2024 · eafb83d · eafb83d
1 parent 625cc6e
commit eafb83d
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 28 deletions.
diff --git a/charts/kubedb-dashboard/templates/cluster-role.yaml b/charts/kubedb-dashboard/templates/cluster-role.yaml
@@ -11,17 +11,17 @@ rules:
   - customresourcedefinitions
   verbs: ["*"]
 - apiGroups:
-  - dashboard.kubedb.com
+  - elasticsearch.kubedb.com
   resources:
   - elasticsearchdashboards
   verbs: ["create", "delete", "get", "list" , "patch", "update", "watch"]
 - apiGroups:
-  - dashboard.kubedb.com
+  - elasticsearch.kubedb.com
   resources:
   - elasticsearchdashboards/status
   verbs: ["get"]
 - apiGroups:
-  - dashboard.kubedb.com
+  - elasticsearch.kubedb.com
   resources:
   - elasticsearchdashboards/finalizers
   verbs: ["update"]
@@ -49,14 +49,10 @@ rules:
   - ""
   resources:
   - services
-  verbs: [ "create", "delete", "get", "list" , "patch", "update", "watch"]
-- apiGroups:
-  - ""
-  resources:
   - secrets
   verbs: [ "create", "delete", "get", "list" , "patch", "update", "watch"]
 - apiGroups:
-  - dashboard.kubedb.com
+  - elasticsearch.kubedb.com
   resources:
   - elasticsearchdashboards/status
   verbs: ["get" , "patch" , "update"]

diff --git a/charts/kubedb-dashboard/templates/user-roles.yaml b/charts/kubedb-dashboard/templates/user-roles.yaml
@@ -9,7 +9,7 @@ metadata:
     "helm.sh/hook-delete-policy": before-hook-creation
 rules:
 - apiGroups:
-  - dashboard.kubedb.com
+  - elasticsearch.kubedb.com
   resources:
   - "*"
   verbs: ["*"]
@@ -25,7 +25,7 @@ metadata:
     "helm.sh/hook-delete-policy": before-hook-creation
 rules:
 - apiGroups:
-  - dashboard.kubedb.com
+  - elasticsearch.kubedb.com
   resources:
   - "*"
   verbs: ["create", "get", "list", "watch", "update", "patch"]
@@ -41,7 +41,7 @@ metadata:
     "helm.sh/hook-delete-policy": before-hook-creation
 rules:
 - apiGroups:
-  - dashboard.kubedb.com
+  - elasticsearch.kubedb.com
   resources:
   - "*"
   verbs: ["get", "list", "watch"]
diff --git a/charts/kubedb-provisioner/templates/cluster-role.yaml b/charts/kubedb-provisioner/templates/cluster-role.yaml
@@ -21,7 +21,7 @@ rules:
   resources:
   - services
   - secrets
-  verbs: ["create", "delete", "get", "patch", "list", "watch"]
+  verbs: ["create", "delete", "get", "patch", "update", "list", "watch"]
 - apiGroups:
   - ""
   resources:
@@ -82,12 +82,13 @@ rules:
   verbs: ["get", "list", "watch"]
 - apiGroups:
   - kubedb.com
-  - catalog.kubedb.com
-  - archiver.kubedb.com
   - apps.k8s.appscode.com
+  - archiver.kubedb.com
+  - catalog.kubedb.com
   - core.kubestash.com
-  - storage.kubestash.com
+  - elasticsearch.kubedb.com
   - kafka.kubedb.com
+  - storage.kubestash.com
   resources:
   - "*"
   verbs: ["*"]
@@ -107,6 +108,16 @@ rules:
   - redises/finalizers
   - redissentinels/finalizers
   verbs: ["update"]
+- apiGroups:
+  - elasticsearch.kubedb.com
+  resources:
+  - elasticsearchdashboards/status
+  verbs: ["get"]
+- apiGroups:
+  - elasticsearch.kubedb.com
+  resources:
+  - elasticsearchdashboards/finalizers
+  verbs: ["update"]
 - apiGroups:
   - apps
   resources:

diff --git a/charts/kubedb-webhook-server/templates/apiregistration.yaml b/charts/kubedb-webhook-server/templates/apiregistration.yaml
@@ -198,12 +198,12 @@ spec:
 apiVersion: apiregistration.k8s.io/v1
 kind: APIService
 metadata:
-  name: v1alpha1.validators.dashboard.kubedb.com
+  name: v1alpha1.validators.elasticsearch.kubedb.com
   labels:
     app.kubernetes.io/component: kubedb-dashboard
     {{- include "kubedb-webhook-server.labels" . | nindent 4 }}
 spec:
-  group: validators.dashboard.kubedb.com
+  group: validators.elasticsearch.kubedb.com
   version: v1alpha1
   service:
     namespace: {{ .Release.Namespace }}
@@ -215,12 +215,12 @@ spec:
 apiVersion: apiregistration.k8s.io/v1
 kind: APIService
 metadata:
-  name: v1alpha1.mutators.dashboard.kubedb.com
+  name: v1alpha1.mutators.elasticsearch.kubedb.com
   labels:
     app.kubernetes.io/component: kubedb-dashboard
     {{- include "kubedb-webhook-server.labels" . | nindent 4 }}
 spec:
-  group: mutators.dashboard.kubedb.com
+  group: mutators.elasticsearch.kubedb.com
   version: v1alpha1
   service:
     namespace: {{ .Release.Namespace }}

diff --git a/charts/kubedb-webhook-server/templates/cluster-role.yaml b/charts/kubedb-webhook-server/templates/cluster-role.yaml
@@ -44,7 +44,7 @@ rules:
   - ops.kubedb.com
   - postgres.kubedb.com
   - autoscaling.kubedb.com
-  - dashboard.kubedb.com
+  - elasticsearch.kubedb.com
   - schema.kubedb.com
   - archiver.kubedb.com
   - kafka.kubedb.com

diff --git a/charts/kubedb-webhook-server/templates/dashboard/mutating-webhook.yaml b/charts/kubedb-webhook-server/templates/dashboard/mutating-webhook.yaml
@@ -11,21 +11,21 @@
 apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
-  name: mutators.dashboard.kubedb.com
+  name: mutators.elasticsearch.kubedb.com
   labels:
     app.kubernetes.io/component: kubedb-dashboard
     {{- include "kubedb-webhook-server.labels" . | nindent 4 }}
 webhooks:
 {{- if $featureGates.Elasticsearch }}
-- name: elasticsearchdashboardwebhook.mutators.dashboard.kubedb.com
+- name: elasticsearchdashboardwebhook.mutators.elasticsearch.kubedb.com
   clientConfig:
     service:
       namespace: default
       name: kubernetes
-      path: /apis/mutators.dashboard.kubedb.com/v1alpha1/elasticsearchdashboardwebhooks
+      path: /apis/mutators.elasticsearch.kubedb.com/v1alpha1/elasticsearchdashboardwebhooks
     caBundle: {{ $caCrt }}
   rules:
-  - apiGroups: ["dashboard.kubedb.com"]
+  - apiGroups: ["elasticsearch.kubedb.com"]
     apiVersions: ["*"]
     resources: ["elasticsearchdashboards"]
     operations: ["CREATE", "UPDATE"]

diff --git a/charts/kubedb-webhook-server/templates/dashboard/validating-webhook.yaml b/charts/kubedb-webhook-server/templates/dashboard/validating-webhook.yaml
@@ -11,21 +11,21 @@
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
-  name: validators.dashboard.kubedb.com
+  name: validators.elasticsearch.kubedb.com
   labels:
     app.kubernetes.io/component: kubedb-dashboard
     {{- include "kubedb-webhook-server.labels" . | nindent 4 }}
 webhooks:
 {{- if $featureGates.Elasticsearch }}
-- name: elasticsearchdashboardwebhook.validators.dashboard.kubedb.com
+- name: elasticsearchdashboardwebhook.validators.elasticsearch.kubedb.com
   clientConfig:
     service:
       namespace: default
       name: kubernetes
-      path: /apis/validators.dashboard.kubedb.com/v1alpha1/elasticsearchdashboardwebhooks
+      path: /apis/validators.elasticsearch.kubedb.com/v1alpha1/elasticsearchdashboardwebhooks
     caBundle: {{ $caCrt }}
   rules:
-  - apiGroups: ["dashboard.kubedb.com"]
+  - apiGroups: ["elasticsearch.kubedb.com"]
     apiVersions: ["*"]
     resources: ["elasticsearchdashboards"]
     operations: ["CREATE", "UPDATE", "DELETE"]