draft

git-hyagi · Nov 29, 2024 · eb44447 · eb44447
1 parent a028024
commit eb44447
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/.ci/scripts/telemetry.sh b/.ci/scripts/telemetry.sh
@@ -15,7 +15,7 @@ if [[ "$HTTP_STATUS" != 200 ]]; then
   exit 1
 fi
 
-echo "Verifying if \"http_server\" string is found in metrics endpoint ..."
-kubectl exec deployment/$DEPLOYMENT_NAME -- curl -s localhost:8889/metrics | grep http_server  &>/dev/null
+echo "Verifying if \"http_method\" string is found in metrics endpoint ..."
+kubectl exec deployment/$DEPLOYMENT_NAME -- curl -s localhost:8889/metrics | grep http_method  &>/dev/null
 
 echo "Telemetry ok"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -138,9 +138,12 @@ jobs:
         run: |
           make install
         shell: bash
+      - name: Build operator image
+        run: |
+          make docker-build docker-push IMG=localhost:5001/pulp-operator:dev
       - name: Build bundle image
         run: |
-          make bundle-build bundle-push BUNDLE_IMG=localhost:5001/pulp-operator-bundle:testing
+          make bundle bundle-build bundle-push BUNDLE_IMG=localhost:5001/pulp-operator-bundle:testing IMG=localhost:5001/pulp-operator:dev
         shell: bash
       - name: Install the operator
         run: |
@@ -151,13 +154,13 @@ jobs:
           kubectl apply -f config/samples/simple-with-reduced-migration-cpu.yaml
           kubectl apply -f config/samples/simple-test.yaml
       - name: Check and wait for example-pulp deployment
-        run: kubectl wait --for condition=Pulp-Operator-Finished-Execution pulp/example-pulp --timeout=900s
+        run: kubectl wait --for condition=Pulp-Operator-Finished-Execution pulp/example-pulp --timeout=600s
         shell: bash
+      - name: Check and wait for test-pulp deployment
+        run: kubectl wait --for condition=Pulp-Operator-Finished-Execution pulp/test-pulp --timeout=600s
       - name: Logs
         if: always()
-        run: .github/workflows/scripts/show_logs.sh
-      - name: Check and wait for test-pulp deployment
-        run: kubectl wait --for condition=Pulp-Operator-Finished-Execution pulp/test-pulp --timeout=900s
+        run: .github/workflows/scripts/show_logs.sh kind
   envtest:
     runs-on: ubuntu-latest
     steps:

diff --git a/main.go b/main.go
@@ -177,7 +177,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	setupLog.Info("pulp-operator version: 1.0.5-beta.5")
+	setupLog.Info("pulp-operator version: 1.0.6-beta.5")
 	setupLog.Info("starting manager")
 	if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
 		setupLog.Error(err, "problem running manager")