From a65d64dd2562cd6f4363351bc9d850827c34c1cc Mon Sep 17 00:00:00 2001 From: uma-kt <105046156+uma-kt@users.noreply.github.com> Date: Mon, 14 Aug 2023 13:57:54 +0530 Subject: [PATCH 1/8] update the missing parameter description --- .../kubeslice-cli/command-reference.mdx | 16 ++++++++-------- .../kubeslice-cli/install-kubeslice.mdx | 10 ++++++++++ .../kubeslice-cli/topology-configuration.mdx | 6 +++--- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/command-reference.mdx b/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/command-reference.mdx index 9e1c1451..ed0c7bcb 100644 --- a/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/command-reference.mdx +++ b/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/command-reference.mdx @@ -35,13 +35,13 @@ The following are the kubeslice-cli options. | --version | -v | It is the version of the `kubeslice-cli` tool. | :::note -The kubeslice-cli tool must have access to the clusters you want it to manage. To grant it access, set the KUBECONFIG environment variable to -a path to the kubeconfig file containing the necessary keys to access those clusters. -To set the KUBECONFIG environment varible, use these commands: +The kubeslice-cli tool must have access to the clusters you want it to manage. To grant it access, set the KUBECONFIG environment +variable to a path to the kubeconfig file containing the necessary keys to access those clusters. +To set the KUBECONFIG environment variable, use these commands: - On Linux/macOS: `export KUBECONFIG=` - On Windows: `$env:KUBECONFIG = "kubeslice/kubeconfig.yaml"` - ::: +::: :::caution @@ -49,7 +49,7 @@ To set the KUBECONFIG environment varible, use these commands: following command to determine which context you are currently in: `kubectx -c`. - The currently supported operations are all controller cluster specific. You must run the kubeslice-cli commands on the controller cluster. use this command to switch the cluster context: `kubectx `. - ::: +::: ## create @@ -593,7 +593,7 @@ Use this command to install the required workloads to run KubeSlice Controller a ``` kubeslice-cli --config kubeslice-cli install -kubeslice-cli install --profile= +kubeslice-cli install --profile= ``` ### Options @@ -602,8 +602,8 @@ The following are the `kubeslice-cli install` command options. | Option | Shorthand | Description | Supported Values | | ------------------- | --------- | ----------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| --profile | -p | It is the profile to install or uninstall KubeSlice. | **full-demo**: showcases the KubeSlice inter-cluster connectivity by spawning 3 kind clusters, including 1 KubeSlice Controller and 2 worker clusters, and installing iPerf application to generate network traffic. **minimal-demo**: sets up 3 kind clusters, including 1 KubeSlice Controller and 2 worker clusters. Generates the Kubernetes manifests for user to manually apply, and verify the functionality. | -| --skip | -s | It skips the installation steps (comma-separated) with `minimal-demo` and `full-demo` options. | **kind**: skips the creation of kind clusters. **calico**: skips the installation of Calico. **controller**: skips the installation of KubeSlice Controller. **worker-registration**: skips the registration of worker clusters with the KubeSlice Controller. **worker**: skips the installation of worker clusters. **demo**: skips the installation of additional example applications. | +| --profile | -p | It is the profile to install or uninstall KubeSlice. | **full-demo**: showcases the KubeSlice inter-cluster connectivity by spawning 3 kind clusters, including 1 KubeSlice Controller and 2 worker clusters, and installing iPerf application to generate network traffic. **minimal-demo**: sets up 3 kind clusters, including 1 KubeSlice Controller and 2 worker clusters. Generates the Kubernetes manifests for user to manually apply, and verify the functionality. **enterprise-demo**: showcases the KubeSlice Enterprise functionality by spawning 3 kind clusters, including 1 KubeSlice Controller and 2 KubeSlice Workers. Installs the Enterprise charts for the controller, the worker(s), the KubeSlice Manager (UI), and iPerf application to generate network traffic. The imagePullSecrets (username and password) listed must be set as environment variables: **KUBESLICE_IMAGE_PULL_USERNAME**: `optional`, the default value is `aveshaenterprise`. **KUBESLICE_IMAGE_PULL_PASSWORD**: `required`. | +| --skip | -s | It skips the installation steps (comma-separated) with `minimal-demo`, `full-demo`, and `enterprise-demo` options. | **kind**: skips the creation of kind clusters. **calico**: skips the installation of Calico. **controller**: skips the installation of KubeSlice Controller. **worker-registration**: skips the registration of worker clusters with the KubeSlice Controller. **worker**: skips the installation of worker clusters. **demo**: skips the installation of additional example applications. **prometheus**: skips the installation of the Prometheus. | | --config | -c | It is a **global** option. The path to the topology configuration YAML file. | | --with-cert-manager | | It installs the cert-manager charts. **This is required for the KubeSlice Controller v0.7.0 and below versions.** | | --help | -h | It provides information on the install command. | diff --git a/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/install-kubeslice.mdx b/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/install-kubeslice.mdx index 95e711e1..03e7fc9d 100644 --- a/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/install-kubeslice.mdx +++ b/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/install-kubeslice.mdx @@ -13,6 +13,16 @@ controller cluster and the worker cluster names. The file should include other r as described in the sample configuration file provided below. This file is essential in setting up KubeSlice. +Custom chart values can be specified in the topology configuration. For example, you can add `values:metrics.insecure=true` under +**configuration.helm_chart_configuration.worker_chart** for worker charts. +``` +worker_chart: + chart_name: kubeslice-worker + values: + "metrics.insecure": "true" + "some.other.key": "value" +``` + ### Sample Topology Configuration File The following a minimal configuration file to install KubeSlice Enterprise on cloud clusters: diff --git a/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx b/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx index 8e5ca5b9..7d387043 100644 --- a/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx +++ b/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx @@ -19,7 +19,7 @@ The following table describes the controller cluster configuration parameters us | Parameter | Parameter Type | Description | Required | | --------------------- | -------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------- | -| name | String | The user-defined name of the controller cluster. | Mandatory | +| name | String | The user-defined name of the controller cluster. The maximum allowed number of characters is 30. Provide the name as defined in [RFC 1123](#https://datatracker.ietf.org/doc/html/rfc1123). To know more, see [Kubernetes Object Names and IDs](https://kubernetes.io/docs/concepts/overview/working-with-objects/names/). | Mandatory | | context_name | String | The name of the context to use from the kubeconfig file; It is used in the topology YAML file. | Optional | | kube_config_path | String | The absolute path to the kubeconfig file to install controller cluster. This takes precedence over the kubeconfig path defined under cluster configuration. | Optional | | control_plane_address | AlphaNumeric | The address of the control plane kube-apiserver. The kubeslice-cli determines the address from kubeconfig. Override this option if the address in the kubeconfig is not reachable by other clusters in the topology. | Mandatory | @@ -32,7 +32,7 @@ The following table describes the worker cluster configuration parameters. | Parameter | Parameter Type | Description | Required | | --------------------- | -------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------- | | name | String | The user-defined name of the worker cluster. | Mandatory | -| context_name | String | The name of the context to use from kubeconfig file; It is used in the topology YAML only. | Optional | +| context_name | String | The name of the context to use from kubeconfig file; It is used in the topology YAML only. Use the short alias name. For example, you can use `worker-cluster` or `api-cluster` as the cluster contexts. | Optional | | kube_config_path | String | The absolute path to the kubeconfig file to install a worker cluster. This takes precedence over the kubeconfig path defined under cluster configuration. | Optional | | control_plane_address | AlphaNumeric | The address of the control plane `kube-apiserver`. The kubeslice-cli determines the address from kubeconfig. Override this option if the address in the kubeconfig is not reachable by other clusters in the topology. | Mandatory | | node_ip | Numeric | The IP address of one of the node in the cluster. The kubeslice-cli determines the address from this command:`kubectl get nodes`. Override this option to an address which is discoverable by other clusters in the topology. | Mandatory | @@ -42,7 +42,7 @@ The following table describes the KubeSlice configuration parameters. | Parameter | Parameter Type | Description | Required | | ------------- | -------------- | ---------------------------------------------------------------------------------------------------------------------------------------------- | --------- | -| project_name | String | the user-defined name of the Kubeslice project. | Mandatory | +| project_name | String | the user-defined name of the Kubeslice project. The maximum allowed number of characters is 30. Provide the name as defined in [RFC 1123](#https://datatracker.ietf.org/doc/html/rfc1123). To know more, see [Kubernetes Object Names and IDs](https://kubernetes.io/docs/concepts/overview/working-with-objects/names/). | Mandatory | | project_users | String | This contains the list of KubeSlice project users to be created. The users will have read/write privileges. By default, admin user is created. | Optional | ## Helm Chart Configuration Parameters From fb012819151350c351d5be25567b02f3122ea555 Mon Sep 17 00:00:00 2001 From: uma-kt <105046156+uma-kt@users.noreply.github.com> Date: Mon, 14 Aug 2023 14:20:02 +0530 Subject: [PATCH 2/8] updated the missing chart description --- .../kubeslice-cli/topology-configuration.mdx | 55 +++++++++++++++++-- 1 file changed, 51 insertions(+), 4 deletions(-) diff --git a/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx b/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx index 7d387043..003cac32 100644 --- a/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx +++ b/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx @@ -31,8 +31,8 @@ The following table describes the worker cluster configuration parameters. | Parameter | Parameter Type | Description | Required | | --------------------- | -------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------- | -| name | String | The user-defined name of the worker cluster. | Mandatory | -| context_name | String | The name of the context to use from kubeconfig file; It is used in the topology YAML only. Use the short alias name. For example, you can use `worker-cluster` or `api-cluster` as the cluster contexts. | Optional | +| name | String | The user-defined name of the worker cluster. The maximum allowed number of characters is 30. Provide the name as defined in [RFC 1123](#https://datatracker.ietf.org/doc/html/rfc1123). To know more, see [Kubernetes Object Names and IDs](https://kubernetes.io/docs/concepts/overview/working-with-objects/names/). | Mandatory | +| context_name | String | The name of the context to use from kubeconfig file; It is used in the topology YAML only. Use the short alias name. For example, you can use `worker-cluster` or `api-cluster` as the cluster contexts. | Optional | | kube_config_path | String | The absolute path to the kubeconfig file to install a worker cluster. This takes precedence over the kubeconfig path defined under cluster configuration. | Optional | | control_plane_address | AlphaNumeric | The address of the control plane `kube-apiserver`. The kubeslice-cli determines the address from kubeconfig. Override this option if the address in the kubeconfig is not reachable by other clusters in the topology. | Mandatory | | node_ip | Numeric | The IP address of one of the node in the cluster. The kubeslice-cli determines the address from this command:`kubectl get nodes`. Override this option to an address which is discoverable by other clusters in the topology. | Mandatory | @@ -55,9 +55,11 @@ The following table describes the helm chart configuration parameters. | [cert_manager_chart](#certificate-manager-chart-configuration-parameters) | Object | The cert-manager chart details. | Mandatory | | [controller_chart](#controller-chart-configuration-parameters) | Object | The Kubeslice Controller chart details. | Mandatory | | [worker_chart](#worker-chart-configuration-parameters) | Object | The KubeSlice Worker chart details. | Mandatory | +| [ui_chart](#ui-chart-configuration-parameters) | Object | The KubeSlice Manager chart details. Required for Enterprise charts only. | Optional | +| [prometheus_chart](#prometheus-chart-configuration-parameters) | Object | The Prometheus chart details. Required for Enterprise charts only. | Optional | | helm_username | AlphaNumeric | The helm username if the repo is private. | Optional | | helm_password | AlphaNumeric | The helm password if the repo is private. | Optional | -| [image_pull_secret](#image-pull-configuration-parameters) | Object | The image pull secrets to pull the Kubernetes dashboard image. Required for Enterprise charts. | Mandatory | +| [image_pull_secret](#image-pull-configuration-parameters) | Object | The image pull secrets to pull the Kubernetes dashboard image. Required for Enterprise charts only. | Mandatory | ## Certificate Manager Chart Configuration Parameters The following table describes the certificate manager chart configuration parameters used to create topology YAML. @@ -85,6 +87,34 @@ The following table describes the worker chart configuration parameters used to | version | Numeric | The version of the chart. Leave this value blank for the latest version. | Optional | | values | String | The additional value that can be passed as --set arguments for **helm install**. | Optional | +## UI Chart Configuration Parameters +The following table describes the UI chart configuration parameters used to create topology YAML. + +| Parameter | Parameter Type | Description | Required | +| ---------- | -------------- | -------------------------------------------------------------------------------- | --------- | +| chart_name | String | The name of the UI or enterprise chart. | Mandatory | +| version | Numeric | The version of the chart. Leave it blank for the latest version. | Optional | +| values | String | The additional value that can be passed as --set arguments for **helm install**. | Optional | + +## Prometheus Chart Configuration parameters +The following table describes the Prometheus chart configuration parameters used to create topology YAML. + +| Parameter | Parameter Type | Description | Required | +| ---------- | -------------- | -------------------------------------------------------------------------------- | --------- | +| chart_name | String | The name of the Prometheus chart. | Mandatory | +| version | Numeric | The version of the chart. Leave it blank for the latest version. | Optional | +| values | String | The additional value that can be passed as --set arguments for **helm install**. | Optional | + +## Image Pull Secret Configuration Parameters +The following table describes the image pull secret configuration parameters used to create topology YAML. + +| Parameter | Parameter Type | Description | Required | +| --------- | -------------- | ------------------------------------------------------ | --------- | +| registry | String | The endpoint of the OCI registry to use. | Mandatory | +| username | AlphaNumeric | The username to authenticate against the OCI registry. | Mandatory | +| password | AlphaNumeric | The password to authenticate against the OCI registry. | Mandatory | +| email | AlphaNumeric | The email to authenticate against the OCI registry. | Mandatory | + :::note @@ -131,7 +161,7 @@ configuration: #{Override this flag to an address which is discoverable by other clusters in the topology} kubeslice_configuration: project_name: #{the name of the KubeSlice Project} - project_users: #{optional: specify KubeSlice Project users with Readw-Write access. Default is admin} + project_users: #{optional: specify KubeSlice Project users with Read-Write access. Default is admin} helm_chart_configuration: repo_alias: #{The alias of the helm repo for KubeSlice Charts} repo_url: #{The URL of the Helm Charts for KubeSlice} @@ -146,4 +176,21 @@ configuration: chart_name: #{The name of the Worker Chart} version: #{The version of the chart to use. Leave blank for latest version} values: #(Values to be passed as --set arguments to helm install) + + # The ui_chart, prometheus_chart, and image_pull_secret parameters are required for enterprise chart only + ui_chart: + chart_name: #{The name of the UI/Enterprise Chart} + version: #{The version of the chart to use. Leave blank for latest version} + values: #(Values to be passed as --set arguments to helm install) + prometheus_chart: + chart_name: #{The name of the Prometheus Chart} + version: #{The version of the chart to use. Leave blank for latest version} + values: #(Values to be passed as --set arguments to helm install) + helm_username: #{Helm Username if the repo is private} + helm_password: #{Helm Password if the repo is private} + image_pull_secret: #{The image pull secrets. Optional for OpenSource, required for enterprise} + registry: #{The endpoint of the OCI registry to use. Default is `https://index.docker.io/v1/`} + username: #{The username to authenticate against the OCI registry} + password: #{The password to authenticate against the OCI registry} + email: #{The email to authenticate against the OCI registry} ``` \ No newline at end of file From faa80ede768e5728415d44fc19621b1e7c47256d Mon Sep 17 00:00:00 2001 From: uma-kt <105046156+uma-kt@users.noreply.github.com> Date: Mon, 14 Aug 2023 14:25:45 +0530 Subject: [PATCH 3/8] updated the parameter description in the v1.0.0 docs --- .../kubeslice-cli/command-reference.mdx | 16 ++--- .../kubeslice-cli/install-kubeslice.mdx | 10 ++++ .../kubeslice-cli/topology-configuration.mdx | 59 +++++++++++++++++-- 3 files changed, 71 insertions(+), 14 deletions(-) diff --git a/versioned_docs/version-1.0.0/install-kubeslice/kubeslice-cli/command-reference.mdx b/versioned_docs/version-1.0.0/install-kubeslice/kubeslice-cli/command-reference.mdx index 9e1c1451..ed0c7bcb 100644 --- a/versioned_docs/version-1.0.0/install-kubeslice/kubeslice-cli/command-reference.mdx +++ b/versioned_docs/version-1.0.0/install-kubeslice/kubeslice-cli/command-reference.mdx @@ -35,13 +35,13 @@ The following are the kubeslice-cli options. | --version | -v | It is the version of the `kubeslice-cli` tool. | :::note -The kubeslice-cli tool must have access to the clusters you want it to manage. To grant it access, set the KUBECONFIG environment variable to -a path to the kubeconfig file containing the necessary keys to access those clusters. -To set the KUBECONFIG environment varible, use these commands: +The kubeslice-cli tool must have access to the clusters you want it to manage. To grant it access, set the KUBECONFIG environment +variable to a path to the kubeconfig file containing the necessary keys to access those clusters. +To set the KUBECONFIG environment variable, use these commands: - On Linux/macOS: `export KUBECONFIG=` - On Windows: `$env:KUBECONFIG = "kubeslice/kubeconfig.yaml"` - ::: +::: :::caution @@ -49,7 +49,7 @@ To set the KUBECONFIG environment varible, use these commands: following command to determine which context you are currently in: `kubectx -c`. - The currently supported operations are all controller cluster specific. You must run the kubeslice-cli commands on the controller cluster. use this command to switch the cluster context: `kubectx `. - ::: +::: ## create @@ -593,7 +593,7 @@ Use this command to install the required workloads to run KubeSlice Controller a ``` kubeslice-cli --config kubeslice-cli install -kubeslice-cli install --profile= +kubeslice-cli install --profile= ``` ### Options @@ -602,8 +602,8 @@ The following are the `kubeslice-cli install` command options. | Option | Shorthand | Description | Supported Values | | ------------------- | --------- | ----------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| --profile | -p | It is the profile to install or uninstall KubeSlice. | **full-demo**: showcases the KubeSlice inter-cluster connectivity by spawning 3 kind clusters, including 1 KubeSlice Controller and 2 worker clusters, and installing iPerf application to generate network traffic. **minimal-demo**: sets up 3 kind clusters, including 1 KubeSlice Controller and 2 worker clusters. Generates the Kubernetes manifests for user to manually apply, and verify the functionality. | -| --skip | -s | It skips the installation steps (comma-separated) with `minimal-demo` and `full-demo` options. | **kind**: skips the creation of kind clusters. **calico**: skips the installation of Calico. **controller**: skips the installation of KubeSlice Controller. **worker-registration**: skips the registration of worker clusters with the KubeSlice Controller. **worker**: skips the installation of worker clusters. **demo**: skips the installation of additional example applications. | +| --profile | -p | It is the profile to install or uninstall KubeSlice. | **full-demo**: showcases the KubeSlice inter-cluster connectivity by spawning 3 kind clusters, including 1 KubeSlice Controller and 2 worker clusters, and installing iPerf application to generate network traffic. **minimal-demo**: sets up 3 kind clusters, including 1 KubeSlice Controller and 2 worker clusters. Generates the Kubernetes manifests for user to manually apply, and verify the functionality. **enterprise-demo**: showcases the KubeSlice Enterprise functionality by spawning 3 kind clusters, including 1 KubeSlice Controller and 2 KubeSlice Workers. Installs the Enterprise charts for the controller, the worker(s), the KubeSlice Manager (UI), and iPerf application to generate network traffic. The imagePullSecrets (username and password) listed must be set as environment variables: **KUBESLICE_IMAGE_PULL_USERNAME**: `optional`, the default value is `aveshaenterprise`. **KUBESLICE_IMAGE_PULL_PASSWORD**: `required`. | +| --skip | -s | It skips the installation steps (comma-separated) with `minimal-demo`, `full-demo`, and `enterprise-demo` options. | **kind**: skips the creation of kind clusters. **calico**: skips the installation of Calico. **controller**: skips the installation of KubeSlice Controller. **worker-registration**: skips the registration of worker clusters with the KubeSlice Controller. **worker**: skips the installation of worker clusters. **demo**: skips the installation of additional example applications. **prometheus**: skips the installation of the Prometheus. | | --config | -c | It is a **global** option. The path to the topology configuration YAML file. | | --with-cert-manager | | It installs the cert-manager charts. **This is required for the KubeSlice Controller v0.7.0 and below versions.** | | --help | -h | It provides information on the install command. | diff --git a/versioned_docs/version-1.0.0/install-kubeslice/kubeslice-cli/install-kubeslice.mdx b/versioned_docs/version-1.0.0/install-kubeslice/kubeslice-cli/install-kubeslice.mdx index 95e711e1..03e7fc9d 100644 --- a/versioned_docs/version-1.0.0/install-kubeslice/kubeslice-cli/install-kubeslice.mdx +++ b/versioned_docs/version-1.0.0/install-kubeslice/kubeslice-cli/install-kubeslice.mdx @@ -13,6 +13,16 @@ controller cluster and the worker cluster names. The file should include other r as described in the sample configuration file provided below. This file is essential in setting up KubeSlice. +Custom chart values can be specified in the topology configuration. For example, you can add `values:metrics.insecure=true` under +**configuration.helm_chart_configuration.worker_chart** for worker charts. +``` +worker_chart: + chart_name: kubeslice-worker + values: + "metrics.insecure": "true" + "some.other.key": "value" +``` + ### Sample Topology Configuration File The following a minimal configuration file to install KubeSlice Enterprise on cloud clusters: diff --git a/versioned_docs/version-1.0.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx b/versioned_docs/version-1.0.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx index 8e5ca5b9..003cac32 100644 --- a/versioned_docs/version-1.0.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx +++ b/versioned_docs/version-1.0.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx @@ -19,7 +19,7 @@ The following table describes the controller cluster configuration parameters us | Parameter | Parameter Type | Description | Required | | --------------------- | -------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------- | -| name | String | The user-defined name of the controller cluster. | Mandatory | +| name | String | The user-defined name of the controller cluster. The maximum allowed number of characters is 30. Provide the name as defined in [RFC 1123](#https://datatracker.ietf.org/doc/html/rfc1123). To know more, see [Kubernetes Object Names and IDs](https://kubernetes.io/docs/concepts/overview/working-with-objects/names/). | Mandatory | | context_name | String | The name of the context to use from the kubeconfig file; It is used in the topology YAML file. | Optional | | kube_config_path | String | The absolute path to the kubeconfig file to install controller cluster. This takes precedence over the kubeconfig path defined under cluster configuration. | Optional | | control_plane_address | AlphaNumeric | The address of the control plane kube-apiserver. The kubeslice-cli determines the address from kubeconfig. Override this option if the address in the kubeconfig is not reachable by other clusters in the topology. | Mandatory | @@ -31,8 +31,8 @@ The following table describes the worker cluster configuration parameters. | Parameter | Parameter Type | Description | Required | | --------------------- | -------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------- | -| name | String | The user-defined name of the worker cluster. | Mandatory | -| context_name | String | The name of the context to use from kubeconfig file; It is used in the topology YAML only. | Optional | +| name | String | The user-defined name of the worker cluster. The maximum allowed number of characters is 30. Provide the name as defined in [RFC 1123](#https://datatracker.ietf.org/doc/html/rfc1123). To know more, see [Kubernetes Object Names and IDs](https://kubernetes.io/docs/concepts/overview/working-with-objects/names/). | Mandatory | +| context_name | String | The name of the context to use from kubeconfig file; It is used in the topology YAML only. Use the short alias name. For example, you can use `worker-cluster` or `api-cluster` as the cluster contexts. | Optional | | kube_config_path | String | The absolute path to the kubeconfig file to install a worker cluster. This takes precedence over the kubeconfig path defined under cluster configuration. | Optional | | control_plane_address | AlphaNumeric | The address of the control plane `kube-apiserver`. The kubeslice-cli determines the address from kubeconfig. Override this option if the address in the kubeconfig is not reachable by other clusters in the topology. | Mandatory | | node_ip | Numeric | The IP address of one of the node in the cluster. The kubeslice-cli determines the address from this command:`kubectl get nodes`. Override this option to an address which is discoverable by other clusters in the topology. | Mandatory | @@ -42,7 +42,7 @@ The following table describes the KubeSlice configuration parameters. | Parameter | Parameter Type | Description | Required | | ------------- | -------------- | ---------------------------------------------------------------------------------------------------------------------------------------------- | --------- | -| project_name | String | the user-defined name of the Kubeslice project. | Mandatory | +| project_name | String | the user-defined name of the Kubeslice project. The maximum allowed number of characters is 30. Provide the name as defined in [RFC 1123](#https://datatracker.ietf.org/doc/html/rfc1123). To know more, see [Kubernetes Object Names and IDs](https://kubernetes.io/docs/concepts/overview/working-with-objects/names/). | Mandatory | | project_users | String | This contains the list of KubeSlice project users to be created. The users will have read/write privileges. By default, admin user is created. | Optional | ## Helm Chart Configuration Parameters @@ -55,9 +55,11 @@ The following table describes the helm chart configuration parameters. | [cert_manager_chart](#certificate-manager-chart-configuration-parameters) | Object | The cert-manager chart details. | Mandatory | | [controller_chart](#controller-chart-configuration-parameters) | Object | The Kubeslice Controller chart details. | Mandatory | | [worker_chart](#worker-chart-configuration-parameters) | Object | The KubeSlice Worker chart details. | Mandatory | +| [ui_chart](#ui-chart-configuration-parameters) | Object | The KubeSlice Manager chart details. Required for Enterprise charts only. | Optional | +| [prometheus_chart](#prometheus-chart-configuration-parameters) | Object | The Prometheus chart details. Required for Enterprise charts only. | Optional | | helm_username | AlphaNumeric | The helm username if the repo is private. | Optional | | helm_password | AlphaNumeric | The helm password if the repo is private. | Optional | -| [image_pull_secret](#image-pull-configuration-parameters) | Object | The image pull secrets to pull the Kubernetes dashboard image. Required for Enterprise charts. | Mandatory | +| [image_pull_secret](#image-pull-configuration-parameters) | Object | The image pull secrets to pull the Kubernetes dashboard image. Required for Enterprise charts only. | Mandatory | ## Certificate Manager Chart Configuration Parameters The following table describes the certificate manager chart configuration parameters used to create topology YAML. @@ -85,6 +87,34 @@ The following table describes the worker chart configuration parameters used to | version | Numeric | The version of the chart. Leave this value blank for the latest version. | Optional | | values | String | The additional value that can be passed as --set arguments for **helm install**. | Optional | +## UI Chart Configuration Parameters +The following table describes the UI chart configuration parameters used to create topology YAML. + +| Parameter | Parameter Type | Description | Required | +| ---------- | -------------- | -------------------------------------------------------------------------------- | --------- | +| chart_name | String | The name of the UI or enterprise chart. | Mandatory | +| version | Numeric | The version of the chart. Leave it blank for the latest version. | Optional | +| values | String | The additional value that can be passed as --set arguments for **helm install**. | Optional | + +## Prometheus Chart Configuration parameters +The following table describes the Prometheus chart configuration parameters used to create topology YAML. + +| Parameter | Parameter Type | Description | Required | +| ---------- | -------------- | -------------------------------------------------------------------------------- | --------- | +| chart_name | String | The name of the Prometheus chart. | Mandatory | +| version | Numeric | The version of the chart. Leave it blank for the latest version. | Optional | +| values | String | The additional value that can be passed as --set arguments for **helm install**. | Optional | + +## Image Pull Secret Configuration Parameters +The following table describes the image pull secret configuration parameters used to create topology YAML. + +| Parameter | Parameter Type | Description | Required | +| --------- | -------------- | ------------------------------------------------------ | --------- | +| registry | String | The endpoint of the OCI registry to use. | Mandatory | +| username | AlphaNumeric | The username to authenticate against the OCI registry. | Mandatory | +| password | AlphaNumeric | The password to authenticate against the OCI registry. | Mandatory | +| email | AlphaNumeric | The email to authenticate against the OCI registry. | Mandatory | + :::note @@ -131,7 +161,7 @@ configuration: #{Override this flag to an address which is discoverable by other clusters in the topology} kubeslice_configuration: project_name: #{the name of the KubeSlice Project} - project_users: #{optional: specify KubeSlice Project users with Readw-Write access. Default is admin} + project_users: #{optional: specify KubeSlice Project users with Read-Write access. Default is admin} helm_chart_configuration: repo_alias: #{The alias of the helm repo for KubeSlice Charts} repo_url: #{The URL of the Helm Charts for KubeSlice} @@ -146,4 +176,21 @@ configuration: chart_name: #{The name of the Worker Chart} version: #{The version of the chart to use. Leave blank for latest version} values: #(Values to be passed as --set arguments to helm install) + + # The ui_chart, prometheus_chart, and image_pull_secret parameters are required for enterprise chart only + ui_chart: + chart_name: #{The name of the UI/Enterprise Chart} + version: #{The version of the chart to use. Leave blank for latest version} + values: #(Values to be passed as --set arguments to helm install) + prometheus_chart: + chart_name: #{The name of the Prometheus Chart} + version: #{The version of the chart to use. Leave blank for latest version} + values: #(Values to be passed as --set arguments to helm install) + helm_username: #{Helm Username if the repo is private} + helm_password: #{Helm Password if the repo is private} + image_pull_secret: #{The image pull secrets. Optional for OpenSource, required for enterprise} + registry: #{The endpoint of the OCI registry to use. Default is `https://index.docker.io/v1/`} + username: #{The username to authenticate against the OCI registry} + password: #{The password to authenticate against the OCI registry} + email: #{The email to authenticate against the OCI registry} ``` \ No newline at end of file From 97d5c8ff3569078ba40ff4db08c1c066dc3c1574 Mon Sep 17 00:00:00 2001 From: uma-kt <105046156+uma-kt@users.noreply.github.com> Date: Wed, 16 Aug 2023 15:26:38 +0530 Subject: [PATCH 4/8] fixed the review comments --- .../kubeslice-cli/topology-configuration.mdx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx b/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx index 003cac32..bd6cf13a 100644 --- a/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx +++ b/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx @@ -88,7 +88,8 @@ The following table describes the worker chart configuration parameters used to | values | String | The additional value that can be passed as --set arguments for **helm install**. | Optional | ## UI Chart Configuration Parameters -The following table describes the UI chart configuration parameters used to create topology YAML. +The following table describes the UI chart configuration parameters used to create topology YAML. +These parameters are required for `enterprise-demo` option only. | Parameter | Parameter Type | Description | Required | | ---------- | -------------- | -------------------------------------------------------------------------------- | --------- | @@ -98,6 +99,7 @@ The following table describes the UI chart configuration parameters used to crea ## Prometheus Chart Configuration parameters The following table describes the Prometheus chart configuration parameters used to create topology YAML. +These parameters are required for `enterprise-demo` option only. | Parameter | Parameter Type | Description | Required | | ---------- | -------------- | -------------------------------------------------------------------------------- | --------- | @@ -107,6 +109,7 @@ The following table describes the Prometheus chart configuration parameters used ## Image Pull Secret Configuration Parameters The following table describes the image pull secret configuration parameters used to create topology YAML. +These parameters are required for `enterprise-demo` option only. | Parameter | Parameter Type | Description | Required | | --------- | -------------- | ------------------------------------------------------ | --------- | @@ -177,7 +180,7 @@ configuration: version: #{The version of the chart to use. Leave blank for latest version} values: #(Values to be passed as --set arguments to helm install) - # The ui_chart, prometheus_chart, and image_pull_secret parameters are required for enterprise chart only + # The ui_chart, prometheus_chart, and image_pull_secret parameters are required for enterprise-demo option (enterprise-chart) only ui_chart: chart_name: #{The name of the UI/Enterprise Chart} version: #{The version of the chart to use. Leave blank for latest version} From 5bd483aab34ef96b0870fa3899b6e2da84b4c955 Mon Sep 17 00:00:00 2001 From: uma-kt <105046156+uma-kt@users.noreply.github.com> Date: Wed, 16 Aug 2023 15:30:03 +0530 Subject: [PATCH 5/8] fixed the review comments --- .../kubeslice-cli/topology-configuration.mdx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx b/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx index bd6cf13a..ee1e6af1 100644 --- a/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx +++ b/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx @@ -89,7 +89,7 @@ The following table describes the worker chart configuration parameters used to ## UI Chart Configuration Parameters The following table describes the UI chart configuration parameters used to create topology YAML. -These parameters are required for `enterprise-demo` option only. +These parameters are required for the `enterprise-demo` option only. | Parameter | Parameter Type | Description | Required | | ---------- | -------------- | -------------------------------------------------------------------------------- | --------- | @@ -99,7 +99,7 @@ These parameters are required for `enterprise-demo` option only. ## Prometheus Chart Configuration parameters The following table describes the Prometheus chart configuration parameters used to create topology YAML. -These parameters are required for `enterprise-demo` option only. +These parameters are required for the `enterprise-demo` option only. | Parameter | Parameter Type | Description | Required | | ---------- | -------------- | -------------------------------------------------------------------------------- | --------- | @@ -109,7 +109,7 @@ These parameters are required for `enterprise-demo` option only. ## Image Pull Secret Configuration Parameters The following table describes the image pull secret configuration parameters used to create topology YAML. -These parameters are required for `enterprise-demo` option only. +These parameters are required for the `enterprise-demo` option only. | Parameter | Parameter Type | Description | Required | | --------- | -------------- | ------------------------------------------------------ | --------- | @@ -180,7 +180,7 @@ configuration: version: #{The version of the chart to use. Leave blank for latest version} values: #(Values to be passed as --set arguments to helm install) - # The ui_chart, prometheus_chart, and image_pull_secret parameters are required for enterprise-demo option (enterprise-chart) only + # The ui_chart, prometheus_chart, and image_pull_secret parameters are required for the enterprise-demo option (enterprise-chart) only ui_chart: chart_name: #{The name of the UI/Enterprise Chart} version: #{The version of the chart to use. Leave blank for latest version} From 37cf0f8767b961fff1f080c9c84b5a2aa4e32c56 Mon Sep 17 00:00:00 2001 From: uma-kt <105046156+uma-kt@users.noreply.github.com> Date: Wed, 16 Aug 2023 15:41:56 +0530 Subject: [PATCH 6/8] fixed the review comments --- .../kubeslice-cli/topology-configuration.mdx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx b/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx index ee1e6af1..4b6d0a23 100644 --- a/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx +++ b/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx @@ -55,11 +55,11 @@ The following table describes the helm chart configuration parameters. | [cert_manager_chart](#certificate-manager-chart-configuration-parameters) | Object | The cert-manager chart details. | Mandatory | | [controller_chart](#controller-chart-configuration-parameters) | Object | The Kubeslice Controller chart details. | Mandatory | | [worker_chart](#worker-chart-configuration-parameters) | Object | The KubeSlice Worker chart details. | Mandatory | -| [ui_chart](#ui-chart-configuration-parameters) | Object | The KubeSlice Manager chart details. Required for Enterprise charts only. | Optional | -| [prometheus_chart](#prometheus-chart-configuration-parameters) | Object | The Prometheus chart details. Required for Enterprise charts only. | Optional | +| [ui_chart](#ui-chart-configuration-parameters) | Object | The KubeSlice Manager chart details. This object is only required for enterprise charts. | Optional | +| [prometheus_chart](#prometheus-chart-configuration-parameters) | Object | The Prometheus chart details. This object is only required for enterprise charts. | Optional | | helm_username | AlphaNumeric | The helm username if the repo is private. | Optional | | helm_password | AlphaNumeric | The helm password if the repo is private. | Optional | -| [image_pull_secret](#image-pull-configuration-parameters) | Object | The image pull secrets to pull the Kubernetes dashboard image. Required for Enterprise charts only. | Mandatory | +| [image_pull_secret](#image-pull-configuration-parameters) | Object | The image pull secrets to pull the Kubernetes dashboard image. This object is only required for enterprise charts. | Mandatory | ## Certificate Manager Chart Configuration Parameters The following table describes the certificate manager chart configuration parameters used to create topology YAML. From 1ed743a3ed86ca49d9bca58210ba160217bb988e Mon Sep 17 00:00:00 2001 From: uma-kt <105046156+uma-kt@users.noreply.github.com> Date: Wed, 16 Aug 2023 16:16:55 +0530 Subject: [PATCH 7/8] fixed the review comments in the v1.0.0 docs --- .../kubeslice-cli/topology-configuration.mdx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/versioned_docs/version-1.0.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx b/versioned_docs/version-1.0.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx index 003cac32..2ad2b419 100644 --- a/versioned_docs/version-1.0.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx +++ b/versioned_docs/version-1.0.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx @@ -89,6 +89,7 @@ The following table describes the worker chart configuration parameters used to ## UI Chart Configuration Parameters The following table describes the UI chart configuration parameters used to create topology YAML. +These parameters are required for the `enterprise-demo` option only. | Parameter | Parameter Type | Description | Required | | ---------- | -------------- | -------------------------------------------------------------------------------- | --------- | @@ -98,6 +99,7 @@ The following table describes the UI chart configuration parameters used to crea ## Prometheus Chart Configuration parameters The following table describes the Prometheus chart configuration parameters used to create topology YAML. +These parameters are required for the `enterprise-demo` option only. | Parameter | Parameter Type | Description | Required | | ---------- | -------------- | -------------------------------------------------------------------------------- | --------- | @@ -105,8 +107,11 @@ The following table describes the Prometheus chart configuration parameters used | version | Numeric | The version of the chart. Leave it blank for the latest version. | Optional | | values | String | The additional value that can be passed as --set arguments for **helm install**. | Optional | + ## Image Pull Secret Configuration Parameters The following table describes the image pull secret configuration parameters used to create topology YAML. +These parameters are required for the `enterprise-demo` option only. + | Parameter | Parameter Type | Description | Required | | --------- | -------------- | ------------------------------------------------------ | --------- | @@ -177,7 +182,7 @@ configuration: version: #{The version of the chart to use. Leave blank for latest version} values: #(Values to be passed as --set arguments to helm install) - # The ui_chart, prometheus_chart, and image_pull_secret parameters are required for enterprise chart only + # The ui_chart, prometheus_chart, and image_pull_secret parameters are required for `enterprise-demo` option (enterprise chart) only ui_chart: chart_name: #{The name of the UI/Enterprise Chart} version: #{The version of the chart to use. Leave blank for latest version} From f28675ae8346304290f8a5d8efc8d630ec78408b Mon Sep 17 00:00:00 2001 From: uma-kt <105046156+uma-kt@users.noreply.github.com> Date: Wed, 16 Aug 2023 17:11:15 +0530 Subject: [PATCH 8/8] fixed the review comments --- .../install-kubeslice/kubeslice-cli/topology-configuration.mdx | 2 +- .../install-kubeslice/kubeslice-cli/topology-configuration.mdx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versioned_docs/version-1.0.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx b/versioned_docs/version-1.0.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx index 2ad2b419..d3fa51c7 100644 --- a/versioned_docs/version-1.0.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx +++ b/versioned_docs/version-1.0.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx @@ -182,7 +182,7 @@ configuration: version: #{The version of the chart to use. Leave blank for latest version} values: #(Values to be passed as --set arguments to helm install) - # The ui_chart, prometheus_chart, and image_pull_secret parameters are required for `enterprise-demo` option (enterprise chart) only + # The ui_chart, prometheus_chart, and image_pull_secret parameters are required for `enterprise-demo` option (enterprise chart) only. ui_chart: chart_name: #{The name of the UI/Enterprise Chart} version: #{The version of the chart to use. Leave blank for latest version} diff --git a/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx b/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx index 4b6d0a23..fa12f392 100644 --- a/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx +++ b/versioned_docs/version-1.1.0/install-kubeslice/kubeslice-cli/topology-configuration.mdx @@ -180,7 +180,7 @@ configuration: version: #{The version of the chart to use. Leave blank for latest version} values: #(Values to be passed as --set arguments to helm install) - # The ui_chart, prometheus_chart, and image_pull_secret parameters are required for the enterprise-demo option (enterprise-chart) only + # The ui_chart, prometheus_chart, and image_pull_secret parameters are required for the enterprise-demo option (enterprise-chart) only. ui_chart: chart_name: #{The name of the UI/Enterprise Chart} version: #{The version of the chart to use. Leave blank for latest version}