Skip to content
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
3 changes: 0 additions & 3 deletions app/_how-tos/operator-get-started-hybrid-install.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ works_on:
min_version:
operator: '1.6.1'


entities: []

tldr:
q: How do I install {{ site.operator_product_name }} in {{ site.konnect_short_name }} hybrid mode?
a: Update the Helm repository and use Helm to install {{ site.operator_product_name }} in {{ site.konnect_short_name }}.
Expand Down
7 changes: 0 additions & 7 deletions app/_how-tos/operator-get-started-kic-install.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,6 @@ tags:
- install
- helm
---
{% assign gwapi_version = "1.3.0" %}

## Install CRDs

```shell
kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v{{ gwapi_version }}/standard-install.yaml
```

{% include k8s/kong-namespace.md %}

Expand Down
65 changes: 55 additions & 10 deletions app/_includes/prereqs/products/operator.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,23 @@
{% if prereqs.enterprise %}
{% assign summary = summary | append:' (with an Enterprise license)' %}
{% endif %}

{% capture license %}
```
echo "
apiVersion: configuration.konghq.com/v1alpha1
kind: KongLicense
metadata:
name: kong-license
rawLicenseString: '$(cat ./license.json)'
" | kubectl apply -f -
```
{% endcapture %}

{% capture cert %}
{% include k8s/cert-manager.md %}
{% endcapture %}

{% capture details_content %}

1. Add the Kong Helm charts:
Expand All @@ -16,40 +33,68 @@

{% if include.v_maj == 1 %}

{% if page.works_on contains "konnect"%}

```bash
helm upgrade --install kgo kong/gateway-operator -n kong-system \
--create-namespace \
--set env.ENABLE_CONTROLLER_KONNECT=true{% if prereqs.operator.controllers %} \{% for controller in prereqs.operator.controllers %}
--set env.ENABLE_CONTROLLER_{{ controller | upcase }}=true{% unless forloop.last %} \{% endunless %}{% endfor %}{% endif %}
```
{:data-deployment-topology='konnect'}
{% endif %}
{% if page.works_on contains "on-prem"%}
```bash
helm upgrade --install kgo kong/gateway-operator -n kong-system \
--create-namespace{% if prereqs.operator.controllers %} \{% for controller in prereqs.operator.controllers %}
--set env.ENABLE_CONTROLLER_{{ controller | upcase }}=true{% unless forloop.last %} \{% endunless %}{% endfor %}{% endif %}
```
{:data-deployment-topology='on-prem'}
{% endif %}
{% else %}
{% if page.works_on contains "konnect"%}
```bash
helm upgrade --install kong-operator kong/kong-operator -n kong-system \
--create-namespace \
--set image.tag={{ site.data.operator_latest.release }} \
--set env.ENABLE_CONTROLLER_KONNECT=true{% if prereqs.operator.controllers %} \{% for controller in prereqs.operator.controllers %}
--set env.ENABLE_CONTROLLER_{{ controller | upcase }}=true{% unless forloop.last %} \{% endunless %}{% endfor %}{% endif %}
```
{:data-deployment-topology='konnect'}
{% endif %}
{% if page.works_on contains "on-prem"%}
```bash
helm upgrade --install kong-operator kong/kong-operator -n kong-system \
--create-namespace \
--set image.tag={{ site.data.operator_latest.release }}{% if prereqs.operator.controllers %} \{% for controller in prereqs.operator.controllers %}
--set env.ENABLE_CONTROLLER_{{ controller | upcase }}=true{% unless forloop.last %} \{% endunless %}{% endfor %}{% endif %}
```
{:data-deployment-topology='on-prem'}
{% endif %}
{% endif %}
{% include k8s/cert-manager.md %}
{{cert | indent: 3}}
{% if prereqs.enterprise %}
1. Apply a `KongLicense`. This assumes that your license is available in `./license.json`
{{license | indent: 3}}
{% else %}
This tutorial doesn't require a license, but you can add one using `KongLicense`. This assumes that your license is available in `./license.json`.
{{license}}
```
echo "
apiVersion: configuration.konghq.com/v1alpha1
kind: KongLicense
metadata:
name: kong-license
rawLicenseString: '$(cat ./license.json)'
" | kubectl apply -f -
```
{% endif %}
{% endcapture %}
Expand Down
Loading