Merge pull request #235 from dciangot/next_repo_2

Clean up ghcr images
interTwin-eu · Jun 20, 2024 · 8d28681 · 8d28681
2 parents 0e202d5 + 7d0ea17
commit 8d28681
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 33 deletions.
diff --git a/.github/workflows/build_images.yaml b/.github/workflows/build_images.yaml
@@ -7,6 +7,8 @@ on:
 jobs:
   core-containers:
     runs-on: ubuntu-latest
+    env:
+        GH_REPO_OWNER: ${{ github.repository_owner }} 
     #env:
     #  DOCKER_TARGET_PLATFORM: linux/arm64
     steps:
@@ -33,8 +35,8 @@ jobs:
           context: ./
           outputs: "type=registry,push=true"
           tags: |
-            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/virtual-kubelet-inttw:${{ env.RELEASE_VERSION }}
-            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/virtual-kubelet-inttw:latest
+            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/interlink/virtual-kubelet-inttw:${{ env.RELEASE_VERSION }}
+            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/interlink/virtual-kubelet-inttw:latest
           file: ./docker/Dockerfile.vk
           platforms: linux/amd64, linux/arm64
       - name: Build container base image interlink
@@ -43,8 +45,8 @@ jobs:
           context: ./
           outputs: "type=registry,push=true"
           tags: |
-            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/interlink:${{ env.RELEASE_VERSION }}
-            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/interlink:latest
+            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/interlink/interlink:${{ env.RELEASE_VERSION }}
+            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/interlink/interlink:latest
           file: ./docker/Dockerfile.interlink
           platforms: linux/amd64, linux/arm64
 
@@ -76,7 +78,7 @@ jobs:
           context: ./
           outputs: "type=registry,push=true"
           tags: |
-            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/virtual-kubelet-inttw-refresh:${{ env.RELEASE_VERSION }}
-            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/virtual-kubelet-inttw-refresh:latest
+            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/interlink/virtual-kubelet-inttw-refresh:${{ env.RELEASE_VERSION }}
+            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/interlink/virtual-kubelet-inttw-refresh:latest
           file: ./docker/Dockerfile.refresh-token
           platforms: linux/amd64, linux/arm64
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -2,7 +2,7 @@ name: integration-tests
 
 on:
   push:
-    branches: [main,next,next2next]
+    #branches: [main,next,next2next]
   pull_request:
 
 jobs:
@@ -19,11 +19,14 @@ jobs:
           username: ${{ github.repository_owner }}
           #password: ${{ secrets.GITHUB_TOKEN }}
           password: ${{ secrets.GH_CR_TOKEN }}
+      - name: Get Repo Owner
+        id: get_repo_owner
+        run: echo ::set-output name=repo_owner::$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')
       - name: Integration Test
         uses: dagger/dagger-for-github@v5
         with:
           workdir: ci
           verb: call
-          args: -s build-images --source-folder ../ --virtual-kubelet-ref ghcr.io/intertwin-eu/virtual-kubelet-inttw:$GITHUB_SHA --interlink-ref ghcr.io/intertwin-eu/interlink:$GITHUB_SHA new-interlink --manifests $PWD/manifests load-plugin test stdout
+          args: -s build-images --source-folder ../ --virtual-kubelet-ref ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/interlink/virtual-kubelet-inttw:$GITHUB_SHA --interlink-ref ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/interlink/interlink:$GITHUB_SHA new-interlink --manifests $PWD/manifests load-plugin test stdout
           cloud-token: ${{ secrets.DAGGER_CLOUD_TOKEN }}
           #dagger-flags: -d
