Add Credentialless Support (#997)

Signed-off-by: rasel <[email protected]>

Author: Superm4n97

apis/installer/v1alpha1/ace_ace_types.go

@@ -253,15 +253,16 @@ const (
 )
 
 type InfraObjstore struct {
-	Provider  ObjstoreProvider      `json:"provider"`
-	Bucket    string                `json:"bucket"`
-	Prefix    string                `json:"prefix,omitempty"`
-	Endpoint  string                `json:"endpoint,omitempty"`
-	Region    string                `json:"region,omitempty"`
-	MountPath string                `json:"mountPath"`
-	S3        *wizardsapi.S3Auth    `json:"s3,omitempty"`
-	Azure     *wizardsapi.AzureAuth `json:"azure,omitempty"`
-	GCS       *wizardsapi.GCSAuth   `json:"gcs,omitempty"`
+	EnableCredLess bool                  `json:"enableCredLess,omitempty"`
+	Provider       ObjstoreProvider      `json:"provider"`
+	Bucket         string                `json:"bucket"`
+	Prefix         string                `json:"prefix,omitempty"`
+	Endpoint       string                `json:"endpoint,omitempty"`
+	Region         string                `json:"region,omitempty"`
+	MountPath      string                `json:"mountPath"`
+	S3             *wizardsapi.S3Auth    `json:"s3,omitempty"`
+	Azure          *wizardsapi.AzureAuth `json:"azure,omitempty"`
+	GCS            *wizardsapi.GCSAuth   `json:"gcs,omitempty"`
 }
 
 type InfraKms struct {

apis/installer/v1alpha1/ace_options_types.go

@@ -277,8 +277,9 @@ export AZURE_STORAGE_KEY=%s`, cs.Objstore.Auth.Azure.AzureAccountName, cs.Objsto
 }
 
 type AceOptionsInfraObjstore struct {
-	Bucket string `json:"bucket"`
-	Prefix string `json:"prefix,omitempty"`
+	EnableCredLess bool   `json:"enableCredLess"`
+	Bucket         string `json:"bucket"`
+	Prefix         string `json:"prefix,omitempty"`
 	// Required for s3 type buckets other than AWS s3 buckets
 	Endpoint string `json:"endpoint,omitempty"`
 	// Required for s3 buckets

apis/installer/v1alpha1/ace_shared_types.go

@@ -89,8 +89,9 @@ type ObjectReference struct {
 }
 
 type ProviderMount struct {
-	Provider  string `json:"provider"`
-	MountPath string `json:"mountPath"`
+	Provider       string `json:"provider"`
+	MountPath      string `json:"mountPath"`
+	EnableCredLess bool   `json:"enableCredLess,omitempty"`
 }
 
 type VolumeMount struct {

charts/accounts-ui/values.openapiv3_schema.yaml

@@ -495,6 +495,8 @@ properties:
         type: object
       objstore:
         properties:
+          enableCredLess:
+            type: boolean
           mountPath:
             type: string
           provider:

charts/ace-installer/values.openapiv3_schema.yaml

@@ -290,6 +290,8 @@ properties:
                     type: object
                   bucket:
                     type: string
+                  enableCredLess:
+                    type: boolean
                   endpoint:
                     type: string
                   prefix:
@@ -299,6 +301,7 @@ properties:
                 required:
                 - auth
                 - bucket
+                - enableCredLess
                 type: object
             type: object
           proxyServiceDomain:
@@ -439,6 +442,8 @@ properties:
                     type: object
                   bucket:
                     type: string
+                  enableCredLess:
+                    type: boolean
                   endpoint:
                     type: string
                   prefix:
@@ -448,6 +453,7 @@ properties:
                 required:
                 - auth
                 - bucket
+                - enableCredLess
                 type: object
               provider:
                 enum:

charts/ace/templates/_helpers.tpl

@@ -148,8 +148,10 @@ Returns the ServiceMonitor labels
 {{- end }}
 
 {{- define "settings.objstoreSecretName" -}}
+{{- if not (.Values.global.infra.objstore.enableCredLess) }}
 {{- printf "%s-objstore-cred" (include "ace.fullname" .) -}}
 {{- end }}
+{{- end }}
 
 {{- define "settings.natsSecretName" -}}
 {{- printf "%s-nats-cred" (include "ace.fullname" .) -}}

charts/ace/templates/platform/objstore-cred.yaml

@@ -1,6 +1,6 @@
 {{ $objstore := .Values.global.infra.objstore }}
 
-{{- if $objstore.provider }}
+{{- if and (include "settings.objstoreSecretName" .) ($objstore.provider) }}
 
 apiVersion: v1
 kind: Secret

charts/ace/values.openapiv3_schema.yaml

@@ -1491,6 +1491,8 @@ properties:
                 type: object
               bucket:
                 type: string
+              enableCredLess:
+                type: boolean
               endpoint:
                 type: string
               gcs:
@@ -2235,6 +2237,8 @@ properties:
             type: object
           objstore:
             properties:
+              enableCredLess:
+                type: boolean
               mountPath:
                 type: string
               provider:
@@ -16130,6 +16134,8 @@ properties:
             type: object
           objstore:
             properties:
+              enableCredLess:
+                type: boolean
               mountPath:
                 type: string
               provider:
@@ -19643,6 +19649,8 @@ properties:
             type: object
           objstore:
             properties:
+              enableCredLess:
+                type: boolean
               mountPath:
                 type: string
               provider:

charts/billing/values.openapiv3_schema.yaml

@@ -485,6 +485,8 @@ properties:
         type: object
       objstore:
         properties:
+          enableCredLess:
+            type: boolean
           mountPath:
             type: string
           provider:

charts/grafana/values.openapiv3_schema.yaml

@@ -495,6 +495,8 @@ properties:
         type: object
       objstore:
         properties:
+          enableCredLess:
+            type: boolean
           mountPath:
             type: string
           provider: