improvemt to manage namespace in dynamic way

Author: liviodonnini

.github/workflows/.github-ci.yaml

@@ -155,17 +155,18 @@ jobs:
         docker push "${{ secrets.CR_REGISTRY }}"/"${{ secrets.CR_REPO }}"/"${tag}"
     
     # Step 10: Login Docker Hub
-    - name: Login to Docker Hub
+    - name: Login to GHCR
       uses: docker/login-action@v2
       with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
 
     # Step 11: Push to Docker Hub
     - name: push to Docker Hub
       run: |
         tag="${docker_image_application}:${docker_image_version}"
-        docker tag "${tag}" "docker.io/${{ env.docker_tag }}"
-        docker tag "${tag}" "docker.io/${{ env.docker_tag_latest }}"
-        docker push "docker.io/${{ env.docker_tag }}"
-        docker push "docker.io/${{ env.docker_tag_latest }}"
+        docker tag "${tag}" "ghcr.io/EOEPCA/${{ env.docker_tag }}"
+        docker tag "${tag}" "ghcr.io/EOEPCA/${{ env.docker_tag_latest }}"
+        docker push "ghcr.io/EOEPCA/${{ env.docker_tag }}"
+        docker push "ghcr.io/EOEPCA/${{ env.docker_tag_latest }}"

apphub-configurator/examples/generate_config.py

