From 3c3a164b2ec0f0b45b617f463420bd8eff7075ec Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Sat, 9 Dec 2023 00:56:04 -0800 Subject: [PATCH] Remove community edition and use oci charts Signed-off-by: Tamal Saha --- .../ingress/configuration/custom-templates.md | 8 +- docs/setup/README.md | 12 +- docs/setup/install/community.md | 192 ------------------ .../install/{enterprise.md => voyager.md} | 55 ++--- docs/setup/uninstall/community.md | 50 ----- .../uninstall/{enterprise.md => voyager.md} | 15 +- docs/setup/upgrade/index.md | 87 +------- 7 files changed, 43 insertions(+), 376 deletions(-) delete mode 100644 docs/setup/install/community.md rename docs/setup/install/{enterprise.md => voyager.md} (64%) delete mode 100644 docs/setup/uninstall/community.md rename docs/setup/uninstall/{enterprise.md => voyager.md} (76%) diff --git a/docs/guides/ingress/configuration/custom-templates.md b/docs/guides/ingress/configuration/custom-templates.md index e559c7488..bc658bf5b 100644 --- a/docs/guides/ingress/configuration/custom-templates.md +++ b/docs/guides/ingress/configuration/custom-templates.md @@ -52,10 +52,12 @@ $ kubectl create configmap -n voyager voyager-templates --from-file=/tmp/default Now, the ConfigMap `voyager-templates` has to be mounted in the voyager operator pod and `--custom-templates` flag has to be set. To do this, set `templates.cfgmap` value to Voyager operator chart. ```bash -$ helm install voyager appscode/voyager --version {{< param "info.version" >}} \ - --namespace voyager \ +$ helm install voyager oci://ghcr.io/appscode-charts/voyager \ + --version {{< param "info.version" >}} \ + --namespace voyager --create-namespace \ --set cloudProvider=minikube \ - --set templates.cfgmap=voyager-templates + --set templates.cfgmap=voyager-templates \ + --wait --burst-limit=10000 --debug ``` ![installer](/docs/images/ingress/configuration/custom-template/installer.png) diff --git a/docs/setup/README.md b/docs/setup/README.md index e850f3c5b..9df90d2a4 100644 --- a/docs/setup/README.md +++ b/docs/setup/README.md @@ -18,19 +18,17 @@ aliases: # Setup
- Install Community Edition - Try Enterprise Edition - Compare Editions + Install Voyager

