Merge branch 'main' into feature/mcp-servers-dynamic-configuration

Author: chambridge

.github/workflows/components-build.yml …ub/workflows/components-build-deploy.yml.github/workflows/components-build.yml renamed to .github/workflows/components-build-deploy.yml .github/workflows/components-build.yml renamed to .github/workflows/components-build-deploy.yml

@@ -37,7 +37,8 @@ jobs:
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-
+        with:
+          platforms: linux/amd64,linux/arm64
       - name: Log in to Quay.io
         uses: docker/login-action@v3
         with:
@@ -53,10 +54,11 @@ jobs:
           password: ${{ secrets.REDHAT_PASSWORD }}
 
       - name: Build and push ${{ matrix.component.name }} image only for merge into main
-        if: github.ref == 'refs/heads/main'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
         uses: docker/build-push-action@v6
         with:
           context: ${{ matrix.component.context }}
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: |
             ${{ matrix.component.image }}:latest
@@ -65,11 +67,34 @@ jobs:
           cache-to: type=gha,mode=max
 
       - name: Build ${{ matrix.component.name }} image for pull requests but don't push
-        if: github.ref != 'refs/heads/main'
+        if: github.event_name == 'pull_request_target'
         uses: docker/build-push-action@v6
         with:
           context: ${{ matrix.component.context }}
+          platforms: linux/amd64,linux/arm64
           push: false
           tags: ${{ matrix.component.image }}:pr-${{ github.event.pull_request.number }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
+
+
+  deploy-to-openshift:
+    runs-on: ubuntu-latest
+    needs: build-and-push
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install oc
+        uses: redhat-actions/oc-installer@v1
+        with:
+          oc_version: 'latest'
+
+      - name: Log in to OpenShift Cluster
+        run: |
+          oc login ${{ secrets.OPENSHIFT_SERVER }} --token=${{ secrets.OPENSHIFT_TOKEN }} --insecure-skip-tls-verify
+
+      - name: Deploy updated components to OpenShift
+        run: |
+          oc delete po --all -n ambient-code

.github/workflows/image.yml

@@ -16,7 +16,7 @@ RUN go mod download
 COPY . .
 
 # Build the application (with flags to avoid segfault)
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o main .
+RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -o main .
 
 # Final stage
 FROM alpine:latest

.github/workflows/rfe-builder-tests.yml

@@ -16,7 +16,7 @@ RUN go mod download
 COPY . .
 
 # Build the application (with flags to avoid segfault)
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o operator .
+RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -o operator .
 
 # Final stage
 FROM alpine:latest