Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

final couple of tweaks kustomize install #1043

Merged
merged 1 commit into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,7 @@ VERSION=$(VERSION)" > $(RELEASE_FILE)
DNS_OPERATOR_VERSION=$(DNS_OPERATOR_VERSION) \
WASM_SHIM_VERSION=$(WASM_SHIM_VERSION) \
RELATED_IMAGE_CONSOLEPLUGIN=$(RELATED_IMAGE_CONSOLEPLUGIN)
$(MAKE) update-catalogsource CATALOG_IMG=$(CATALOG_IMG)

.PHONY: bundle-operator-image-url
bundle-operator-image-url: $(YQ) ## Read operator image reference URL from the manifest bundle.
Expand All @@ -486,6 +487,10 @@ read-release-version: ## Reads release version
print-bundle-image: ## Pring bundle images.
@echo $(BUNDLE_IMG)

.PHONY: update-catalogsource
update-catalogsource:
@$(YQ) e -i '.spec.image = "${CATALOG_IMG}"' config/deploy/olm/catalogsource.yaml

##@ Code Style

GOLANGCI-LINT = $(PROJECT_PATH)/bin/golangci-lint
Expand Down
6 changes: 0 additions & 6 deletions config/install/openshift/kuadrant-version.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions config/install/openshift/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,3 @@ patches:
kind: Subscription
name: sailoperator
path: catalog-patch.yaml
- target:
group: operators.coreos.com
version: v1alpha1
kind: CatalogSource
name: kuadrant-operator-catalog
path: kuadrant-version.yaml
26 changes: 0 additions & 26 deletions config/install/openshift/sail-operator.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion config/install/standard/kuadrant-version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ kind: CatalogSource
metadata:
name: kuadrant-operator-catalog
spec:
image: quay.io/kuadrant/kuadrant-operator-catalog:v1.0.0-rc4 #change this to the version you want to install
image: quay.io/kuadrant/kuadrant-operator-catalog:v1.0.0-rc6 #change this to the version you want to install
24 changes: 9 additions & 15 deletions config/install/standard/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,16 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

# note by default this will install the version of kuadrant you checkout from v1 onwards
# if you want to install a different version you can use the patch option below
resources:
- https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.1.0/standard-install.yaml
- sail-operator.yaml
- ../../deploy/olm

patches:
- target:
group: operators.coreos.com
version: v1alpha1
kind: CatalogSource
name: kuadrant-operator-catalog
path: kuadrant-version.yaml
# - patch: |-
# apiVersion: operators.coreos.com/v1alpha1
# kind: CatalogSource
# metadata:
# name: kuadrant-operator-catalog
# spec:
# image: quay.io/kuadrant/kuadrant-operator-catalog:v1.0.0-rc4 #change this to the version you want to install
# patches:
# - target:
# group: operators.coreos.com
# version: v1alpha1
# kind: CatalogSource
# name: kuadrant-operator-catalog
# path: kuadrant-version.yaml
Loading