Fix rabbitmq connector ci

Signed-off-by: Sanket Sudake <[email protected]>
fission · Nov 22, 2023 · ed016b4 · ed016b4
1 parent c54d644
commit ed016b4
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 51 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,10 +6,6 @@ on:
   pull_request:
     branches:
       - main
-env:
-  KIND_URL: https://kind.sigs.k8s.io/dl
-  KIND_VER: v0.8.1
-  KIND_ENV: kind-linux-amd64
 
 jobs:
   check:
@@ -26,16 +22,16 @@ jobs:
           filters: |
             kafkachanges:
               - 'kafka-http-connector/**'
-            # rabbitmqchanges:
-            #   - 'rabbitmq-http-connector/**'
-            # sqschanges:
-            #   - 'aws-sqs-http-connector/**'
-            # redischanges:
-            #   - 'redis-http-connector/**'
-            # natschanges:
-            #   - 'nats-streaming-http-connector/**'
-            # natsjetstreamchanges:
-            #   - 'nats-jetstream-http-connector/**'
+            rabbitmqchanges:
+              - 'rabbitmq-http-connector/**'
+            sqschanges:
+              - 'aws-sqs-http-connector/**'
+            redischanges:
+              - 'redis-http-connector/**'
+            natschanges:
+              - 'nats-streaming-http-connector/**'
+            natsjetstreamchanges:
+              - 'nats-jetstream-http-connector/**'
 
   kafka:
     needs: check
@@ -99,21 +95,6 @@ jobs:
       - name: Setup Keda
         uses: ./.github/actions/setup-keda
 
-      - name: Create Docker Image for Rabbitmq KEDA Connector
-        run: |
-          cd rabbitmq-http-connector/
-          docker build -t localhost:5000/rabbit-keda:latest .
-          docker push localhost:5000/rabbit-keda:latest
-      - name: Create Rabbitmq Docker Image for Publisher
-        run: |
-          cd rabbitmq-http-connector/test/publisher/
-          docker build -t localhost:5000/rabbit-publisher:latest .
-          docker push localhost:5000/rabbit-publisher:latest
-      - name: Create Rabbitmq Docker Image for Consumer
-        run: |
-          cd rabbitmq-http-connector/test/consumer/
-          docker build -t localhost:5000/rabbit-consumer:latest .
-          docker push localhost:5000/rabbit-consumer:latest
       - name: Deploy Rabbitmq Deployment files
         run: |
           cd rabbitmq-http-connector/test/kubernetes/
@@ -123,25 +104,47 @@ jobs:
           kubectl apply -n rabbits -f rabbit-secret.yaml
           kubectl apply -n rabbits -f rabbit-statefulset.yaml
           bash rabbitmq-cluster-instances.sh
+
+      # - name: Create Docker Image for Rabbitmq KEDA Connector
+      #   run: |
+      #     cd rabbitmq-http-connector/
+      #     docker build -t localhost:5000/rabbit-keda:latest .
+      #     docker push localhost:5000/rabbit-keda:latest
+      # - name: Create Rabbitmq Docker Image for Publisher
+      #   run: |
+      #     cd rabbitmq-http-connector/test/publisher/
+      #     docker build -t localhost:5000/rabbit-publisher:latest .
+      #     docker push localhost:5000/rabbit-publisher:latest
+
+      # - name: Create Rabbitmq Docker Image for Consumer
+      #   run: |
+      #     cd rabbitmq-http-connector/test/consumer/
+      #     docker build -t localhost:5000/rabbit-consumer:latest .
+      #     docker push localhost:5000/rabbit-consumer:latest
+
       - name: Publish Rabbitmq messages in a queue
         run: |
           cd rabbitmq-http-connector/test/publisher/
           kubectl apply -f deployment.yaml
-          kubectl apply -f publisher-job.yaml
+          ko resolve -f publisher-job.yaml | kubectl apply -f - -n rabbits
+
       - name: Bring up the Rabbitmq consumer queue and Listen for incoming messages
         run: |
           cd rabbitmq-http-connector/test/consumer/
