diff --git a/charts/ace-installer/values.openapiv3_schema.yaml b/charts/ace-installer/values.openapiv3_schema.yaml index 6f63aaf35..96d600d34 100644 --- a/charts/ace-installer/values.openapiv3_schema.yaml +++ b/charts/ace-installer/values.openapiv3_schema.yaml @@ -1540,12 +1540,25 @@ properties: type: object selfManagement: properties: + argoCD: + properties: + deployPrincipal: + type: boolean + enabled: + type: boolean + existingKubeconfig: + type: string + principalServiceType: + type: string + type: object createCAPICluster: type: boolean disableFeatures: items: type: string type: array + enableCredLess: + type: boolean enableFeatures: items: type: string diff --git a/charts/ace/values.openapiv3_schema.yaml b/charts/ace/values.openapiv3_schema.yaml index 53fde534a..f948fe3cc 100644 --- a/charts/ace/values.openapiv3_schema.yaml +++ b/charts/ace/values.openapiv3_schema.yaml @@ -25193,12 +25193,25 @@ properties: type: object selfManagement: properties: + argoCD: + properties: + deployPrincipal: + type: boolean + enabled: + type: boolean + existingKubeconfig: + type: string + principalServiceType: + type: string + type: object createCAPICluster: type: boolean disableFeatures: items: type: string type: array + enableCredLess: + type: boolean enableFeatures: items: type: string @@ -25241,6 +25254,8 @@ properties: - serviceControlProxyToken type: object type: object + syncPersesAccounts: + type: boolean type: object hook: properties: diff --git a/go.mod b/go.mod index 4aa832bc1..c00e7f1b8 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.25.6 require ( go.bytebuilders.dev/catalog v0.1.0 - go.bytebuilders.dev/resource-model v0.4.0 + go.bytebuilders.dev/resource-model v0.4.1-0.20260907073146-deeffaf3c66e go.bytebuilders.dev/ui-wizards v0.37.0 go.openviz.dev/installer v0.0.0-20260619044110-702becd1dd97 gomodules.xyz/go-sh v0.2.0 diff --git a/go.sum b/go.sum index 28de53ea8..1055a90eb 100644 --- a/go.sum +++ b/go.sum @@ -213,8 +213,8 @@ go.appscode.dev/alerts v0.2.1-0.20260811095631-791e5af59674 h1:zD3qTcb3tjUgP1cvv go.appscode.dev/alerts v0.2.1-0.20260811095631-791e5af59674/go.mod h1:oG1OnN2JTilTTqGAHv4CCoqnvT3u0J8c7YgNny0Rj7g= go.bytebuilders.dev/catalog v0.1.0 h1:nJ4NaHm/B00cSBGfJwNimA1i1KvHWXTU2ap0lpr4uOY= go.bytebuilders.dev/catalog v0.1.0/go.mod h1:zXAS4yNzCueduM3glK0JDuPuJd2MDvCx2PtauRtzT7I= -go.bytebuilders.dev/resource-model v0.4.0 h1:wDXg4SGYn3zNRuOj17gGo0qeSE//ytdzGPSxkHa8JvA= -go.bytebuilders.dev/resource-model v0.4.0/go.mod h1:wGndjj3y+Yjh7+e8Wjc6joqzZCC16WZfKNx9adAFVkw= +go.bytebuilders.dev/resource-model v0.4.1-0.20260907073146-deeffaf3c66e h1:3kiFUChE/E+/yPuWwQ/C6U+Qja9r/9Sr5LVMrh0TRQY= +go.bytebuilders.dev/resource-model v0.4.1-0.20260907073146-deeffaf3c66e/go.mod h1:wGndjj3y+Yjh7+e8Wjc6joqzZCC16WZfKNx9adAFVkw= go.bytebuilders.dev/ui-wizards v0.37.0 h1:TVlHcVSVFd9s55wGnc2GrI6ht+seKA85NWyctkQvQDY= go.bytebuilders.dev/ui-wizards v0.37.0/go.mod h1:Gvl3KLmo5MQ2KNWM4p652q3Jj1NzYhIenAW4iX854Os= go.openviz.dev/installer v0.0.0-20260619044110-702becd1dd97 h1:8fc2qZRqIL8swjMKUnmiWK/ijjEUQ9Zmhe3qRIkUrj8= diff --git a/schema/ace-options/values.openapiv3_schema.yaml b/schema/ace-options/values.openapiv3_schema.yaml index 8d8d51534..c201400c3 100644 --- a/schema/ace-options/values.openapiv3_schema.yaml +++ b/schema/ace-options/values.openapiv3_schema.yaml @@ -1282,12 +1282,25 @@ properties: type: object selfManagement: properties: + argoCD: + properties: + deployPrincipal: + type: boolean + enabled: + type: boolean + existingKubeconfig: + type: string + principalServiceType: + type: string + type: object createCAPICluster: type: boolean disableFeatures: items: type: string type: array + enableCredLess: + type: boolean enableFeatures: additionalProperties: properties: diff --git a/vendor/go.bytebuilders.dev/resource-model/apis/cloud/v1alpha1/register.go b/vendor/go.bytebuilders.dev/resource-model/apis/cloud/v1alpha1/register.go index e906f4bb1..6a32b74e5 100644 --- a/vendor/go.bytebuilders.dev/resource-model/apis/cloud/v1alpha1/register.go +++ b/vendor/go.bytebuilders.dev/resource-model/apis/cloud/v1alpha1/register.go @@ -53,7 +53,8 @@ func Resource(resource string) schema.GroupResource { // Adds the list of known types to api.Scheme. func addKnownTypes(scheme *runtime.Scheme) error { - scheme.AddKnownTypes(SchemeGroupVersion, + scheme.AddKnownTypes( + SchemeGroupVersion, &CloudProvider{}, &CloudProviderList{}, @@ -64,7 +65,8 @@ func addKnownTypes(scheme *runtime.Scheme) error { &MachineTypeList{}, ) - scheme.AddKnownTypes(SchemeGroupVersion, + scheme.AddKnownTypes( + SchemeGroupVersion, &metav1.Status{}, ) metav1.AddToGroupVersion(scheme, SchemeGroupVersion) diff --git a/vendor/go.bytebuilders.dev/resource-model/apis/config/v1alpha1/register.go b/vendor/go.bytebuilders.dev/resource-model/apis/config/v1alpha1/register.go index f4660aa34..135f47590 100644 --- a/vendor/go.bytebuilders.dev/resource-model/apis/config/v1alpha1/register.go +++ b/vendor/go.bytebuilders.dev/resource-model/apis/config/v1alpha1/register.go @@ -53,11 +53,13 @@ func Resource(resource string) schema.GroupResource { // Adds the list of known types to api.Scheme. func addKnownTypes(scheme *runtime.Scheme) error { - scheme.AddKnownTypes(SchemeGroupVersion, + scheme.AddKnownTypes( + SchemeGroupVersion, &AceSetupConfig{}, ) - scheme.AddKnownTypes(SchemeGroupVersion, + scheme.AddKnownTypes( + SchemeGroupVersion, &metav1.Status{}, ) metav1.AddToGroupVersion(scheme, SchemeGroupVersion) diff --git a/vendor/go.bytebuilders.dev/resource-model/apis/config/v1alpha1/setupconfig_types.go b/vendor/go.bytebuilders.dev/resource-model/apis/config/v1alpha1/setupconfig_types.go index 55aa51ce2..3d85035b9 100644 --- a/vendor/go.bytebuilders.dev/resource-model/apis/config/v1alpha1/setupconfig_types.go +++ b/vendor/go.bytebuilders.dev/resource-model/apis/config/v1alpha1/setupconfig_types.go @@ -59,6 +59,8 @@ type AceSetupInlineConfig struct { Cluster *CAPIClusterConfig `json:"cluster,omitempty"` // +optional Subscription *MarketplaceSubscriptionInfo `json:"subscription,omitempty"` + // +optional + SyncPersesAccounts bool `json:"syncPersesAccounts,omitempty"` } type AceSetupInlineOptions struct { @@ -113,6 +115,10 @@ type SelfManagement struct { DisableFeatures []string `json:"disableFeatures"` // +optional UseGateway bool `json:"useGateway"` + // +optional + EnableCredLess bool `json:"enableCredLess"` + // +optional + ArgoCD ArgoCDOptions `json:"argoCD,omitempty"` } type SelfManagementOptions struct { @@ -128,6 +134,10 @@ type SelfManagementOptions struct { KubeAPIServer string `json:"kubeAPIServer,omitempty"` // +optional UseGateway bool `json:"useGateway"` + // +optional + EnableCredLess bool `json:"enableCredLess"` + // +optional + ArgoCD ArgoCDOptions `json:"argoCD,omitempty"` } type EnableFeaturesOptions map[string]FeatureSetOptions @@ -169,9 +179,22 @@ func (opt SelfManagementOptions) ToConfig() SelfManagement { DisableFeatures: sets.List(sets.New[string](opt.DisableFeatures...)), KubeAPIServer: opt.KubeAPIServer, UseGateway: opt.UseGateway, + EnableCredLess: opt.EnableCredLess, + ArgoCD: opt.ArgoCD, } } +type ArgoCDOptions struct { + // +optional + Enabled bool `json:"enabled,omitempty"` + // +optional + ExistingKubeconfig string `json:"existingKubeconfig,omitempty"` + // +optional + DeployPrincipal bool `json:"deployPrincipal,omitempty"` + // +optional + PrincipalServiceType string `json:"principalServiceType,omitempty"` +} + type CAPIClusterConfig struct { ClusterName string `json:"clusterName,omitempty"` Region string `json:"region,omitempty"` diff --git a/vendor/go.bytebuilders.dev/resource-model/apis/config/v1alpha1/zz_generated.deepcopy.go b/vendor/go.bytebuilders.dev/resource-model/apis/config/v1alpha1/zz_generated.deepcopy.go index 70a9d3c0f..e6d4e7ac3 100644 --- a/vendor/go.bytebuilders.dev/resource-model/apis/config/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/go.bytebuilders.dev/resource-model/apis/config/v1alpha1/zz_generated.deepcopy.go @@ -152,6 +152,22 @@ func (in *AceSetupInlineOptions) DeepCopy() *AceSetupInlineOptions { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ArgoCDOptions) DeepCopyInto(out *ArgoCDOptions) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ArgoCDOptions. +func (in *ArgoCDOptions) DeepCopy() *ArgoCDOptions { + if in == nil { + return nil + } + out := new(ArgoCDOptions) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *AzureSubscriptionInfo) DeepCopyInto(out *AzureSubscriptionInfo) { *out = *in @@ -334,6 +350,7 @@ func (in *SelfManagement) DeepCopyInto(out *SelfManagement) { *out = make([]string, len(*in)) copy(*out, *in) } + out.ArgoCD = in.ArgoCD return } @@ -362,6 +379,7 @@ func (in *SelfManagementOptions) DeepCopyInto(out *SelfManagementOptions) { *out = make([]string, len(*in)) copy(*out, *in) } + out.ArgoCD = in.ArgoCD return } diff --git a/vendor/modules.txt b/vendor/modules.txt index 84218964f..1ef11b183 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -320,7 +320,7 @@ go.appscode.dev/alerts/apis/alerts/v1alpha1 # go.bytebuilders.dev/catalog v0.1.0 ## explicit; go 1.25.6 go.bytebuilders.dev/catalog/api/gateway/v1alpha1 -# go.bytebuilders.dev/resource-model v0.4.0 +# go.bytebuilders.dev/resource-model v0.4.1-0.20260907073146-deeffaf3c66e ## explicit; go 1.25 go.bytebuilders.dev/resource-model/apis/cloud go.bytebuilders.dev/resource-model/apis/cloud/v1alpha1