The setup section contains instructions for installing the Voyager and its various components in Kubernetes. This section has been divided into the following sub-sections: - **Install Voyager:** Installation instructions for Voyager and its various components. - - [Community Edition](/docs/setup/install/community.md): Installation instructions for Voyager Community Edition. - - [Enterprise Edition](/docs/setup/install/enterprise.md): Installation instructions for Voyager Enterprise Edition. + - [Voyager](/docs/setup/install/voyager.md): Installation instructions for Voyager. - [Troubleshooting](/docs/setup/install/troubleshooting.md): Troubleshooting guide for various installation problems. + - **Uninstall Voyager:** Uninstallation instructions for Voyager and its various components. - - [Community Edition](/docs/setup/uninstall/community.md): Uninstallation instructions for Voyager Community Edition. - - [Enterprise Edition](/docs/setup/uninstall/enterprise.md): Uninstallation instructions for Voyager Enterprise Edition. + - [Voyager](/docs/setup/uninstall/voyager.md): Uninstallation instructions for Voyager. + - [Upgrading Voyager](/docs/setup/upgrade/index.md): Instruction for updating Voyager license and upgrading between various Voyager versions. diff --git a/docs/setup/install/community.md b/docs/setup/install/community.md deleted file mode 100644 index 65a784de8..000000000 --- a/docs/setup/install/community.md +++ /dev/null @@ -1,192 +0,0 @@ ---- -title: Install Voyager Community Edition -description: Installation guide for Voyager Community edition -menu: - docs_{{ .version }}: - identifier: install-voyager-operator - name: Community Edition - parent: installation-guide - weight: 10 -product_name: voyager -menu_name: docs_{{ .version }} -section_menu_id: setup ---- - -# Install Voyager Community Edition - -Voyager Community edition is available under [AppsCode-Community-1.0.0](https://github.com/appscode/licenses/raw/1.0.0/AppsCode-Community-1.0.0.md) license and free to use for both commercial and non-commercial purposes. `Community Edition` only manages Voyager custom resources in the `demo` Kubernetes namespace. A full features comparison between the Voyager Community edition and Enterprise edition can be found [here](https://voyagermesh.com/pricing/). - -To use the Voyager Community edition, you can grab **1 year** free license from [here](https://license-issuer.appscode.com/?p=voyager-community). After that, you can issue another license for one more year. Typically we release a new version of the operator at least quarterly. So, you can just grab a new license every time you upgrade the operator. - -## Get a License - -In this section, we are going to show you how you can get a **1 year** free license for the Voyager Community edition. You can get a license for your Kubernetes cluster by going through the following steps: - -- At first, go to [AppsCode License Server](https://license-issuer.appscode.com/?p=voyager-community) and fill-up the form. It will ask for your Name, Email, the product you want to install, and your cluster ID (UID of the `kube-system` namespace). -- Provide your name and email address. You can provide your personal or work email address. -- Then, select `Voyager Community Edition` in the product field. -- Now, provide your cluster-ID. You can get your cluster ID easily by running the following command: - - ```bash - $ kubectl get ns kube-system -o=jsonpath='{.metadata.uid}' - ``` - -- Then, you have to agree with the terms and conditions. We recommend reading it before checking the box. -- Now, you can submit the form. After you submit the form, the AppsCode License server will send an email to the provided email address with a link to your license file. -- Navigate to the provided link and save the license into a file. Here, we save the license to a `license.txt` file. - -Here is a screenshot of the license form. - -
- Voyager License Form -
Fig: Voyager License Form
-
- -You can create licenses for as many clusters as you want. You can upgrade your license any time without re-installing Voyager by following the upgrading guide from [here](/docs/setup/upgrade/index.md#updating-license). - -> Voyager licensing process has been designed to work with CI/CD workflow. You can automatically obtain a license from your CI/CD pipeline by following the guide from [here](https://github.com/appscode/offline-license-server#api-reference). - -## Install - -Voyager operator can be installed as a Helm chart or simply as Kubernetes manifests. - - -
-
- -## Using Helm 3 - -Voyager can be installed via [Helm](https://helm.sh/) using the [chart](https://github.com/voyagermesh/installer/tree/{{< param "info.version" >}}/charts/voyager) from [AppsCode Charts Repository](https://github.com/appscode/charts). To install, follow the steps below: - -```bash -$ helm repo add appscode https://charts.appscode.com/stable/ -$ helm repo update - -$ helm search repo appscode/voyager --version {{< param "info.version" >}} -NAME CHART VERSION APP VERSION DESCRIPTION -appscode/voyager {{< param "info.version" >}} {{< param "info.version" >}} Voyager by AppsCode - Secure L7/L4 Ingress Cont... -appscode/voyager-crds {{< param "info.version" >}} {{< param "info.version" >}} Voyager Custom Resource Definitions - -# provider=acs -# provider=aks -# provider=aws -# provider=azure -# provider=baremetal -# provider=gce -# provider=gke -# provider=kind -# provider=openstack -# provider=metallb -# provider=digitalocean -# provider=linode - -$ helm install voyager appscode/voyager \ - --version {{< param "info.version" >}} \ - --namespace voyager --create-namespace \ - --set cloudProvider=$provider \ - --set-file license=/path/to/the/license.txt -``` - -To see the detailed configuration options, visit [here](https://github.com/voyagermesh/installer/tree/{{< param "info.version" >}}/charts/voyager). - -
-
- -## Using YAML - -If you prefer to not use Helm, you can generate YAMLs from Voyager chart and deploy using `kubectl`. Here we are going to show the procedure using Helm 3. - -```bash -$ helm repo add appscode https://charts.appscode.com/stable/ -$ helm repo update - -$ helm search repo appscode/voyager --version {{< param "info.version" >}} -NAME CHART VERSION APP VERSION DESCRIPTION -appscode/voyager {{< param "info.version" >}} {{< param "info.version" >}} Voyager by AppsCode - Secure L7/L4 Ingress Cont... -appscode/voyager-crds {{< param "info.version" >}} {{< param "info.version" >}} Voyager Custom Resource Definitions - -# provider=acs -# provider=aks -# provider=aws -# provider=azure -# provider=baremetal -# provider=gce -# provider=gke -# provider=kind -# provider=openstack -# provider=metallb -# provider=digitalocean -# provider=linode - -$ kubectl create ns voyager -$ helm template voyager appscode/voyager \ - --version {{< param "info.version" >}} \ - --namespace voyager \ - --set cloudProvider=$provider \ - --set-file license=/path/to/the/license.txt \ - --set cleaner.skip=true | kubectl apply -f - -``` - -To see the detailed configuration options, visit [here](https://github.com/voyagermesh/installer/tree/{{< param "info.version" >}}/charts/voyager). - -
-
- -## Verify installation - -To check if Voyager operator pods have started, run the following command: - -```bash -$ kubectl get pods --all-namespaces -l app.kubernetes.io/name=voyager --watch - -NAMESPACE NAME READY STATUS RESTARTS AGE -voyager voyager-operator-84d575d55-5lphm 1/1 Running 0 6m42s -``` - -Once the operator pods are running, you can cancel the above command by typing `Ctrl+C`. - -Now, to confirm CRD groups have been registered by the operator, run the following command: - -```bash -$ kubectl get crd -l app.kubernetes.io/name=voyager -``` - -Now, you are ready to create your first ingress using Voyager. - - -## Configuring RBAC - -Voyager creates an `Ingress` CRD. Voyager installer will create 2 user facing cluster roles: - -| ClusterRole | Aggregates To | Description | -|-----------------------|---------------|---------------------------------------| -| appscode:voyager:edit | admin, edit | Allows edit access to Voyager CRDs, intended to be granted within a namespace using a RoleBinding. | -| appscode:voyager:view | view | Allows read-only access to Voyager CRDs, intended to be granted within a namespace using a RoleBinding. | - -These user facing roles supports [ClusterRole Aggregation](https://kubernetes.io/docs/admin/authorization/rbac/#aggregated-clusterroles) feature in Kubernetes 1.9 or later clusters. - - -## Using kubectl - -Since Voyager uses its own TPR/CRD, you need to use full resource kind to find it with kubectl. - -```bash -# List all voyager ingress -$ kubectl get ingress.voyager.appscode.com --all-namespaces - -# List voyager ingress for a namespace -$ kubectl get ingress.voyager.appscode.com -n - -# Get Ingress YAML -$ kubectl get ingress.voyager.appscode.com -n -o yaml - -# Describe Ingress. Very useful to debug problems. -$ kubectl describe ingress.voyager.appscode.com -n -``` diff --git a/docs/setup/install/enterprise.md b/docs/setup/install/voyager.md similarity index 64% rename from docs/setup/install/enterprise.md rename to docs/setup/install/voyager.md index abad49d6d..67b53ecbf 100644 --- a/docs/setup/install/enterprise.md +++ b/docs/setup/install/voyager.md @@ -1,10 +1,10 @@ --- -title: Install Voyager Enterprise Edition -description: Installation guide for Voyager Enterprise edition +title: Install Voyager +description: Installation guide for Voyager menu: docs_{{ .version }}: identifier: install-voyager-enterprise - name: Enterprise Edition + name: Voyager parent: installation-guide weight: 20 product_name: voyager @@ -12,19 +12,15 @@ menu_name: docs_{{ .version }} section_menu_id: setup --- -# Install Voyager Enterprise Edition +# Install Voyager -Voyager Enterprise edition is the open core version of [Voyager](https://github.com/voyagermesh). `Enterprise Edition` can be used to manage Voyager custom resources in any Kubernetes namespace. A full features comparison between the Voyager Community edition and Enterprise edition can be found [here](https://voyagermesh.com/pricing/). +## Get a Free Trial License -If you are willing to try Voyager Enterprise Edition, you can grab a **30 days trial** license from [here](https://license-issuer.appscode.com/?p=voyager-enterprise). To purchase an Enterprise license, please contact us from [here](https://appscode.com/contact). +In this section, we are going to show you how you can get a **30 days trial** license for Voyager. You can get a license for your Kubernetes cluster by going through the following steps: -## Get a Trial License - -In this section, we are going to show you how you can get a **30 days trial** license for Voyager Enterprise edition. You can get a license for your Kubernetes cluster by going through the following steps: - -- At first, go to [AppsCode License Server](https://license-issuer.appscode.com/?p=voyager-enterprise) and fill up the form. It will ask for your Name, Email, the product you want to install, and your cluster ID (UID of the `kube-system` namespace). +- At first, go to [AppsCode License Server](https://appscode.com/issue-license?p=voyager) and fill up the form. It will ask for your Name, Email, the product you want to install, and your cluster ID (UID of the `kube-system` namespace). - Provide your name and email address. **You must provide your work email address**. -- Then, select `Voyager Enterprise Edition` in the product field. +- Then, select `Voyager` in the product field. - Now, provide your cluster ID. You can get your cluster ID easily by running the following command: ```bash @@ -46,16 +42,14 @@ You can create licenses for as many clusters as you want. You can upgrade your l > Voyager licensing process has been designed to work with CI/CD workflow. You can automatically obtain a license from your CI/CD pipeline by following the guide from [here](https://github.com/appscode/offline-license-server#api-reference). -## Get an Enterprise License +## Purchase Voyager License -If you are interested in purchasing Enterprise license, please contact us via sales@appscode.com for further discussion. You can also set up a meeting via our [calendly link](https://calendly.com/appscode/30min). +If you are interested in purchasing Voyager license, please contact us via sales@appscode.com for further discussion. You can also set up a meeting via our [calendly link](https://calendly.com/appscode/30min). -If you are willing to purchasing Enterprise license but need more time to test in your dev cluster, feel free to contact sales@appscode.com. We will be happy to extend your trial period. +If you are willing to purchase Voyager license but need more time to test in your dev cluster, feel free to contact sales@appscode.com. We will be happy to extend your trial period. ## Install -To activate the Enterprise features, you need to install both Voyager Community operator and Enterprise operator chart. These operators can be installed as a Helm chart or simply as Kubernetes manifests. If you have already installed the Community operator, only install the Enterprise operator (step 4 in the following section). -