@@ -90,7 +90,7 @@
 init_container = create_init_container(
     image=image,
     volume=workspace_volume,
-    mount_path="/calrissian",
+    mount_path="/workspace",
 )
 
 profile_1 = Profile(

apphub-configurator/manifests/dask-gateway.yaml

@@ -2,14 +2,14 @@ apiVersion: helm.crossplane.io/v1beta1
 kind: Release
 metadata:
   name: dask-gw-jupyter-{{ spawner.user.name }}
-  namespace: jupyter-{{ spawner.user.name }}
+  namespace: "{{ namespace }}"
 spec:
   forProvider:
     chart:
       name: dask-gateway
       version: "2024.1.0"
       repository: https://helm.dask.org
-    namespace: jupyter-{{ spawner.user.name }}
+    namespace: "{{ namespace }}"
     values:
       gateway:
         backend:
@@ -39,7 +39,7 @@ metadata:
 data:
   gateway: |
     gateway:
-      address: http://traefik-dask-gw-jupyter-{{ spawner.user.name }}-dask-gateway.jupyter-{{ spawner.user.name }}.svc.cluster.local:80
+      address: http://traefik-dask-gw-jupyter-{{ spawner.user.name }}-dask-gateway.{namespace}-{{ spawner.user.name }}.svc.cluster.local:80
 
       cluster:
         options: 
@@ -55,7 +55,7 @@ metadata:
 data:
   gateway: |
     gateway:
-      address: http://traefik-dask-gw-jupyter-{{ spawner.user.name }}-dask-gateway.jupyter-{{ spawner.user.name }}.svc.cluster.local:80
+      address: http://traefik-dask-gw-jupyter-{{ spawner.user.name }}-dask-gateway.{namespace}-{{ spawner.user.name }}.svc.cluster.local:80
 
       cluster:
         options: 
@@ -68,7 +68,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
  name: access-services
- namespace: jupyter-{{ spawner.user.name }}
+ #namespace: jupyter-{{ spawner.user.name }}
 rules:
  - verbs:
      - get
@@ -98,11 +98,11 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
  name: bind-default-to-services
- namespace: jupyter-{{ spawner.user.name }}
+ #namespace: jupyter-{{ spawner.user.name }}
 subjects:
  - kind: ServiceAccount
    name: default
-   namespace: jupyter-{{ spawner.user.name }}
+   #namespace: jupyter-{{ spawner.user.name }}
 roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: Role

apphub-configurator/manifests/kaniko.yaml

@@ -2,7 +2,7 @@
   kind: Pod
   metadata:
     name: kaniko-build
-    namespace: jupyter-{{ spawner.user.name }}
+    namespace: "{{ namespace }}"
   spec:
     containers:
     - name: kaniko
@@ -32,7 +32,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
  name: pod-exec
- namespace: jupyter-{{ spawner.user.name }}
+ namespace: "{{ namespace }}"
 rules:
  - verbs:
      - get
@@ -47,11 +47,11 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
  name: bind-default-to-opd-exec
- namespace: jupyter-{{ spawner.user.name }}
+ namespace: "{{ namespace }}"
 subjects:
  - kind: ServiceAccount
    name: default
-   namespace: jupyter-{{ spawner.user.name }}
+   namespace: "{{ namespace }}"
 roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: Role

apphub-configurator/manifests/manifest.yaml

@@ -449,15 +449,15 @@ data:
 # apiVersion: helm.crossplane.io/v1beta1
 # kind: Release
 # metadata:
-#   name: wordpress-jupyter-{{ spawner.user.name }}
-#   namespace: jupyter-{{ spawner.user.name }}
+#   name: wordpress-{namespace}-{{ spawner.user.name }}
+#   namespace: {namespace}-{{ spawner.user.name }}
 # spec:
 #   forProvider:
 #     chart:
 #       name: wordpress
 #       version: "24.1.4"
 #       repository: oci://registry-1.docker.io/bitnamicharts/
-#     namespace: jupyter-{{ spawner.user.name }}
+#     namespace: {namespace}-{{ spawner.user.name }}
 #     values:
 #       service:
 #         type: ClusterIP
@@ -468,7 +468,7 @@ apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
   name: data-by-name
-  namespace: jupyter-{{ spawner.user.name }}
+  namespace: "{{ namespace }}"
 spec:
   refreshInterval: 15s
   secretStoreRef:
@@ -488,7 +488,7 @@ apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
   name: eoepca-plus-secret-ro
-  namespace: jupyter-{{ spawner.user.name }}
+  namespace: "{{ namespace }}"
 spec:
   refreshInterval: 15s
   secretStoreRef:

application_hub_context/app_hub_context.py

@@ -50,7 +50,7 @@ def __init__(
 
         # loads config
         self.config_parser = ConfigParser.read_file(
-            config_path=config_path, user_groups=self.user_groups, spawner=self.spawner
+            config_path=config_path, user_groups=self.user_groups, spawner=self.spawner, namespace=self.namespace
         )
 
         # update class dict with kwargs
@@ -546,7 +546,8 @@ def patch_service_account(self, secret_name: str):
     def apply_manifest(self, manifest):
 
         template = Template(yaml.dump(manifest))
-        rendered_manifest = template.render(spawner=self.spawner)
+        rendered_manifest = template.render(spawner=self.spawner,
+                                            namespace=self.namespace)
 
         self.spawner.log.info(f"Applying manifest name: {yaml.safe_load(rendered_manifest).get('metadata').get('name')}")
 

application_hub_context/parser.py

@@ -12,7 +12,7 @@ def __init__(self, config_data, user_groups):
         self.user_groups = user_groups
 
     @classmethod
-    def read_file(cls, config_path, user_groups, spawner):
+    def read_file(cls, config_path, user_groups, spawner, namespace):
         """reads a config file encoded in YAML"""
         with open(config_path, "r") as stream:
             try:
@@ -21,7 +21,8 @@ def read_file(cls, config_path, user_groups, spawner):
 
                 # Render the content as a Jinja2 template
                 template = Template(raw_content)
-                rendered_content = template.render(spawner=spawner)
+                rendered_content = template.render(spawner=spawner,
+                                                   namespace=namespace)
 
                 # Parse the rendered content as YAML
                 config_data = yaml.safe_load(rendered_content)

build.yml

@@ -1,2 +1,2 @@
 docker_image_name: eoepca/application-hub
-docker_image_version: 1.4.1
+docker_image_version: 1.4.2