Add option to disable cluster roles

Signed-off-by: Tamal Saha <[email protected]>
kubedb · Jan 30, 2025 · 5ace3e7 · 5ace3e7
1 parent 6730cc3
commit 5ace3e7
Show file tree

Hide file tree

Showing 62 changed files with 401 additions and 542 deletions.
diff --git a/.gitignore b/.gitignore
@@ -36,6 +36,12 @@ _testmain.go
 /.idea
 /.crds
 /charts/kubedb/charts
+/charts/kubedb-autoscaler/charts
+/charts/kubedb-dashboard/charts
+/charts/kubedb-ops-manager/charts
 /charts/kubedb-opscenter/charts
+/charts/kubedb-provisioner/charts
+/charts/kubedb-schema-manager/charts
+/charts/kubedb-ui-server/charts
 
 .DS_Store
diff --git a/apis/installer/v1alpha1/kubedb_autoscaler_types.go b/apis/installer/v1alpha1/kubedb_autoscaler_types.go
@@ -87,6 +87,8 @@ type KubedbAutoscalerSpec struct {
 	Recommender Recommender `json:"recommender"`
 	// +optional
 	MaxConcurrentReconciles int `json:"maxConcurrentReconciles"`
+	// +optional
+	EnableClusterRoles ClusterRoleSpec `json:"enableClusterRoles"`
 }
 
 type StorageAutoscalerSpec struct {

diff --git a/apis/installer/v1alpha1/kubedb_dashboard_types.go b/apis/installer/v1alpha1/kubedb_dashboard_types.go
@@ -81,6 +81,8 @@ type KubedbDashboardSpec struct {
 	License string `json:"license"`
 	// +optional
 	LicenseSecretName string `json:"licenseSecretName"`
+	// +optional
+	EnableClusterRoles ClusterRoleSpec `json:"enableClusterRoles"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

diff --git a/apis/installer/v1alpha1/kubedb_ops_manager_types.go b/apis/installer/v1alpha1/kubedb_ops_manager_types.go
@@ -102,6 +102,8 @@ type KubedbOpsManagerSpec struct {
 	// +listType=map
 	// +listMapKey=name
 	Env []core.EnvVar `json:"env"`
+	// +optional
+	EnableClusterRoles ClusterRoleSpec `json:"enableClusterRoles"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

diff --git a/apis/installer/v1alpha1/kubedb_provisioner_types.go b/apis/installer/v1alpha1/kubedb_provisioner_types.go
@@ -104,6 +104,8 @@ type KubedbProvisionerSpec struct {
 	// +listType=map
 	// +listMapKey=name
 	Env []core.EnvVar `json:"env"`
+	// +optional
+	EnableClusterRoles ClusterRoleSpec `json:"enableClusterRoles"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

diff --git a/apis/installer/v1alpha1/kubedb_schema_manager_types.go b/apis/installer/v1alpha1/kubedb_schema_manager_types.go
@@ -83,6 +83,8 @@ type KubedbSchemaManagerSpec struct {
 	LicenseSecretName string `json:"licenseSecretName"`
 	// +optional
 	MaxConcurrentReconciles int `json:"maxConcurrentReconciles"`
+	// +optional
+	EnableClusterRoles ClusterRoleSpec `json:"enableClusterRoles"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

diff --git a/apis/installer/v1alpha1/kubedb_ui_server_types.go b/apis/installer/v1alpha1/kubedb_ui_server_types.go
@@ -77,6 +77,11 @@ type KubedbUiServerSpec struct {
 	ServiceAccount     ServiceAccountSpec       `json:"serviceAccount"`
 	Apiserver          EASSpec                  `json:"apiserver"`
 	Monitoring         EASMonitoring            `json:"monitoring"`
+	// +optional
+	EnableClusterRoles KubedbUiClusterRoleSpec `json:"enableClusterRoles"`
+}
+type KubedbUiClusterRoleSpec struct {
+	UserRoles bool `json:"userRoles"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

diff --git a/apis/installer/v1alpha1/types.go b/apis/installer/v1alpha1/types.go
@@ -103,3 +103,8 @@ type PSPSpec struct {
 type NetworkPolicy struct {
 	Enabled bool `json:"enabled"`
 }
+
+type ClusterRoleSpec struct {
+	LicenseProxyserver bool `json:"licenseProxyserver"`
+	UserRoles          bool `json:"userRoles"`
+}
diff --git a/apis/installer/v1alpha1/zz_generated.deepcopy.go b/apis/installer/v1alpha1/zz_generated.deepcopy.go
diff --git a/charts/kubedb-autoscaler/Chart.yaml b/charts/kubedb-autoscaler/Chart.yaml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: v2
 description: KubeDB Autoscaler by AppsCode - Autoscale KubeDB operated Databases
 name: kubedb-autoscaler
 version: v0.36.0
@@ -10,3 +10,8 @@ sources:
 maintainers:
 - name: appscode
   email: [email protected]
+dependencies:
+- name: license-proxyserver-user-roles
+  repository: oci://ghcr.io/appscode-charts
+  condition: enableClusterRoles.licenselicenseProxyserver
+  version: v2025.1.17
diff --git a/charts/kubedb-autoscaler/README.md b/charts/kubedb-autoscaler/README.md
@@ -89,6 +89,8 @@ The following table lists the configurable parameters of the `kubedb-autoscaler`
 | recommender.memoryHistogramDecayHalfLife   |                                                                                                                                                                                                                                                                                                                                                                              | <code>"5m0s"</code>                                                                                                                                                                            |
 | recommender.cpuHistogramDecayHalfLife      |                                                                                                                                                                                                                                                                                                                                                                              | <code>"5m0s"</code>                                                                                                                                                                            |
 | maxConcurrentReconciles                    | The maximum number of concurrent reconciles which can be run                                                                                                                                                                                                                                                                                                                 | <code>0</code>                                                                                                                                                                                 |
+| enableClusterRoles.licenseProxyserver      |                                                                                                                                                                                                                                                                                                                                                                              | <code>true</code>                                                                                                                                                                              |
+| enableClusterRoles.userRoles               |                                                                                                                                                                                                                                                                                                                                                                              | <code>true</code>                                                                                                                                                                              |
 
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm upgrade -i`. For example:

diff --git a/charts/kubedb-autoscaler/requirements.lock b/charts/kubedb-autoscaler/requirements.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: license-proxyserver-user-roles
+  repository: oci://ghcr.io/appscode-charts
+  version: v2025.1.17
+digest: sha256:d7528354ce2b160a823806f087f97f97870badcfa8973a7d7227ec8554addb24
+generated: "2025-01-30T18:57:13.745044+06:00"
diff --git a/charts/kubedb-autoscaler/templates/license-checker-cluster-role.yaml b/charts/kubedb-autoscaler/templates/license-checker-cluster-role.yaml
diff --git a/charts/kubedb-autoscaler/templates/license-reader-cluster-role.yaml b/charts/kubedb-autoscaler/templates/license-reader-cluster-role.yaml
diff --git a/charts/kubedb-autoscaler/templates/user-roles.yaml b/charts/kubedb-autoscaler/templates/user-roles.yaml
@@ -1,3 +1,5 @@
+{{- if .Values.enableClusterRoles.userRoles }}
+
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -45,3 +47,5 @@ rules:
   resources:
   - "*"
   verbs: ["get", "list", "watch"]
+
+{{- end }}
diff --git a/charts/kubedb-autoscaler/values.openapiv3_schema.yaml b/charts/kubedb-autoscaler/values.openapiv3_schema.yaml
@@ -941,6 +941,16 @@ properties:
     type: object
   criticalAddon:
     type: boolean
+  enableClusterRoles:
+    properties:
+      licenseProxyserver:
+        type: boolean
+      userRoles:
+        type: boolean
+    required:
+    - licenseProxyserver
+    - userRoles
+    type: object
   fullnameOverride:
     type: string
   imagePullPolicy:

diff --git a/charts/kubedb-autoscaler/values.yaml b/charts/kubedb-autoscaler/values.yaml
@@ -129,3 +129,7 @@ recommender:
 
 # The maximum number of concurrent reconciles which can be run
 maxConcurrentReconciles: 0
+
+enableClusterRoles:
+  licenseProxyserver: true
+  userRoles: true
diff --git a/charts/kubedb-catalog/Chart.yaml b/charts/kubedb-catalog/Chart.yaml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: v2
 description: KubeDB Catalog by AppsCode - Catalog for database versions
 name: kubedb-catalog
 version: v2025.1.9

diff --git a/charts/kubedb-crd-manager/Chart.yaml b/charts/kubedb-crd-manager/Chart.yaml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: v2
 description: KubeDB CRD Manager by AppsCode
 name: kubedb-crd-manager
 version: v0.6.0

diff --git a/charts/kubedb-dashboard/Chart.lock b/charts/kubedb-dashboard/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: license-proxyserver-user-roles
+  repository: oci://ghcr.io/appscode-charts
+  version: v2025.1.17
+digest: sha256:d7528354ce2b160a823806f087f97f97870badcfa8973a7d7227ec8554addb24
+generated: "2025-01-30T19:20:46.133997+06:00"
diff --git a/charts/kubedb-dashboard/Chart.yaml b/charts/kubedb-dashboard/Chart.yaml
@@ -11,3 +11,8 @@ sources:
 maintainers:
 - name: appscode
   email: [email protected]
+dependencies:
+- name: license-proxyserver-user-roles
+  repository: oci://ghcr.io/appscode-charts
+  condition: enableClusterRoles.licenselicenseProxyserver
+  version: v2025.1.17