diff --git a/ci/main.go b/ci/main.go
@@ -57,13 +57,13 @@ type Interlink struct {
 func (i *Interlink) BuildImages(
 	ctx context.Context,
 	// +optional
-	// +default="ghcr.io/intertwin-eu/virtual-kubelet-inttw"
+	// +default="ghcr.io/intertwin-eu/interlink/virtual-kubelet-inttw"
 	virtualKubeletRef string,
 	// +optional
-	// +default="ghcr.io/intertwin-eu/interlink"
+	// +default="ghcr.io/intertwin-eu/interlink/interlink"
 	interlinkRef string,
 	// +optional
-	// +default="ghcr.io/intertwin-eu/plugin-test"
+	// +default="ghcr.io/intertwin-eu/interlink/plugin-test"
 	pluginRef string,
 	sourceFolder *Directory,
 ) (*Interlink, error) {
@@ -117,8 +117,8 @@ func (i *Interlink) NewInterlink(
 		}
 	} else {
 		patch = patchSchema{
-			InterLinkRef:      "ghcr.io/intertwin-eu/interlink",
-			VirtualKubeletRef: "ghcr.io/intertwin-eu/virtual-kubelet-inttw",
+			InterLinkRef:      "ghcr.io/intertwin-eu/interlink/interlink",
+			VirtualKubeletRef: "ghcr.io/intertwin-eu/interlink/virtual-kubelet-inttw",
 		}
 	}
 

diff --git a/ci/manifests/interlink.yaml b/ci/manifests/interlink.yaml
@@ -14,33 +14,33 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: interlink 
+  name: interlink
   namespace: interlink
   labels:
     app: interlink
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: interlink 
+      app: interlink
   template:
     metadata:
       labels:
         app: interlink
     spec:
       containers:
-      - name: interlink
-        image: "ghcr.io/intertwin-eu/interlink" 
-        imagePullPolicy: Always
-        env:
-        - name: CONFIGPATH
-          value: "/etc/interlink/InterLinkConfig.yaml"
-        volumeMounts:
-        - name: config
-          mountPath: /etc/interlink/InterLinkConfig.yaml
-          subPath: InterLinkConfig.yaml
+        - name: interlink
+          image: "ghcr.io/intertwin-eu/interlink/interlink"
+          imagePullPolicy: Always
+          env:
+            - name: CONFIGPATH
+              value: "/etc/interlink/InterLinkConfig.yaml"
+          volumeMounts:
+            - name: config
+              mountPath: /etc/interlink/InterLinkConfig.yaml
+              subPath: InterLinkConfig.yaml
       volumes:
-      - name: config
-        configMap:
-          # Provide the name of the ConfigMap you want to mount.
-          name: interlink-config
+        - name: config
+          configMap:
+            # Provide the name of the ConfigMap you want to mount.
+            name: interlink-config
diff --git a/ci/manifests/virtual-kubelet.yaml b/ci/manifests/virtual-kubelet.yaml
@@ -19,7 +19,7 @@ spec:
       serviceAccountName: virtual-kubelet 
       containers:
       - name: inttw-vk
-        image: "ghcr.io/intertwin-eu/virtual-kubelet-inttw" 
+        image: "ghcr.io/intertwin-eu/interlink/virtual-kubelet-inttw" 
         imagePullPolicy: Always
         env:
         - name: NODENAME

diff --git a/cmd/installer/templates/deployment.yaml b/cmd/installer/templates/deployment.yaml
@@ -20,7 +20,7 @@ spec:
       - name: jaeger
         image: jaegertracing/all-in-one:1.51
       - name: inttw-vk
-        image: ghcr.io/intertwin-eu/virtual-kubelet-inttw:latest
+        image: ghcr.io/intertwin-eu/interlink/virtual-kubelet-inttw:latest
         imagePullPolicy: Always
         env:
         - name: NODENAME

diff --git a/example/interlink-docker/vk/deployment.yaml b/example/interlink-docker/vk/deployment.yaml
@@ -28,7 +28,7 @@ spec:
       - name: jaeger
         image: jaegertracing/all-in-one:1.51
       - name: inttw-vk
-        image: ghcr.io/intertwin-eu/virtual-kubelet-inttw:latest 
+        image: ghcr.io/intertwin-eu/interlink/virtual-kubelet-inttw:latest 
         #image: dciangot/vk:latest
         imagePullPolicy: Always
         #command: ["sleep", "infinity"]

diff --git a/helm/interlink/values.yaml b/helm/interlink/values.yaml
@@ -5,7 +5,7 @@
 nodeName: default-vk
 
 deployment:
-  image: ghcr.io/intertwin-eu/virtual-kubelet-inttw:latest 
+  image: ghcr.io/intertwin-eu/interlink/virtual-kubelet-inttw:latest 
   name: default-vk
 
 interlink: