Skip to content

Commit

Permalink
Enabled buildx
Browse files Browse the repository at this point in the history
  • Loading branch information
dbrewster committed Jul 10, 2024
1 parent b7ca0da commit e73da47
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 4 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/version_k8_op.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions k8s-operator/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 13 additions & 0 deletions k8s-operator/config/samples/csv.yaml
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit e73da47

Please sign in to comment.