fixes

Author: lmilan

app/_how-tos/operator-get-started-gateway-api-1-install.md

@@ -50,9 +50,7 @@ kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/downloa
 
 {% include prereqs/products/operator.md raw=true v_maj=2 %}
 
-{% tip %}
 {% include k8s/cert-manager.md raw=true %}
-{% endtip %}
 
 ## Validate
 

app/_includes/prereqs/products/operator.md

@@ -3,35 +3,69 @@
 {% if prereqs.enterprise %}
 {% assign summary = summary | append:' (with an Enterprise license)' %}
 {% endif %}
-{% capture details_content %}
 
-Install {{ site.operator_product_name }} using Helm:
+{% capture license %}
+```
+echo "
+apiVersion: configuration.konghq.com/v1alpha1
+kind: KongLicense
+metadata:
+ name: kong-license
+rawLicenseString: '$(cat ./license.json)'
+" | kubectl apply -f -
+```
+{% endcapture %}
 
-{% if include.v_maj == 1 %}
+{% capture cert %}
+{% include k8s/cert-manager.md %}
+{% endcapture %}
+
+{% capture details_content %}
+
+1. Add the Kong Helm charts:
 
    ```bash
    helm repo add kong https://charts.konghq.com
    helm repo update
+   ```
+
+1. Install {{ site.operator_product_name }} using Helm:
+
+{% if include.v_maj == 1 %}
+
+   ```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'}
+
+   ```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'}
 
 {% else %}
-{: data-deployment-topology="konnect" }
+   
    ```bash
-   helm upgrade --install kong-operator ./charts/kong-operator -n kong-system \
+   helm upgrade --install kong-operator kong/kong-operator -n kong-system \
      --create-namespace \
-     --set image.tag=2.1.0{% if prereqs.operator.controllers %} \{% for controller in prereqs.operator.controllers %}
-     --set env.ENABLE_CONTROLLER_KONNECT=true
+     --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'}
 
-{: data-deployment-topology="on-prem" } 
    ```bash
-   helm upgrade --install kong-operator ./charts/kong-operator -n kong-system \
+   helm upgrade --install kong-operator kong/kong-operator -n kong-system \
      --create-namespace \
-     --set image.tag=2.1.0
+     --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 %}
 
@@ -40,18 +74,12 @@ Install {{ site.operator_product_name }} using Helm:
 {% include k8s/ca-cert.md %}
 
 {% if prereqs.enterprise %}
-
 1. Apply a `KongLicense`. This assumes that your license is available in `./license.json`
+{{license | indent: 3}}
 
-   ```bash
-   echo "
-   apiVersion: configuration.konghq.com/v1alpha1
-   kind: KongLicense
-   metadata:
-    name: kong-license
-   rawLicenseString: '$(cat ./license.json)'
-   " | kubectl apply -f -
-   ```
+{% 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}}
 
 {% endif %}
 {% endcapture %}
@@ -60,4 +88,4 @@ Install {{ site.operator_product_name }} using Helm:
 {{ details_content }}
 {% else %}
 {% include how-tos/prereq_cleanup_item.html summary=summary details_content=details_content icon_url='/assets/icons/kubernetes.svg' %}
-{% endif %}
+{% endif %}

app/_landing_pages/operator.yaml

@@ -19,7 +19,7 @@ rows:
       - blocks:
           - type: text
             config: |
-              {{ site.operator_product_name }} is the Kubernetes-native way to interact with Kong. Driven by Gateway API or Kong-specific Custom Resource Definitions (CRDs, {{ site.operator_product_name }} allows you to deploy and configure Kong's products 
+              {{ site.operator_product_name }} is the Kubernetes-native way to interact with Kong. Driven by Gateway API or Kong-specific Custom Resource Definitions (CRDs), {{ site.operator_product_name }} allows you to deploy and configure Kong's products 
               in a declarative way.
 
   - header:
@@ -41,12 +41,12 @@ rows:
         - type: card
           config:
             icon: /assets/logos/konglogo-gradient-secondary.svg
-            title: "Manage {{ site.base_gateway }} in Kubernetes through the Konnect CRDs"
+            title: "Manage {{ site.base_gateway }} in Kubernetes through the {{site.konnect_short_name}} CRDs"
             description: |
               Deploy and configure {{ site.base_gateway }} in Kubernetes using Kong-specific Custom Resource Definitions (CRDs)
               provided by {{ site.operator_product_name }}.
             cta:
-              text: Deploy {{ site.base_gateway }} in Kubernetes using Konnect CRDs
+              text: Deploy {{ site.base_gateway }} in Kubernetes using {{site.konnect_short_name}} CRDs
               url: /operator/get-started/konnect-crds/install/
 
   - header:
@@ -97,7 +97,7 @@ rows:
         - type: structured_text
           config:
             header:
-              text: Konnect configuration CRDs
+              text: "{{site.konnect_short_name}} configuration CRDs"
             blocks:
             - type: text
               text: |
@@ -114,7 +114,7 @@ rows:
               name: echo
               namespace: default
             spec:
-              # reference the Konnect/Gateway control plane defined in Konnect
+              # reference the {{site.konnect_short_name}}/Gateway control plane defined in {{site.konnect_short_name}}
               controlPlaneRef:
                 type: konnectNamespacedRef
                 konnectNamespacedRef:
@@ -156,7 +156,7 @@ rows:
             blocks:
             - type: text
               text: |
-                We built Konnect CRDs after listening to _you_. Users told us that their teams are used to working in Kubernetes. They have policy 
+                We built {{site.konnect_short_name}} CRDs after listening to _you_. Users told us that their teams are used to working in Kubernetes. They have policy 
                 enforcement engines running in their clusters, and well defined review processes for CRD changes.
 
                 Now we need your help. We're expanding CRD support to new products, and need you to tell us which APIs you want us to build first.