Skip to content
This repository was archived by the owner on Dec 16, 2024. It is now read-only.

Gh 269 add channel override #723

Closed
wants to merge 2 commits into from
Closed
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
12 changes: 5 additions & 7 deletions config/add-on-manager/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
resources:
- manager.yaml
- cluster-management-addon.yaml


- manager.yaml
- cluster-management-addon.yaml
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: addon-manager
newName: quay.io/kuadrant/addon-manager
newTag: main
- name: addon-manager
newName: quay.io/kuadrant/addon-manager
newTag: release-0.3
9 changes: 4 additions & 5 deletions config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
resources:
- manager.yaml

- manager.yaml
images:
- name: controller
newName: quay.io/kuadrant/multicluster-gateway-controller
newTag: main
- name: controller
newName: quay.io/kuadrant/multicluster-gateway-controller
newTag: release-0.3
9 changes: 4 additions & 5 deletions config/policy-controller/manager/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
resources:
- manager.yaml

- manager.yaml
images:
- name: policy-controller
newName: quay.io/kuadrant/policy-controller
newTag: main
- name: policy-controller
newName: quay.io/kuadrant/policy-controller
newTag: release-0.3
4 changes: 2 additions & 2 deletions docs/installation/control-plane-installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export HUB_CLUSTER=<hub-cluster-name>
[Cert-manager](https://cert-manager.io/) first needs to be installed on your hub cluster. If this has not previously been installed on the cluster you can run the command below to do so:

```bash
kustomize --load-restrictor LoadRestrictionsNone build "github.com/kuadrant/multicluster-gateway-controller.git/config/mgc-install-guide/cert-manager?ref=release-0.2" --enable-helm | kubectl apply -f - --context $HUB_CLUSTER
kustomize --load-restrictor LoadRestrictionsNone build "github.com/kuadrant/multicluster-gateway-controller.git/config/mgc-install-guide/cert-manager?ref=release-0.3" --enable-helm | kubectl apply -f - --context $HUB_CLUSTER
```

## Installing MGC
Expand All @@ -59,7 +59,7 @@ customresourcedefinition.apiextensions.k8s.io/httproutes.gateway.networking.k8s.
Then run the following command to install the MGC:

```bash
kubectl apply -k "github.com/kuadrant/multicluster-gateway-controller.git/config/mgc-install-guide?ref=release-0.2" --context $HUB_CLUSTER
kubectl apply -k "github.com/kuadrant/multicluster-gateway-controller.git/config/mgc-install-guide?ref=release-0.3" --context $HUB_CLUSTER
```

In addition to the MGC, this will also install the Kuadrant add-on manager and a `GatewayClass` from which MGC-managed `Gateways` can be instantiated.
Expand Down
12 changes: 10 additions & 2 deletions docs/installation/service-protection-installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ This walkthrough will show you how to install and setup the Kuadrant Operator in
To install the Kuadrant Service Protection components into a spoke `ManagedCluster`, target your OCM Hub cluster with `kubectl` and run:

```
kubectl apply -k "github.com/kuadrant/multicluster-gateway-controller.git/config/service-protection-install-guide?ref=release-0.2" -n namespace-of-your-managed-spoke-cluster-on-the-hub
kubectl apply -k "github.com/kuadrant/multicluster-gateway-controller.git/config/service-protection-install-guide?ref=release-0.3" -n namespace-of-your-managed-spoke-cluster-on-the-hub
```

The above command will install the `ManagedClusterAddOn` resource needed to install the Kuadrant addon into the namespace representing a spoke cluster, and install the Kuadrant data-plane components into the `open-cluster-management-agent-addon` namespace.
Expand Down Expand Up @@ -59,7 +59,15 @@ To let the Kuadrant operator use this existing installation, set the following:

`kubectl annotate managedclusteraddon kuadrant-addon "addon.open-cluster-management.io/values"='{"IstioOperator":"installed-state"}' -n <managed spoke cluster>`

This will propogate down and update the Kuadrant Operator, used by the Kuadrant OCM Addon.
This will propagate down and update the Kuadrant Operator, used by the Kuadrant OCM Addon.

### Changing the name of the channel to use

If you want to use a different channel with the `ManagedClusterAddon` to install the kuadrant operator. You can do so by overriding the channel with the follow annotation:

`kubectl annotate managedclusteraddon kuadrant-addon "addon.open-cluster-management.io/values"='{"CatalogSourceNS":"openshift-marketplace", "CatalogSource":"community-operators", "Channel":"preview"}' -n managed-cluster-ns`

This will propagate down and update the Kuadrant Subscription, used by OLM in the spoke.

## Verify the Kuadrant addon installation

Expand Down