From e73da47d04d63b561dea6f6f15622e5cb9eb9cfa Mon Sep 17 00:00:00 2001
From: dbrewster <davebrewster@me.com>
Date: Tue, 9 Jul 2024 21:04:41 -0400
Subject: [PATCH] Enabled buildx

---
 .github/workflows/version_k8_op.yml                 |  4 +++-
 k8s-operator/Makefile                               |  4 ++--
 .../conversational_chatbot/resources/machine.yaml   |  3 ++-
 k8s-operator/config/samples/csv.yaml                | 13 +++++++++++++
 4 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 k8s-operator/config/samples/csv.yaml

diff --git a/.github/workflows/version_k8_op.yml b/.github/workflows/version_k8_op.yml
index e8a05b377..9dea7f510 100644
--- a/.github/workflows/version_k8_op.yml
+++ b/.github/workflows/version_k8_op.yml
@@ -18,6 +18,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
@@ -50,7 +52,7 @@ jobs:
           github_token: ${{ steps.generate_token.outputs.token }}
           branch: ${{ github.ref }}
       - name: "build"
-        run: make build docker-build docker-push
+        run: make build docker-buildx
         working-directory: k8s-operator
       - name: "bundle"
         run: make bundle bundle-build bundle-push
diff --git a/k8s-operator/Makefile b/k8s-operator/Makefile
index 5fb79a55f..3b0f09198 100644
--- a/k8s-operator/Makefile
+++ b/k8s-operator/Makefile
@@ -40,7 +40,7 @@ IMAGE_TAG_BASE ?= eidolonai/controller
 
 # BUNDLE_IMG defines the image:tag used for the bundle.
 # You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)
-BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION)
+BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:$(VERSION)
 
 # BUNDLE_GEN_FLAGS are the flags passed to the operator-sdk generate bundle command
 BUNDLE_GEN_FLAGS ?= -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS)
@@ -299,7 +299,7 @@ endif
 BUNDLE_IMGS ?= $(BUNDLE_IMG)
 
 # The image tag given to the resulting catalog image (e.g. make catalog-build CATALOG_IMG=example.com/operator-catalog:v0.2.0).
-CATALOG_IMG ?= $(IMAGE_TAG_BASE)-catalog:v$(VERSION)
+CATALOG_IMG ?= $(IMAGE_TAG_BASE)-catalog:$(VERSION)
 
 # Set CATALOG_BASE_IMG to an existing catalog image tag to add $BUNDLE_IMGS to that image.
 ifneq ($(origin CATALOG_BASE_IMG), undefined)
diff --git a/k8s-operator/config/samples/conversational_chatbot/resources/machine.yaml b/k8s-operator/config/samples/conversational_chatbot/resources/machine.yaml
index c91a5d5d4..2f896ec7c 100644
--- a/k8s-operator/config/samples/conversational_chatbot/resources/machine.yaml
+++ b/k8s-operator/config/samples/conversational_chatbot/resources/machine.yaml
@@ -3,7 +3,8 @@ kind: Machine
 metadata:
   name: machine-sample
 spec:
-  image: docker.io/eidolonai/sdk:0.1.88
+  image: docker.io/eidolonai/sdk:latest
+  imagePullPolicy: Always
   envFrom:
     - secretRef:
         name: eidolon
diff --git a/k8s-operator/config/samples/csv.yaml b/k8s-operator/config/samples/csv.yaml
new file mode 100644
index 000000000..22b174cdf
--- /dev/null
+++ b/k8s-operator/config/samples/csv.yaml
@@ -0,0 +1,13 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: CatalogSource
+metadata:
+  name: eidolon-catalog
+  namespace: operators
+spec:
+  sourceType: grpc
+  image: eidolonai/controller-catalog:v0.0.4
+  displayName: Eidolon Catalog
+  publisher: dave@augustdata.ai
+  updateStrategy:
+    registryPoll:
+      interval: 10m