From 9016b5e3a06772b8a50050a7117a1d7ba3a194b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20B=C3=A4hler?= Date: Mon, 16 Oct 2023 23:13:11 +0200 Subject: [PATCH] update --- .github/workflows/docker-publish.yml | 2 +- .github/workflows/helm-publish.yml | 2 +- Makefile | 7 ++----- charts/capsule/README.md | 6 ++++++ 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 60d628acf..da11b399c 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -39,7 +39,7 @@ jobs: uses: sigstore/cosign-installer@11086d25041f77fe8fe7b9ea4e48e3b9192b8f19 # v3.1.2 - name: Publish Capsule id: publish-capsule - uses: oliverbaehler/github-actions/ko-publish-image@dev + uses: oliverbaehler/github-actions/ko-publish-image@debug-ko with: makefile-target: ko-publish-capsule registry: ghcr.io diff --git a/.github/workflows/helm-publish.yml b/.github/workflows/helm-publish.yml index f3e03fba0..32025b9e2 100644 --- a/.github/workflows/helm-publish.yml +++ b/.github/workflows/helm-publish.yml @@ -34,7 +34,7 @@ jobs: - uses: sigstore/cosign-installer@11086d25041f77fe8fe7b9ea4e48e3b9192b8f19 # v3.1.2 - name: Helm | Publish id: helm_publish - uses: oliverbaehler/github-actions/helm-oci-chart@dev + uses: oliverbaehler/github-actions/helm-oci-chart@8dfd42735c85f6c58d5d4d6f3232cd0e39d1fe73 # v0.1.0 with: registry: ghcr.io repository: ${{ github.repository_owner }}/charts diff --git a/Makefile b/Makefile index 1e3948f01..9d439d487 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ endif # Defaults REGISTRY ?= ghcr.io -REPOSITORY ?= clastix/capsule +REPOSITORY ?= capsuleproject/capsule GIT_HEAD_COMMIT ?= $(shell git rev-parse --short HEAD) GIT_TAG_COMMIT ?= $(shell git rev-parse --short $(VERSION)) GIT_MODIFIED_1 ?= $(shell git diff $(GIT_HEAD_COMMIT) $(GIT_TAG_COMMIT) --quiet && echo "" || echo ".dev") @@ -18,9 +18,6 @@ IMG_BASE ?= $(REPOSITORY)/capsule IMG ?= $(IMG_BASE):$(VERSION) CAPSULE_IMG ?= $(REGISTRY)/$(IMG_BASE) - -# Default bundle image tag -BUNDLE_IMG ?= clastix/capsule:$(VERSION)-bundle # Options for 'bundle-build' ifneq ($(origin CHANNELS), undefined) BUNDLE_CHANNELS := --channels=$(CHANNELS) @@ -268,7 +265,7 @@ ko: #################### pull-upstream: - git remote add upstream https://github.com/clastix/capsule.git + git remote add upstream https://github.com/capsuleproject/capsule.git git fetch --all && git pull upstream define install-kustomize diff --git a/charts/capsule/README.md b/charts/capsule/README.md index d27b79a8b..2d92f3e60 100644 --- a/charts/capsule/README.md +++ b/charts/capsule/README.md @@ -40,6 +40,12 @@ The Capsule Operator Chart can be used to instantly deploy the Capsule Operator $ helm uninstall capsule -n capsule-system +### OCI Installation + + + + + ## Customize the installation There are two methods for specifying overrides of values during chart installation: `--values` and `--set`.