Merge pull request #19 from avznog/fix/custom-glab-registry

fix/custom-glab-registry

Author: texano00

.github/workflows/CI_CD_App.yml

@@ -91,4 +91,4 @@ jobs:
           platforms: linux/amd64,linux/arm64/v8,linux/arm/v6,linux/arm/v7
           push: true
 
-          
+          

README.md

@@ -81,6 +81,7 @@ helm upgrade --install urunner oci://ghcr.io/texano00/urunner/helm/urunner --ver
 | URUNNER_SECR_AWS_SECRET_ACCESS_KEY       | AWS credential in order to pull from AWS private ECR, configure only if registry type is aws_ecr | wJalrXUtnFEMI/K7MDENG/xRfiCYEXAMPLEKEY |
 | URUNNER_SECR_DIGITAL_OCEAN_TOKEN         | Digital Ocean token                                                                              | xxxxx                                  |
 | URUNNER_SECR_GITLAB_TOKEN         | Gitlab token                                                                              | xxxxx                                  |
+| URUNNER_SECR_GITLAB_AUTH_URL | Gitlab URL where `/jwt/auth` API is exposed. This is usually the same URL where GitLab instance itself is exposed.                                                                              | my-gitlab.com |
 
 ## Flow
 

app/.version

@@ -1 +1 @@
-0.5.3
+0.5.4

app/utils/config.py

@@ -69,3 +69,7 @@ def get_urunner_secr_digital_ocean_token():
 def get_urunner_secr_gitlab_token():
     """def get_urunner_secr_gitlab_token"""
     return os.environ.get("URUNNER_SECR_GITLAB_TOKEN", "xxxxx")
+
+def get_urunner_secr_gitlab_auth_url():
+    """def get_urunner_secr_gitlab_auth_url"""
+    return os.environ.get("URUNNER_SECR_GITLAB_AUTH_URL", "https://gitlab.com")

app/utils/dockerapi.py

@@ -70,7 +70,7 @@ def get_digitalocean_auth(image: Image):
 def get_gitlab_auth(image: Image):
     """get_gitlab_auth"""
     auth_service = "container_registry"
-    auth_url = "https://gitlab.com/jwt/auth"
+    auth_url = f"{config.get_urunner_secr_gitlab_auth_url()}/jwt/auth"
     do_token = config.get_urunner_secr_gitlab_token()
     do_token = b64encode(f"{do_token}:{do_token}".encode("ascii")).decode("ascii")
     auth_header = f"Basic {do_token}"

helm/urunner/Chart.yaml

@@ -15,11 +15,11 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.6.2
+version: 0.6.3
 icon: https://raw.githubusercontent.com/texano00/urunner/main/asset/logo.png
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.5.3"
+appVersion: "0.5.4"

helm/urunner/templates/configmap.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: cm-urunner
+  name: {{ .Values.config.configMapName | quote }}
   labels:
     {{- include "urunner.labels" . | nindent 4 }}
   namespace: {{ .Release.Namespace | quote }}

helm/urunner/templates/secret.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: secret-urunner
+  name: {{ .Values.secret.secretName | quote }}
   namespace: {{ .Release.Namespace | quote }}
 type: Opaque
 stringData:
@@ -23,6 +23,9 @@ stringData:
   {{- if .Values.secret.gitlab.token }}
   URUNNER_SECR_GITLAB_TOKEN: {{ .Values.secret.gitlab.token | quote }}
   {{- end }}
+  {{- if .Values.secret.gitlab.url }}
+  URUNNER_SECR_GITLAB_AUTH_URL: {{ .Values.secret.gitlab.auth_url | quote }}
+  {{- end }}
 {{- end }}
 
 

helm/urunner/values.yaml

@@ -3,6 +3,7 @@ image:
   pullPolicy: IfNotPresent
 
 config:
+  configMapName: "cm-urunner"
   # se to false in order to disallow ssl verify to container registry
   URUNNER_CONF_DOCKER_API_VERIFY: true
   # Text logging level for the message ('DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL').
@@ -20,7 +21,7 @@ config:
 secret:
   create: true
   # for expected keys see secret.yaml
-  secretName: ""
+  secretName: "secret-urunner"
   harbor:
     username: 
     password:
@@ -31,6 +32,7 @@ secret:
     token:
   gitlab:
     token:
+    auth_url:
 
 imagePullSecrets: []
 nameOverride: ""