Skip to content

Commit 329f055

Browse files
authored
Move user roles to ace-user-roles chart (#269)
Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent f88df2d commit 329f055

38 files changed

+4219
-208
lines changed

apis/installer/v1alpha1/kubevault_types.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package v1alpha1
1919
import (
2020
core "k8s.io/api/core/v1"
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
22+
kubeopsinstaller "kubeops.dev/installer/apis/installer/v1alpha1"
2223
)
2324

2425
const (
@@ -51,6 +52,9 @@ type KubevaultSpec struct {
5152

5253
//+optional
5354
WebhookServer KubevaultWebhookServerValues `json:"kubevault-webhook-server"`
55+
56+
//+optional
57+
AceUserRoles AceUserRolesValues `json:"ace-user-roles"`
5458
}
5559

5660
type KubevaultCatalogValues struct {
@@ -68,6 +72,11 @@ type KubevaultWebhookServerValues struct {
6872
*KubevaultWebhookServerSpec `json:",inline"`
6973
}
7074

75+
type AceUserRolesValues struct {
76+
Enabled bool `json:"enabled"`
77+
EnableClusterRoles *kubeopsinstaller.UserClusterRoles `json:"enableClusterRoles,omitempty"`
78+
}
79+
7180
type GlobalValues struct {
7281
License string `json:"license"`
7382
LicenseSecretName string `json:"licenseSecretName"`

apis/installer/v1alpha1/zz_generated.deepcopy.go

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

charts/kubevault-metrics/templates/metrics-user-roles.yaml

Lines changed: 0 additions & 31 deletions
This file was deleted.

charts/kubevault-operator/templates/appcatalog-user-roles.yaml

Lines changed: 0 additions & 31 deletions
This file was deleted.

charts/kubevault-operator/templates/license-checker-cluster-role.yaml

Lines changed: 0 additions & 38 deletions
This file was deleted.

charts/kubevault-operator/templates/license-reader-cluster-role.yaml

Lines changed: 0 additions & 17 deletions
This file was deleted.

charts/kubevault-operator/templates/user-roles.yaml

Lines changed: 0 additions & 63 deletions
This file was deleted.

charts/kubevault-opscenter/Chart.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,7 @@ dependencies:
2020
repository: file://../kubevault-grafana-dashboards
2121
condition: kubevault-grafana-dashboards.enabled
2222
version: v2024.9.30
23+
- name: ace-user-roles
24+
repository: oci://ghcr.io/appscode-charts
25+
condition: ace-user-roles.enabled
26+
version: v2024.9.30

0 commit comments

Comments
 (0)