diff --git a/charts/kubedb-opscenter/README.md b/charts/kubedb-opscenter/README.md index 8ace5cc0e..99b7d9a2a 100644 --- a/charts/kubedb-opscenter/README.md +++ b/charts/kubedb-opscenter/README.md @@ -66,6 +66,7 @@ The following table lists the configurable parameters of the `kubedb-opscenter` | ace-user-roles.enableClusterRoles.kubedb | | false | | ace-user-roles.enableClusterRoles.kubedb-ui | | false | | ace-user-roles.enableClusterRoles.kubestash | | false | +| ace-user-roles.enableClusterRoles.kubevault | | false | | ace-user-roles.enableClusterRoles.license-proxyserver | | false | | ace-user-roles.enableClusterRoles.metrics | | true | | ace-user-roles.enableClusterRoles.prometheus | | false | diff --git a/charts/kubedb-opscenter/values.yaml b/charts/kubedb-opscenter/values.yaml index 913adf20e..5773ecada 100644 --- a/charts/kubedb-opscenter/values.yaml +++ b/charts/kubedb-opscenter/values.yaml @@ -66,6 +66,7 @@ ace-user-roles: kubedb: false kubedb-ui: false kubestash: false + kubevault: false license-proxyserver: false metrics: true prometheus: false diff --git a/charts/kubedb/README.md b/charts/kubedb/README.md index bd174535c..e50781ef5 100644 --- a/charts/kubedb/README.md +++ b/charts/kubedb/README.md @@ -102,6 +102,7 @@ The following table lists the configurable parameters of the `kubedb` chart and | ace-user-roles.enableClusterRoles.kubedb | | true | | ace-user-roles.enableClusterRoles.kubedb-ui | | false | | ace-user-roles.enableClusterRoles.kubestash | | false | +| ace-user-roles.enableClusterRoles.kubevault | | false | | ace-user-roles.enableClusterRoles.license-proxyserver | | true | | ace-user-roles.enableClusterRoles.metrics | | true | | ace-user-roles.enableClusterRoles.prometheus | | false | diff --git a/charts/kubedb/values.openapiv3_schema.yaml b/charts/kubedb/values.openapiv3_schema.yaml index 9ed97c0f8..a20546dc0 100644 --- a/charts/kubedb/values.openapiv3_schema.yaml +++ b/charts/kubedb/values.openapiv3_schema.yaml @@ -17,6 +17,8 @@ properties: type: boolean kubestash: type: boolean + kubevault: + type: boolean license-proxyserver: type: boolean metrics: @@ -33,6 +35,7 @@ properties: - kubedb - kubedb-ui - kubestash + - kubevault - license-proxyserver - metrics - prometheus diff --git a/charts/kubedb/values.yaml b/charts/kubedb/values.yaml index 270769cf2..b2d945513 100644 --- a/charts/kubedb/values.yaml +++ b/charts/kubedb/values.yaml @@ -136,6 +136,7 @@ ace-user-roles: kubedb: true kubedb-ui: false kubestash: false + kubevault: false license-proxyserver: true metrics: true prometheus: false diff --git a/go.mod b/go.mod index 71ba0580b..da9a76da7 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( kmodules.xyz/resource-metadata v0.24.2 kmodules.xyz/schema-checker v0.4.1 kubedb.dev/apimachinery v0.51.1-0.20250128115333-e5366d526068 - kubeops.dev/installer v0.0.0-20250131085809-dbf8b46bec27 + kubeops.dev/installer v0.0.0-20250131122006-8354eb35b627 sigs.k8s.io/yaml v1.4.0 stash.appscode.dev/installer v0.12.2-0.20250108183814-50ebd27eef9c ) diff --git a/go.sum b/go.sum index 0871f7328..09635ca4e 100644 --- a/go.sum +++ b/go.sum @@ -331,8 +331,8 @@ kmodules.xyz/schema-checker v0.4.1 h1:V5UEjR6UMAXf307lTgw+9rDRfHLTNA8g/q9DngqYI9 kmodules.xyz/schema-checker v0.4.1/go.mod h1:BRXLB3Osuc9raHRJxHOgZFGecZ2aZumLXCHAOa5NPdA= kubedb.dev/apimachinery v0.51.1-0.20250128115333-e5366d526068 h1:UcPj/qrwoUSXGXxM2AFA06Y1p3BGRwtruF9TvxP6aVI= kubedb.dev/apimachinery v0.51.1-0.20250128115333-e5366d526068/go.mod h1:pbuXlEZM70Uw1SnSGH7bbzcAiwEYq4NX0CRG8ugODNY= -kubeops.dev/installer v0.0.0-20250131085809-dbf8b46bec27 h1:ePMxSxbTliCyCm1keXwXQcjiNDYdi7GxyOoJ571cPxY= -kubeops.dev/installer v0.0.0-20250131085809-dbf8b46bec27/go.mod h1:7Jc6/7UyPCDUE0CC5B93K2lr1bHJZ51rxKgPp76BrNE= +kubeops.dev/installer v0.0.0-20250131122006-8354eb35b627 h1:Lox/QR6RSJ1CogZ/NMsL3xHaBX2pvuctZuL2kOqm+Ew= +kubeops.dev/installer v0.0.0-20250131122006-8354eb35b627/go.mod h1:7Jc6/7UyPCDUE0CC5B93K2lr1bHJZ51rxKgPp76BrNE= kubeops.dev/petset v0.0.7 h1:F77BTRfUqRVO7kNc8q2oFSSviDmYBqni/osXqu0kgJ4= kubeops.dev/petset v0.0.7/go.mod h1:lt0SZV4ohRy7RiwLNUnMoauG4lCbcRbSqhMg20rdUQg= kubeops.dev/scanner v0.0.19 h1:J8C94k4j3NY3Y8UGHcG4nCZtmpSqPneCmkuvGNUOv4s= diff --git a/vendor/kubeops.dev/installer/apis/installer/v1alpha1/ace_user_roles_types.go b/vendor/kubeops.dev/installer/apis/installer/v1alpha1/ace_user_roles_types.go index 067008008..bcd02b5aa 100644 --- a/vendor/kubeops.dev/installer/apis/installer/v1alpha1/ace_user_roles_types.go +++ b/vendor/kubeops.dev/installer/apis/installer/v1alpha1/ace_user_roles_types.go @@ -58,6 +58,7 @@ type UserClusterRoles struct { Kubedb bool `json:"kubedb"` KubedbUI bool `json:"kubedb-ui"` Kubestash bool `json:"kubestash"` + Kubevault bool `json:"kubevault"` LicenseProxyserver bool `json:"license-proxyserver"` Metrics bool `json:"metrics"` Prometheus bool `json:"prometheus"` diff --git a/vendor/kubeops.dev/installer/apis/installer/v1alpha1/kube_ui_server_types.go b/vendor/kubeops.dev/installer/apis/installer/v1alpha1/kube_ui_server_types.go index dcd137619..d6a4b05bb 100644 --- a/vendor/kubeops.dev/installer/apis/installer/v1alpha1/kube_ui_server_types.go +++ b/vendor/kubeops.dev/installer/apis/installer/v1alpha1/kube_ui_server_types.go @@ -85,7 +85,8 @@ type KubeUiServerSpec struct { } type AceUserRolesValues struct { - Enabled bool `json:"enabled"` + Enabled bool `json:"enabled"` + EnableClusterRoles *UserClusterRoles `json:"enableClusterRoles,omitempty"` } type HelmRepositories struct { diff --git a/vendor/kubeops.dev/installer/apis/installer/v1alpha1/panopticon_types.go b/vendor/kubeops.dev/installer/apis/installer/v1alpha1/panopticon_types.go index a0972e9d0..8a90e58c7 100644 --- a/vendor/kubeops.dev/installer/apis/installer/v1alpha1/panopticon_types.go +++ b/vendor/kubeops.dev/installer/apis/installer/v1alpha1/panopticon_types.go @@ -86,6 +86,9 @@ type PanopticonSpec struct { // +optional NetworkPolicy NetworkPolicy `json:"networkPolicy"` + + //+optional + AceUserRoles AceUserRolesValues `json:"ace-user-roles"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object diff --git a/vendor/kubeops.dev/installer/apis/installer/v1alpha1/zz_generated.deepcopy.go b/vendor/kubeops.dev/installer/apis/installer/v1alpha1/zz_generated.deepcopy.go index be701ee3f..0fb922aaa 100644 --- a/vendor/kubeops.dev/installer/apis/installer/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/kubeops.dev/installer/apis/installer/v1alpha1/zz_generated.deepcopy.go @@ -134,6 +134,11 @@ func (in *AceUserRolesSpec) DeepCopy() *AceUserRolesSpec { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *AceUserRolesValues) DeepCopyInto(out *AceUserRolesValues) { *out = *in + if in.EnableClusterRoles != nil { + in, out := &in.EnableClusterRoles, &out.EnableClusterRoles + *out = new(UserClusterRoles) + **out = **in + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AceUserRolesValues. @@ -1145,7 +1150,7 @@ func (in *KubeUiServerSpec) DeepCopyInto(out *KubeUiServerSpec) { out.Prometheus = in.Prometheus out.HelmRepositories = in.HelmRepositories out.Platform = in.Platform - out.AceUserRoles = in.AceUserRoles + in.AceUserRoles.DeepCopyInto(&out.AceUserRoles) } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KubeUiServerSpec. @@ -1572,6 +1577,7 @@ func (in *PanopticonSpec) DeepCopyInto(out *PanopticonSpec) { out.Apiserver = in.Apiserver in.Monitoring.DeepCopyInto(&out.Monitoring) out.NetworkPolicy = in.NetworkPolicy + in.AceUserRoles.DeepCopyInto(&out.AceUserRoles) } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PanopticonSpec. diff --git a/vendor/modules.txt b/vendor/modules.txt index f25fc8449..e7d8b376d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -749,7 +749,7 @@ kubedb.dev/apimachinery/apis/kubedb kubedb.dev/apimachinery/apis/kubedb/v1 kubedb.dev/apimachinery/apis/kubedb/v1alpha2 kubedb.dev/apimachinery/crds -# kubeops.dev/installer v0.0.0-20250131085809-dbf8b46bec27 +# kubeops.dev/installer v0.0.0-20250131122006-8354eb35b627 ## explicit; go 1.22.7 kubeops.dev/installer/apis/installer kubeops.dev/installer/apis/installer/v1alpha1