-          kubectl apply -f consumer-deployment.yaml
+          ko resolve -f consumer-deployment.yaml | kubectl apply -f -
+
       - name: Deploy Rabbitmq Keda Connector and Keda ScaledObject
         run: |
           cd rabbitmq-http-connector/test/kubernetes/
-          kubectl apply -f keda-deployment.yml
+          ko resolve -f keda-deployment.yml | kubectl apply -f - -n rabbits
           kubectl wait pod -l keda=rabbitmq --for=condition=ready --timeout=-1s -n rabbits
           kubectl apply -f Keda-ScaledObj.yml
+
       - name: Get Rabbitmq consumed messages from queue
         run: |
           sleep 10s
           kubectl logs  -n rabbits deployment.apps/rabbitmq-consumer
+
   sqs:
     needs: check
     if: contains(needs.check.outputs.packages, 'sqschanges')
@@ -182,6 +185,7 @@ jobs:
         run: |
           sleep 30s
           kubectl logs -l app=queue
+
   redis:
     needs: check
     if: contains(needs.check.outputs.packages, 'redischanges')
@@ -241,6 +245,7 @@ jobs:
           kubectl logs deployment.apps/consumer-deployment
           kubectl logs deployment.apps/consumer-deployment | grep -q "consumed"
           echo $?
+
   nats:
     needs: check
     if: contains(needs.check.outputs.packages, 'natschanges')

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -38,12 +38,12 @@ jobs:
         # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
+    - name: Check out code
+      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,11 +6,6 @@ on:
       - main
     paths:
       - "**/version"
-  pull_request:
-    branches:
-      - main
-    paths:
-      - "**/version"
 
 jobs:
   check:

diff --git a/rabbitmq-http-connector/test/consumer/consumer-deployment.yaml b/rabbitmq-http-connector/test/consumer/consumer-deployment.yaml
@@ -27,7 +27,7 @@ spec:
     spec:
       containers:
       - name: rabbitmq-consumer
-        image: localhost:5000/rabbit-consumer:latest
+        image: ko://github.com/fission/keda-connectors/rabbitmq-http-connector/test/consumer
         imagePullPolicy: Always
         ports:
         - containerPort: 80

diff --git a/rabbitmq-http-connector/test/kubernetes/Keda-ScaledObj.yml b/rabbitmq-http-connector/test/kubernetes/Keda-ScaledObj.yml
@@ -10,8 +10,7 @@ spec:
     name: keda-deployment
   pollingInterval: 30
   triggers:
-  - type: rabbitmq
-    metadata:
-      host: amqp://guest:[email protected]:5672/vhost
-      queueName: publisher
-
+    - type: rabbitmq
+      metadata:
+        host: amqp://guest:[email protected]:5672/vhost
+        queueName: publisher
diff --git a/rabbitmq-http-connector/test/kubernetes/keda-deployment.yml b/rabbitmq-http-connector/test/kubernetes/keda-deployment.yml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: keda-rabbit-connector
-        image: localhost:5000/rabbit-keda:latest
+        image: ko://github.com/fission/keda-connectors/rabbitmq-http-connector
         env:
           - name: TOPIC
             value: publisher

diff --git a/rabbitmq-http-connector/test/publisher/publisher-job.yaml b/rabbitmq-http-connector/test/publisher/publisher-job.yaml
@@ -10,7 +10,7 @@ spec:
     spec:
       containers:
       - name: rabbit-publish
-        image: localhost:5000/rabbit-publisher:latest
+        image: ko://github.com/fission/keda-connectors/rabbitmq-http-connector/test/publisher/
         ports:
         - containerPort: 8000
         env:
@@ -29,4 +29,3 @@ spec:
               name: rabbitmq-publisher
               key: RABBIT_PASSWORD
       restartPolicy: Never
-