Skip to content

Commit

Permalink
build: fix bundling (#318)
Browse files Browse the repository at this point in the history
  • Loading branch information
AlmogBaku committed Feb 10, 2024
2 parents fb8984f + e0b563f commit 34aff7f
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 6 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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: |
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion PROJECT
Original file line number Diff line number Diff line change
@@ -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: { }
Expand Down
31 changes: 30 additions & 1 deletion config/manifests/bases/raptor.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 34aff7f

Please sign in to comment.