feature(Gitlab): provide more options for registry storage configurat…

…ion (#447)
glasskube · Dec 7, 2023 · e27d13d · e27d13d
1 parent 6944d5f
commit e27d13d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/deploy/crd/gitlabs.glasskube.eu-v1.yml b/deploy/crd/gitlabs.glasskube.eu-v1.yml
@@ -130,13 +130,15 @@ spec:
                             type: string
                           usePathStyle:
                             type: boolean
+                          port:
+                            type: object
+                          useSsl:
+                            type: boolean
                         required:
                         - bucket
                         - accessKeySecret
                         - secretKeySecret
                         - region
-                        - hostname
-                        - usePathStyle
                         type: object
                     type: object
                 required:

diff --git a/operator/src/main/kotlin/eu/glasskube/operator/apps/gitlab/GitlabRegistryStorageSpec.kt b/operator/src/main/kotlin/eu/glasskube/operator/apps/gitlab/GitlabRegistryStorageSpec.kt
@@ -1,6 +1,5 @@
 package eu.glasskube.operator.apps.gitlab
 
-import com.fasterxml.jackson.annotation.JsonIgnore
 import eu.glasskube.operator.apps.common.cloudstorage.CloudStorageSpec
 import io.fabric8.generator.annotation.Required
 import io.fabric8.kubernetes.api.model.SecretKeySelector
@@ -17,15 +16,10 @@ data class GitlabRegistryStorageSpec(
         override val secretKeySecret: SecretKeySelector,
         @field:Required
         override val region: String,
-        @field:Required
         override val hostname: String,
-        @field:Required
-        override val usePathStyle: Boolean
+        override val usePathStyle: Boolean = false
     ) : CloudStorageSpec {
-        @field:JsonIgnore
         override val port = null
-
-        @field:JsonIgnore
         override val useSsl = true
     }
 }
diff --git a/operator/src/main/kotlin/eu/glasskube/operator/apps/gitlab/dependent/GitlabDeployment.kt b/operator/src/main/kotlin/eu/glasskube/operator/apps/gitlab/dependent/GitlabDeployment.kt
@@ -218,7 +218,7 @@ class GitlabDeployment(private val configService: ConfigService) :
             envVar("REGISTRY_OBJECTSTORE_ENABLED", true.toString())
             envVar("REGISTRY_OBJECTSTORE_S3_BUCKET", s3.bucket)
             envVar("REGISTRY_OBJECTSTORE_S3_REGION", s3.region)
-            envVar("REGISTRY_OBJECTSTORE_S3_HOST", s3.hostname)
+            s3.endpoint?.let { envVar("REGISTRY_OBJECTSTORE_S3_HOST", it) }
             envVar("REGISTRY_OBJECTSTORE_S3_USEPATH_STYLE", s3.usePathStyle.toString())
             envVar("REGISTRY_OBJECTSTORE_S3_KEY") {
                 secretKeyRef(s3.accessKeySecret.name, s3.accessKeySecret.key)