From e0b563fc8eab580828d40075d34394e9cf70bd6c Mon Sep 17 00:00:00 2001
From: almogbaku <almog.baku@gmail.com>
Date: Sat, 10 Feb 2024 09:08:07 +0200
Subject: [PATCH] build: fix bundling

---
 .github/workflows/release.yml                 |  7 +++--
 Makefile                                      |  2 +-
 PROJECT                                       |  2 +-
 .../bases/raptor.clusterserviceversion.yaml   | 31 ++++++++++++++++++-
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fbc49c08..951ac955 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -46,7 +46,7 @@ jobs:
           git-push: 'false'
           git-path: ". '!:labsdk'"
           tag-prefix: 'v'
-          fallback-version: '0.3.1'
+          fallback-version: '0.3.2'
       - name: Setup Go environment
         uses: actions/setup-go@v5
         with:
@@ -65,13 +65,12 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push the containers
         run: |
-          make generate docker-build bundle installer \
+          make generate docker-build bundle bundle-build installer \
           VERSION=${{ steps.version.outputs.version }} \
           BUNDLE_VERSION=${{ steps.version.outputs.tag }} \
           CHANNELS=${{ steps.bundle_channel.outputs.channel }} \
           DOCKER_BUILD_FLAGS="--platform linux/amd64,linux/arm64 --push" \
           ENV=prod
-          docker push --all-tags ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-bundle
       - name: Update changelog
         shell: bash
         run: |
@@ -98,6 +97,8 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           tag_name: ${{ steps.version.outputs.tag }}
+          files: |
+            installer.sh
           body: |
             ${{ steps.version.outputs.clean_changelog }}
           prerelease: ${{ inputs.prerelease }}
diff --git a/Makefile b/Makefile
index f3ed67c0..9b8366d2 100644
--- a/Makefile
+++ b/Makefile
@@ -313,7 +313,7 @@ bundle: operator-sdk manifests kustomize update_images_pre ## Generate bundle ma
 
 .PHONY: bundle-build
 bundle-build: ## Build the bundle image.
-	docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
+	docker buildx build ${DOCKER_BUILD_FLAGS} -f bundle.Dockerfile -t $(BUNDLE_IMG) .
 
 .PHONY: opm
 OPM = ./bin/opm
diff --git a/PROJECT b/PROJECT
index 9e102087..8dd001b7 100644
--- a/PROJECT
+++ b/PROJECT
@@ -1,6 +1,6 @@
 domain: raptor.ml
 layout:
-  - go.kubebuilder.io/v3
+  - go.kubebuilder.io/v4
 plugins:
   manifests.sdk.operatorframework.io/v2: { }
   scorecard.sdk.operatorframework.io/v2: { }
diff --git a/config/manifests/bases/raptor.clusterserviceversion.yaml b/config/manifests/bases/raptor.clusterserviceversion.yaml
index 3685d182..95d7ea91 100644
--- a/config/manifests/bases/raptor.clusterserviceversion.yaml
+++ b/config/manifests/bases/raptor.clusterserviceversion.yaml
@@ -112,9 +112,22 @@ spec:
           has set) to consider as *fresh*. Fresh values doesn't require re-ingestion
         displayName: Freshness
         path: freshness
+      - description: KeepPrevious defines the number of previous values to keep in
+          the history.
+        displayName: Keep Previous
+        path: keepPrevious
+      - description: Over defines the maximum time period to keep a previous values
+          in the history since the last update. You can specify `0` to keep the value
+          until the next update.
+        displayName: Over
+        path: keepPrevious.over
+      - description: Versions defines the number of previous values to keep in the
+          history.
+        displayName: Versions
+        path: keepPrevious.versions
       - description: Keys defines the list of keys that are required to calculate
           the feature value.
-        displayName: EncodedKeys
+        displayName: Keys
         path: keys
       - description: Primitive defines the type of the underlying feature-value that
           a Feature should respond with.
@@ -151,11 +164,24 @@ spec:
           value has set) to consider as *fresh*. Fresh values doesn't require re-ingestion
         displayName: Freshness
         path: freshness
+      - description: InferenceConfig is the additional configuration used for the
+          model server.
+        displayName: Config
+        path: inferenceConfig
+      - description: Configuration value from secret
+        displayName: Secret Key Ref
+        path: inferenceConfig[0].secretKeyRef
+        x-descriptors:
+        - urn:alm:descriptor:io.kubernetes:Secret
       - description: KeyFeature is the feature FQN that is used to align the rest
           of the features with their timestamp. If this is unset, the first feature
           in the list will be used.
         displayName: Key Feature FQN
         path: keyFeature
+      - description: Keys defines the list of keys that are required to calculate
+          the feature values.
+        displayName: Keys
+        path: keys
       - description: Labels is a list of feature FQNs that are used to label the prediction
           result.
         displayName: Labels
@@ -167,6 +193,9 @@ spec:
           train the model.
         displayName: Model Framework Version
         path: modelFrameworkVersion
+      - description: ModelImage is the image used to serve the model.
+        displayName: Model Image
+        path: modelImage
       - description: ModelServer is the server used to serve the model.
         displayName: Model Server
         path: modelServer