diff --git a/content/en/docs/access-control-and-account-management/external-authentication/set-up-external-authentication.md b/content/en/docs/access-control-and-account-management/external-authentication/set-up-external-authentication.md index 6b50e7ac3..c762b121f 100644 --- a/content/en/docs/access-control-and-account-management/external-authentication/set-up-external-authentication.md +++ b/content/en/docs/access-control-and-account-management/external-authentication/set-up-external-authentication.md @@ -18,7 +18,7 @@ You need to deploy a Kubernetes cluster and install KubeSphere in the cluster. F ## Procedure -1. Log in to KubeSphere as `admin`, move the cursor to in the bottom-right corner, click **Kubectl**, and run the following command to edit the `kubesphere-config` ConfigMap: +1. Log in to KubeSphere as `admin`, move the cursor to in the lower-right corner, click **Kubectl**, and run the following command to edit the `kubesphere-config` ConfigMap: ```bash kubectl -n kubesphere-system edit cm kubesphere-config diff --git a/content/en/docs/access-control-and-account-management/external-authentication/use-an-ldap-service.md b/content/en/docs/access-control-and-account-management/external-authentication/use-an-ldap-service.md index 276fc7b17..e4d1858bb 100644 --- a/content/en/docs/access-control-and-account-management/external-authentication/use-an-ldap-service.md +++ b/content/en/docs/access-control-and-account-management/external-authentication/use-an-ldap-service.md @@ -16,7 +16,7 @@ This document describes how to use an LDAP service as an external identity provi ### Procedure -1. Log in to KubeSphere as `admin`, move the cursor to in the bottom-right corner, click **Kubectl**, and run the following command to edit the `kubesphere-config` ConfigMap: +1. Log in to KubeSphere as `admin`, move the cursor to in the lower-right corner, click **Kubectl**, and run the following command to edit the `kubesphere-config` ConfigMap: ```bash kubectl -n kubesphere-system edit cm kubesphere-config diff --git a/content/en/docs/access-control-and-account-management/external-authentication/use-an-oauth2-identity-provider.md b/content/en/docs/access-control-and-account-management/external-authentication/use-an-oauth2-identity-provider.md index c9fada5db..c3de00e8e 100644 --- a/content/en/docs/access-control-and-account-management/external-authentication/use-an-oauth2-identity-provider.md +++ b/content/en/docs/access-control-and-account-management/external-authentication/use-an-oauth2-identity-provider.md @@ -81,7 +81,7 @@ KubeSphere provides two built-in OAuth 2.0 plugins: [GitHubIdentityProvider](htt ## Integrate an Identity Provider with KubeSphere -1. Log in to KubeSphere as `admin`, move the cursor to in the bottom-right corner, click **Kubectl**, and run the following command to edit the `kubesphere-config` ConfigMap: +1. Log in to KubeSphere as `admin`, move the cursor to in the lower-right corner, click **Kubectl**, and run the following command to edit the `kubesphere-config` ConfigMap: ```bash kubectl -n kubesphere-system edit cm kubesphere-config @@ -130,8 +130,6 @@ KubeSphere provides two built-in OAuth 2.0 plugins: [GitHubIdentityProvider](htt 5. Go to the KubeSphere login page, click **Log In with XXX** (for example, **Log In with GitHub**). - ![github-login-page](/images/docs/access-control-and-account-management/external-authentication/use-an-oauth2-identity-provider/kubesphere-login-page.png) - 6. On the login page of the external identity provider, enter the username and password of a user configured at the identity provider to log in to KubeSphere. ![github-login-page](/images/docs/access-control-and-account-management/external-authentication/use-an-oauth2-identity-provider/github-login-page.png) diff --git a/content/en/docs/installing-on-linux/on-premises/install-kubesphere-and-k3s.md b/content/en/docs/installing-on-linux/on-premises/install-kubesphere-and-k3s.md index 1ab9d056e..439b86514 100644 --- a/content/en/docs/installing-on-linux/on-premises/install-kubesphere-and-k3s.md +++ b/content/en/docs/installing-on-linux/on-premises/install-kubesphere-and-k3s.md @@ -78,12 +78,12 @@ chmod +x kk 1. Create a configuration file of your cluster by running the following command: ```bash - ./kk create config --with-kubernetes v1.20.4-k3s --with-kubesphere v3.2.0 + ./kk create config --with-kubernetes v1.21.4-k3s --with-kubesphere v3.2.0 ``` {{< notice note >}} - KubeKey v1.2.0 only supports the installation of K3s v1.20.4. + KubeKey v1.2.0 supports the installation of K3s v1.21.4. {{}} @@ -115,7 +115,7 @@ chmod +x kk address: "" port: 6443 kubernetes: - version: v1.21.5-k3s + version: v1.21.4-k3s imageRepo: kubesphere clusterName: cluster.local network: diff --git a/content/en/docs/project-user-guide/alerting/alerting-policy.md b/content/en/docs/project-user-guide/alerting/alerting-policy.md index d1794a1b8..163a5d3d5 100644 --- a/content/en/docs/project-user-guide/alerting/alerting-policy.md +++ b/content/en/docs/project-user-guide/alerting/alerting-policy.md @@ -57,6 +57,4 @@ To edit an alerting policy after it is created, on the **Alerting Policies** pag Click an alerting policy on the **Alerting Policies** page to see its detail information, including alerting rules and alerting history. You can also see the rule expression which is based on the template you use when creating the alerting policy. -Under **Monitoring**, the **Alert Monitoring** chart shows the actual usage or amount of resources over time. **Alerting Message** displays the customized message you set in notifications. - Under **Alert Monitoring**, the **Alert Monitoring** chart shows the actual usage or amount of resources over time. **Alerting Message** displays the customized message you set in notifications. diff --git a/content/en/docs/project-user-guide/application-workloads/container-image-settings.md b/content/en/docs/project-user-guide/application-workloads/container-image-settings.md index 43777b9be..6e29fb87d 100644 --- a/content/en/docs/project-user-guide/application-workloads/container-image-settings.md +++ b/content/en/docs/project-user-guide/application-workloads/container-image-settings.md @@ -73,6 +73,8 @@ The CPU resource is measured in CPU units, or **Core** in KubeSphere. The memory {{}} +To set **GPU Type**, select a GPU type from the drop-down list, which defaults to `nvidia.com/gpu`. **GPU Limit** defaults to no limit. + #### **Port Settings** You need to set the access protocol for the container as well as port information. To use the default setting, click **Use Default Ports**. diff --git a/content/en/docs/project-user-guide/application-workloads/cronjobs.md b/content/en/docs/project-user-guide/application-workloads/cronjobs.md index 581ef8e92..0e7c0ba9a 100644 --- a/content/en/docs/project-user-guide/application-workloads/cronjobs.md +++ b/content/en/docs/project-user-guide/application-workloads/cronjobs.md @@ -65,7 +65,7 @@ Please refer to [Jobs](../jobs/#step-3-strategy-settings-optional). {{< notice note >}} -- This example CronJob prints `KubeSphere`. For more information about setting images, see [Container Image Settings](../container-image-settings/). +- This example CronJob prints `KubeSphere`. For more information about setting images, see [Pod Settings](../container-image-settings/). - For more information about **Restart Policy**, see [Jobs](../jobs/#step-4-set-image). - You can skip **Volume Settings** and **Advanced Settings** for this tutorial. For more information, see [Mount Volumes](../deployments/#step-4-mount-volumes) and [Configure Advanced Settings](../deployments/#step-5-configure-advanced-settings) in Deployments. @@ -85,7 +85,7 @@ Please refer to [Jobs](../jobs/#step-3-strategy-settings-optional). ### Operations -On the CronJob detail page, you can manage the CronJob after it is created. +On the CronJob details page, you can manage the CronJob after it is created. - **Edit Information**: Edit the basic information except `Name` of the CronJob. - **Pause/Start**: Pause or start the Cronjob. Pausing a CronJob will tell the controller to suspend subsequent executions, which does not apply to executions that already start. diff --git a/content/en/docs/project-user-guide/application-workloads/daemonsets.md b/content/en/docs/project-user-guide/application-workloads/daemonsets.md index b622ceab3..77c0dfefd 100644 --- a/content/en/docs/project-user-guide/application-workloads/daemonsets.md +++ b/content/en/docs/project-user-guide/application-workloads/daemonsets.md @@ -51,7 +51,7 @@ Specify a name for the DaemonSet (for example, `demo-daemonset`) and click **Nex 5. Select a policy for image pulling from the drop-down menu. For more information, see [Image Pull Policy in Container Image Settings](../container-image-settings/#add-container-image). -6. For other settings (**Health Check**, **Start Command**, **Environment Variables**, **Container Security Context** and **Synchronize Host Timezone**), you can configure them on the dashboard as well. For more information, see detailed explanations of these properties in [Container Image Settings](../container-image-settings/#add-container-image). When you finish, click **√** in the lower-right corner to continue. +6. For other settings (**Health Check**, **Start Command**, **Environment Variables**, **Container Security Context** and **Synchronize Host Timezone**), you can configure them on the dashboard as well. For more information, see detailed explanations of these properties in [Pod Settings](../container-image-settings/#add-container-image). When you finish, click **√** in the lower-right corner to continue. 7. Select an update strategy from the drop-down menu. It is recommended you choose **Rolling Update**. For more information, see [Update Strategy](../container-image-settings/#update-strategy). @@ -79,7 +79,7 @@ You can add metadata in this section. When you finish, click **Create** to compl ## Check DaemonSet Details -### Detail page +### Details page 1. After a DaemonSet is created, it will be displayed in the list. You can click on the right and select the options from the menu to modify a DaemonSet. @@ -106,7 +106,7 @@ You can add metadata in this section. When you finish, click **Create** to compl - The Pod list provides detailed information of the Pod (status, node, Pod IP and resource usage). - You can view the container information by clicking a Pod item. - Click the container log icon to view output logs of the container. - - You can view the Pod detail page by clicking the Pod name. + - You can view the Pod details page by clicking the Pod name. ### Revision records diff --git a/content/en/docs/project-user-guide/application-workloads/deployments.md b/content/en/docs/project-user-guide/application-workloads/deployments.md index 2f23eee5b..cba033e6a 100644 --- a/content/en/docs/project-user-guide/application-workloads/deployments.md +++ b/content/en/docs/project-user-guide/application-workloads/deployments.md @@ -50,7 +50,7 @@ You can see the Deployment manifest file in YAML format by enabling **Edit YAML* 6. Select a policy for image pulling from the drop-down list. For more information, see [Image Pull Policy in Container Image Settings](../container-image-settings/#add-container-image). -7. For other settings (**Health Check**, **Start Command**, **Environment Variables**, **Container Security Context** and **Synchronize Host Timezone**), you can configure them on the dashboard as well. For more information, see detailed explanations of these properties in [Container Image Settings](../container-image-settings/#add-container-image). When you finish, click **√** in the lower-right corner to continue. +7. For other settings (**Health Check**, **Start Command**, **Environment Variables**, **Container Security Context** and **Synchronize Host Timezone**), you can configure them on the dashboard as well. For more information, see detailed explanations of these properties in [Pod Settings](../container-image-settings/#add-container-image). When you finish, click **√** in the lower-right corner to continue. 8. Select an update strategy from the drop-down menu. It is recommended that you choose **Rolling Update**. For more information, see [Update Strategy](../container-image-settings/#update-strategy). @@ -82,7 +82,7 @@ You can set a policy for node scheduling and add metadata in this section. When ## Check Deployment Details -### Detail page +### Details page 1. After a Deployment is created, it will be displayed in the list. You can click on the right and select options from the menu to modify your Deployment. @@ -104,13 +104,13 @@ You can set a policy for node scheduling and add metadata in this section. When 4. Click the **Resource Status** tab to view the port and Pod information of the Deployment. - - **Replica Status**: Click or to increase or decrease the number of Pod replicas. + - **Replica Status**: Click or to increase or decrease the number of Pod replicas. - **Pods** - The Pod list provides detailed information of the Pod (status, node, Pod IP and resource usage). - You can view the container information by clicking a Pod item. - Click the container log icon to view output logs of the container. - - You can view the Pod detail page by clicking the Pod name. + - You can view the Pod details page by clicking the Pod name. ### Revision records diff --git a/content/en/docs/project-user-guide/application-workloads/jobs.md b/content/en/docs/project-user-guide/application-workloads/jobs.md index 0c0ece1a9..b60d34657 100644 --- a/content/en/docs/project-user-guide/application-workloads/jobs.md +++ b/content/en/docs/project-user-guide/application-workloads/jobs.md @@ -38,7 +38,7 @@ You can set the values in this step or click **Next** to use the default values. | Name | Definition | Description | | ----------------------- | ---------------------------- | ------------------------------------------------------------ | | Maximum Retries | `spec.backoffLimit` | It specifies the maximum number of retries before this Job is marked as failed. It defaults to 6. | -| Completed Pods | `spec.completions` | It specifies the desired number of successfully finished Pods the Job should be run with. Setting it to nil means that the success of any Pod signals the success of all Pods, and allows parallelism to have any positive value. Setting it to 1 means that parallelism is limited to 1 and the success of that Pod signals the success of the Job. For more information, see [Jobs](https://kubernetes.io/docs/concepts/workloads/controllers/jobs-run-to-completion/). | +| Complete Pods | `spec.completions` | It specifies the desired number of successfully finished Pods the Job should be run with. Setting it to nil means that the success of any Pod signals the success of all Pods, and allows parallelism to have any positive value. Setting it to 1 means that parallelism is limited to 1 and the success of that Pod signals the success of the Job. For more information, see [Jobs](https://kubernetes.io/docs/concepts/workloads/controllers/jobs-run-to-completion/). | | Parallel Pods | `spec.parallelism` | It specifies the maximum desired number of Pods the Job should run at any given time. The actual number of Pods running in a steady state will be less than this number when the work left to do is less than max parallelism ((`.spec.completions - .status.successful`) < `.spec.parallelism`). For more information, see [Jobs](https://kubernetes.io/docs/concepts/workloads/controllers/jobs-run-to-completion/). | | Maximum Duration (s) | `spec.activeDeadlineSeconds` | It specifies the duration in seconds relative to the startTime that the Job may be active before the system tries to terminate it; the value must be a positive integer. | @@ -58,7 +58,7 @@ You can set the values in this step or click **Next** to use the default values. perl,-Mbignum=bpi,-wle,print bpi(2000) ``` - {{< notice note >}}For more information about setting images, see [Container Image Settings](../container-image-settings/).{{}} + {{< notice note >}}For more information about setting images, see [Pod Settings](../container-image-settings/).{{}} ### Step 5: Inspect the Job manifest (optional) @@ -122,7 +122,7 @@ You can rerun the Job if it fails and the reason for failure is displayed under - In **Resource Status**, the Pod list provides the Pod's detailed information (for example, creation time, node, Pod IP and monitoring data). - You can view the container information by clicking the Pod. - Click the container log icon to view the output logs of the container. -- You can view the Pod detail page by clicking the Pod name. +- You can view the Pod details page by clicking the Pod name. {{}} diff --git a/content/en/docs/project-user-guide/application-workloads/routes.md b/content/en/docs/project-user-guide/application-workloads/routes.md index a0e635c62..7addb2bb5 100644 --- a/content/en/docs/project-user-guide/application-workloads/routes.md +++ b/content/en/docs/project-user-guide/application-workloads/routes.md @@ -19,9 +19,9 @@ A Route on KubeSphere is the same as an [Ingress](https://kubernetes.io/docs/con 1. Log in to the KubeSphere web console as `project-admin` and go to your project. -2. Select **Gateway Settings** in **Project Settings** on the left navigation bar and click **Set Gateway** on the right. +2. Select **Gateway Settings** in **Project Settings** on the left navigation bar and click **Enable Gateway** on the right. -3. In the displayed **Set Gateway** dialog box, set **Access Mode** to **NodePort** or **LoadBalancer**, and click **OK**. +3. In the displayed dialog box, set **Access Mode** to **NodePort** or **LoadBalancer**, and click **OK**. {{< notice note >}} @@ -74,7 +74,7 @@ A Route on KubeSphere is the same as an [Ingress](https://kubernetes.io/docs/con 1. Select **Routes** in **Application Workloads** on the left navigation bar and click the name of the Route on the right. -2. Obtain the domain name and Service path in the **Rules** area and the gateway address in the **Details** area. +2. Obtain the domain name and Service path and the gateway address in the **Rules** area. * If the [Route access mode](#configure-the-route-access-method) is set to NodePort, the IP address of a Kubernetes cluster node is used as the gateway address and the NodePort is displayed after the domain name. @@ -117,7 +117,6 @@ If you need to access the Route from outside your private network by using eithe 1. Choose **Routes** in **Application Workloads** on the left navigation bar and click the name of the Route on the right. 2. Click **Edit Information**, or click **More** and choose an operation from the drop-down menu. - * **Edit Information**: Edit the basic information of the Route. The Route name cannot be edited. * **Edit YAML**: Edit the YAML configuration file of the Route. * **Edit Routing Rules**: Edit the Route rules. * **Edit Annotations**: Edit the Route annotations. For more information, see the [official Nginx Ingress controller document](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/). diff --git a/content/en/docs/project-user-guide/application-workloads/services.md b/content/en/docs/project-user-guide/application-workloads/services.md index 0d025bf25..efd4d254d 100644 --- a/content/en/docs/project-user-guide/application-workloads/services.md +++ b/content/en/docs/project-user-guide/application-workloads/services.md @@ -119,11 +119,11 @@ The value of **Name** is used in both configurations, one for Deployment and the ### Step 3: Set a Pod -To add a container image for the Service, see [Set an image](../deployments/#step-3-set-an-image) for details. +To add a container image for the Service, see [Set a Pod](../deployments/#step-3-set-a-pod) for details. {{< notice tip >}} -For more information about explanations of dashboard properties, see [Container Image Settings](../container-image-settings/) directly. +For more information about explanations of dashboard properties, see [Pod Settings](../container-image-settings/) directly. {{}} @@ -157,7 +157,7 @@ This value is specified by `.spec.type`. If you select **LoadBalancer**, you nee ## Check Service Details -### Detail page +### Details page 1. After a Service is created, you can click on the right to further edit it, such as its metadata (excluding **Name**), YAML, port, and Internet access. @@ -173,7 +173,7 @@ This value is specified by `.spec.type`. If you select **LoadBalancer**, you nee - The Pod list provides detailed information of the Pod (status, node, Pod IP and resource usage). - You can view the container information by clicking a Pod item. - Click the container log icon to view output logs of the container. - - You can view the Pod detail page by clicking the Pod name. + - You can view the Pod details page by clicking the Pod name. ### Resource status diff --git a/content/en/docs/project-user-guide/application-workloads/statefulsets.md b/content/en/docs/project-user-guide/application-workloads/statefulsets.md index 60f2ee126..538bb7b37 100644 --- a/content/en/docs/project-user-guide/application-workloads/statefulsets.md +++ b/content/en/docs/project-user-guide/application-workloads/statefulsets.md @@ -64,7 +64,7 @@ You can see the StatefulSet manifest file in YAML format by enabling **Edit YAML 6. Select a policy for image pulling from the drop-down list. For more information, see [Image Pull Policy in Container Image Settings](../container-image-settings/#add-container-image). -7. For other settings (**Health Check**, **Start Command**, **Environment Variables**, **Container Security Context** and **Synchronize Host Timezone**), you can configure them on the dashboard as well. For more information, see detailed explanations of these properties in [Container Image Settings](../container-image-settings/#add-container-image). When you finish, click **√** in the lower-right corner to continue. +7. For other settings (**Health Check**, **Start Command**, **Environment Variables**, **Container Security Context** and **Synchronize Host Timezone**), you can configure them on the dashboard as well. For more information, see detailed explanations of these properties in [Pod Settings](../container-image-settings/#add-container-image). When you finish, click **√** in the lower-right corner to continue. 8. Select an update strategy from the drop-down menu. It is recommended you choose **Rolling Update**. For more information, see [Update Strategy](../container-image-settings/#update-strategy). @@ -90,12 +90,12 @@ You can set a policy for node scheduling and add metadata in this section. When ## Check StatefulSet Details -### Detail page +### Details page 1. After a StatefulSet is created, it will be displayed in the list. You can click on the right to select options from the menu to modify your StatefulSet. - **Edit Information**: View and edit the basic information. - - **Edit YAMl**: View, upload, download, or update the YAML file. + - **Edit YAML**: View, upload, download, or update the YAML file. - **Re-create**: Re-create the StatefulSet. - **Delete**: Delete the StatefulSet. @@ -112,13 +112,13 @@ You can set a policy for node scheduling and add metadata in this section. When 4. Click the **Resource Status** tab to view the port and Pod information of a StatefulSet. - - **Replica Status**: Click or to increase or decrease the number of Pod replicas. + - **Replica Status**: Click or to increase or decrease the number of Pod replicas. - **Pods** - The Pod list provides detailed information of the Pod (status, node, Pod IP and resource usage). - You can view the container information by clicking a Pod item. - Click the container log icon to view output logs of the container. - - You can view the Pod detail page by clicking the Pod name. + - You can view the Pod details page by clicking the Pod name. ### Revision records diff --git a/content/en/docs/project-user-guide/application/compose-app.md b/content/en/docs/project-user-guide/application/compose-app.md index 0b60d4cd9..b2564950e 100644 --- a/content/en/docs/project-user-guide/application/compose-app.md +++ b/content/en/docs/project-user-guide/application/compose-app.md @@ -21,7 +21,7 @@ This tutorial demonstrates how to create a microservices-based app Bookinfo, whi 2. Set a name for the app (for example, `bookinfo`) and click **Next**. -3. On the **Service Settings** page, you need to create microservices that compose the app. Click **Create Service** and select **Stateless Service**. +3. On the **Services** page, you need to create microservices that compose the app. Click **Create Service** and select **Stateless Service**. 4. Set a name for the Service (e.g `productpage`) and click **Next**. @@ -39,11 +39,11 @@ This tutorial demonstrates how to create a microservices-based app Bookinfo, whi {{}} -6. Click **Use Default Ports**. For more information about image settings, see [Container Image Settings](../../../project-user-guide/application-workloads/container-image-settings/). Click **√** in the lower-right corner and **Next** to continue. +6. Click **Use Default Ports**. For more information about image settings, see [Pod Settings](../../../project-user-guide/application-workloads/container-image-settings/). Click **√** in the lower-right corner and **Next** to continue. 7. On the **Volume Settings** page, [add a volume](../../../project-user-guide/storage/volumes/) or click **Next** to continue. -8. Click **Add** on the **Advanced Settings** page directly. +8. Click **Create** on the **Advanced Settings** page. 9. Similarly, add the other three microservices for the app. Here is the image information: diff --git a/content/en/docs/project-user-guide/application/deploy-app-from-appstore.md b/content/en/docs/project-user-guide/application/deploy-app-from-appstore.md index 84776f0b2..f131f373c 100644 --- a/content/en/docs/project-user-guide/application/deploy-app-from-appstore.md +++ b/content/en/docs/project-user-guide/application/deploy-app-from-appstore.md @@ -27,11 +27,11 @@ This tutorial demonstrates how to quickly deploy [NGINX](https://www.nginx.com/) {{}} -2. Search for NGINX, click it, and click **Deploy** on the **App Information** page. Make sure you click **Agree** in the displayed **App Deploy Agreement** dialog box. +2. Search for NGINX, click it, and click **Install** on the **App Information** page. Make sure you click **Agree** in the displayed **App Deploy Agreement** dialog box. 3. Set a name and select an app version. Make sure NGINX is deployed in `demo-project` and click **Next**. -4. In **App Settings**, specify the number of replicas to deploy for the app and enable Ingress based on your needs. When you finish, click **Deploy**. +4. In **App Settings**, specify the number of replicas to deploy for the app and enable Ingress based on your needs. When you finish, click **Install**. {{< notice note >}} diff --git a/content/en/docs/project-user-guide/application/deploy-app-from-template.md b/content/en/docs/project-user-guide/application/deploy-app-from-template.md index 057e47482..a1831e5e5 100644 --- a/content/en/docs/project-user-guide/application/deploy-app-from-template.md +++ b/content/en/docs/project-user-guide/application/deploy-app-from-template.md @@ -57,7 +57,7 @@ This tutorial demonstrates how to quickly deploy [Grafana](https://grafana.com/) {{}} -5. Its app information and configuration files are also displayed. Under **Version**, select a version number from the list and click **Deploy**. +5. Its app information and configuration files are also displayed. Under **Version**, select a version number from the list and click **Install**. 6. Set an app name and confirm the version and deployment location. Click **Next**. diff --git a/content/en/docs/project-user-guide/configuration/configmaps.md b/content/en/docs/project-user-guide/configuration/configmaps.md index 7da72630c..5c138defc 100644 --- a/content/en/docs/project-user-guide/configuration/configmaps.md +++ b/content/en/docs/project-user-guide/configuration/configmaps.md @@ -55,7 +55,7 @@ You can see the ConfigMap manifest file in YAML format by enabling **Edit YAML** - **Edit Settings**: Modify the key-value pair of the ConfigMap. - **Delete**: Delete the ConfigMap. -2. Click the name of the ConfigMap to go to its details page. Under the tab **Details**, you can see all the key-value pairs you have added for the ConfigMap. +2. Click the name of the ConfigMap to go to its details page. Under the tab **Data**, you can see all the key-value pairs you have added for the ConfigMap. 3. Click **More** to display what operations about this ConfigMap you can do. diff --git a/content/en/docs/project-user-guide/configuration/image-registry.md b/content/en/docs/project-user-guide/configuration/image-registry.md index 8d5d2be29..1469cbf9c 100644 --- a/content/en/docs/project-user-guide/configuration/image-registry.md +++ b/content/en/docs/project-user-guide/configuration/image-registry.md @@ -6,7 +6,7 @@ linkTitle: "Image Registries" weight: 10430 --- -A Docker image is a read-only template that can be used to deploy container services. Each image has a unique identifier (i.e. image name:tag). For example, an image can contain a complete package of an Ubuntu operating system environment with only Apache and a few applications installed. An image registry is used to store and distribute Docker images. +A Docker image is a read-only template that can be used to deploy container services. Each image has a unique identifier (for example, image name:tag). For example, an image can contain a complete package of an Ubuntu operating system environment with only Apache and a few applications installed. An image registry is used to store and distribute Docker images. This tutorial demonstrates how to create Secrets for different image registries. @@ -34,7 +34,7 @@ You can see the Secret's manifest file in YAML format by enabling **Edit YAML** ### Step 3: Specify image registry information -Select **kubernetes.io/dockerconfigjson (image registry Secret)** for **Type**. To use images from your private registry as you create application workloads, you need to specify the following fields. +Select **Image registry information** for **Type**. To use images from your private registry as you create application workloads, you need to specify the following fields. - **Registry Address**. The address of the image registry that stores images for you to use when creating application workloads. - **Username**. The account name you use to log in to the registry. @@ -81,7 +81,7 @@ Select **kubernetes.io/dockerconfigjson (image registry Secret)** for **Type**. sudo systemctl restart docker ``` -3. Go back to the **Secret Settings** page and select **kubernetes.io/dockerconfigjson (image registry Secret)** for **Type**. Enter your Harbor IP address for **Registry Address** and enter the username and password. +3. Go back to the **Data Settings** page and select **Image registry information** for **Type**. Enter your Harbor IP address for **Registry Address** and enter the username and password. {{< notice note >}} diff --git a/content/en/docs/project-user-guide/configuration/secrets.md b/content/en/docs/project-user-guide/configuration/secrets.md index 6b550c5bd..9b5eada76 100644 --- a/content/en/docs/project-user-guide/configuration/secrets.md +++ b/content/en/docs/project-user-guide/configuration/secrets.md @@ -65,7 +65,7 @@ You can see the Secret's manifest file in YAML format by enabling **Edit YAML** - **Edit Settings**: Modify the key-value pair of the Secret. - **Delete**: Delete the Secret. -2. Click the name of the Secret and you can go to its details page. Under the tab **Details**, you can see all the key-value pairs you have added for the Secret. +2. Click the name of the Secret and you can go to its details page. Under the tab **Data**, you can see all the key-value pairs you have added for the Secret. {{< notice note >}} @@ -96,7 +96,7 @@ This section shows how to create Secrets from your Docker Hub account and GitHub 2. Set a name, such as `dockerhub-id`, and click **Next**. On the **Data Settings** page, fill in the following fields and click **Validate** to verify whether the information provided is valid. - **Type**: Select **kubernetes.io/dockerconfigjson (image registry Secret)**. + **Type**: Select **Image registry information**. **Registry Address**: Enter the Docker Hub registry address, such as `docker.io`. @@ -112,7 +112,7 @@ This section shows how to create Secrets from your Docker Hub account and GitHub 2. Set a name, such as `github-id`, and click **Next**. On the **Data Settings** page, fill in the following fields. - **Type**: Select **kubernetes.io/basic-auth (account password Secret)**. + **Type**: Select **Username and password**. **Username**: Enter your GitHub account. diff --git a/content/en/docs/project-user-guide/custom-application-monitoring/examples/monitor-mysql.md b/content/en/docs/project-user-guide/custom-application-monitoring/examples/monitor-mysql.md index 5c01919dd..5522caf7b 100644 --- a/content/en/docs/project-user-guide/custom-application-monitoring/examples/monitor-mysql.md +++ b/content/en/docs/project-user-guide/custom-application-monitoring/examples/monitor-mysql.md @@ -20,7 +20,7 @@ To begin with, you need to [deploy MySQL from the App Store](../../../../applica 1. Go to your project and click **App Store** in the upper-left corner. -2. Click **MySQL** to go to its details page and click **Deploy** on the **App Information** tab. +2. Click **MySQL** to go to its details page and click **Install** on the **App Information** tab. {{< notice note >}} @@ -30,7 +30,7 @@ MySQL is a built-in app in the KubeSphere App Store, which means it can be deplo 3. Under **Basic Information**, set a **Name** and select a **Version**. Select the project where the app is deployed under **Location** and click **Next**. -4. Under **App Settings**, set a root password by uncommenting the `mysqlRootPassword` field and click **Deploy**. +4. Under **App Settings**, set a root password by uncommenting the `mysqlRootPassword` field and click **Install**. 5. Wait until MySQL is up and running. @@ -40,7 +40,7 @@ You need to deploy MySQL Exporter in the same project on the same cluster. MySQL 1. Go to **App Store** and click **MySQL Exporter**. -2. On the details page, click **Deploy**. +2. On the details page, click **Install**. 3. Under **Basic Information**, set a **Name** and select a **Version**. Select the same project where MySQL is deployed under **Location** and click **Next**. @@ -50,7 +50,7 @@ You need to deploy MySQL Exporter in the same project on the same cluster. MySQL You must enable the ServiceMonitor CRD if you are using external exporter Helm charts. Those charts usually disable ServiceMonitors by default and require manual modification. {{}} -5. Modify MySQL connection parameters. MySQL Exporter needs to connect to the target MySQL. In this tutorial, MySQL is installed with the service name `mysql-dh3ily`. Navigate to `mysql` in the configuration file, and set `host` to `mysql-dh3ily`, `pass` to `testing`, and `user` to `root`. Note that your MySQL service may be created with **a different name**. After you finish editing the file, click **Deploy**. +5. Modify MySQL connection parameters. MySQL Exporter needs to connect to the target MySQL. In this tutorial, MySQL is installed with the service name `mysql-dh3ily`. Navigate to `mysql` in the configuration file, and set `host` to `mysql-dh3ily`, `pass` to `testing`, and `user` to `root`. Note that your MySQL service may be created with **a different name**. After you finish editing the file, click **Install**. 6. Wait until MySQL Exporter is up and running. @@ -58,7 +58,7 @@ You must enable the ServiceMonitor CRD if you are using external exporter Helm c You can create a monitoring dashboard for MySQL and visualize real-time metrics. -1. In the same project, go to **Custom Monitoring Dashboards** under **Monitoring & Alerting** in the sidebar and click **Create**. +1. In the same project, go to **Custom Monitoring** under **Monitoring & Alerting** in the sidebar and click **Create**. 2. In the displayed dialog box, set a name for the dashboard (for example, `mysql-overview`) and select the MySQL template. Click **Next** to continue. diff --git a/content/en/docs/project-user-guide/custom-application-monitoring/examples/monitor-sample-web.md b/content/en/docs/project-user-guide/custom-application-monitoring/examples/monitor-sample-web.md index b9e3be6df..42b44242a 100644 --- a/content/en/docs/project-user-guide/custom-application-monitoring/examples/monitor-sample-web.md +++ b/content/en/docs/project-user-guide/custom-application-monitoring/examples/monitor-sample-web.md @@ -43,7 +43,7 @@ You need to deploy the sample web application into `test`. For demonstration pur 1. Click `prometheus-example-app`. -2. Expand the menu and click **Test Installation**. +2. Expand the menu and click **Install**. 3. Make sure you deploy the sample web application in `test` and click **Next**. diff --git a/content/en/docs/project-user-guide/image-builder/binary-to-image.md b/content/en/docs/project-user-guide/image-builder/binary-to-image.md index a9a3c887b..b47e3af23 100644 --- a/content/en/docs/project-user-guide/image-builder/binary-to-image.md +++ b/content/en/docs/project-user-guide/image-builder/binary-to-image.md @@ -63,7 +63,7 @@ You must create a Docker Hub Secret so that the Docker image created through B2I {{< notice note >}} - For more information about how to set other parameters on the **Container Settings** page, see [Container Image Settings](../../../project-user-guide/application-workloads/container-image-settings/). + For more information about how to set other parameters on the **Container Settings** page, see [Pod Settings](../../../project-user-guide/application-workloads/container-image-settings/). {{}} diff --git a/content/en/docs/project-user-guide/image-builder/source-to-image.md b/content/en/docs/project-user-guide/image-builder/source-to-image.md index f150a0702..55f1a8426 100644 --- a/content/en/docs/project-user-guide/image-builder/source-to-image.md +++ b/content/en/docs/project-user-guide/image-builder/source-to-image.md @@ -77,7 +77,7 @@ You do not need to create the GitHub Secret if your forked repository is open to **Timeout (s)**: The number of seconds after which the probe times out. Enter `10` for this field. - For other fields, use the default value directly. For more information about how to configure probes and set other parameters on the **Container Settings** page, see [Container Image Settings](../../../project-user-guide/application-workloads/container-image-settings/). + For other fields, use the default value directly. For more information about how to configure probes and set other parameters on the **Container Settings** page, see [Pod Settings](../../../project-user-guide/application-workloads/container-image-settings/). 6. On the **Volume Settings** page, you can add a volume for the container. For more information, see [Volumes](../../../project-user-guide/storage/volumes/). Click **Next** to continue. diff --git a/content/en/docs/project-user-guide/storage/volume-snapshots.md b/content/en/docs/project-user-guide/storage/volume-snapshots.md index e12e569dc..c94a7f78a 100644 --- a/content/en/docs/project-user-guide/storage/volume-snapshots.md +++ b/content/en/docs/project-user-guide/storage/volume-snapshots.md @@ -32,7 +32,7 @@ This tutorial demonstrates how to create and use a volume snapshot. There are two ways for you to use a snapshot to create a volume. -### Create a volume from the snapshot detail page +### Create a volume from the snapshot details page 1. Log in to the web console of KubeSphere as `project-regular`. On a snapshot's details page, click **Apply** to use the snapshot. Generally, the steps are the same as creating a volume directly. @@ -56,7 +56,7 @@ There are two ways for you to use a snapshot to create a volume. 2. In the displayed dialog box, set a name for the volume. Click **Next** to continue. -3. On the **Volume Settings** tab, select **Create a Volume from Volume Snapshot** under the **Method** section. Select a snapshot and an access mode, and click **Next** to continue. +3. On the **Volume Settings** tab, select **From Volume Snapshot** under the **Method** section. Select a snapshot and an access mode, and click **Next** to continue. 4. On the **Advanced Settings** tab, add metadata for the volume such as labels and annotations. Click **Create** to finish creating the volume. diff --git a/content/en/docs/project-user-guide/storage/volumes.md b/content/en/docs/project-user-guide/storage/volumes.md index 952c27b7e..e08f47320 100644 --- a/content/en/docs/project-user-guide/storage/volumes.md +++ b/content/en/docs/project-user-guide/storage/volumes.md @@ -10,7 +10,7 @@ When you create an application workload in a project, you can create a [Persiste Cluster administrators configure PersistentVolumes using storage classes. In other words, to create a PersistentVolumeClaim in a project, your cluster must have an available storage class. If no customized storage class is configured when you install KubeSphere, [OpenEBS](https://openebs.io/) is installed in your cluster by default to provide Local Persistent Volumes. However, it does not support dynamic volume provisioning. In a production environment, it is recommended you configure storage classes in advance to provide persistent storage services for your apps. -This tutorial demonstrates how to create a volume, mount a volume and use volume features from its detail page. +This tutorial demonstrates how to create a volume, mount a volume and use volume features from its details page. ## Prerequisites @@ -34,13 +34,13 @@ All the volumes that are created on the **Volumes** page are PersistentVolumeCla {{}} -4. On the **Volume Settings** page, select a method to create a volume. +4. On the **Storage Settings** page, select a method to create a volume. - - **Create a Volume from Storage Class**. You can configure storage classes both [before](../../../installing-on-linux/persistent-storage-configurations/understand-persistent-storage/) and [after](../../../cluster-administration/persistent-volume-and-storage-class/) the installation of KubeSphere. + - **From Storage Class**. You can configure storage classes both [before](../../../installing-on-linux/persistent-storage-configurations/understand-persistent-storage/) and [after](../../../cluster-administration/persistent-volume-and-storage-class/) the installation of KubeSphere. - - **Create a Volume from Volume Snapshot**. To use a snapshot to create a volume, you must create a volume snapshot first. + - **From Volume Snapshot**. To use a snapshot to create a volume, you must create a volume snapshot first. - Select **Create a Volume from Storage Class** in this example. For more information about how to create a volume by snapshot, see [Volume Snapshots](../volume-snapshots/). + Select **From Storage Class** in this example. For more information about how to create a volume by snapshot, see [Volume Snapshots](../volume-snapshots/). 5. Select a storage class from the drop-down list. This tutorial uses `csi-standard`, a standard storage class provided by QingCloud Platform. You can select your own storage class. @@ -118,7 +118,7 @@ After a volume is created, you can see detailed information of it, edit it, or l On the details page, you can click **Edit Information** to change its basic information. Click **More** and you can edit its YAML file or delete this volume. -To delete a volume, make sure the volume is not mounted to any workload. To unmount a volume, go to the detail page of a workload. From the **More** drop-down list, click **Edit Settings**. Select **Volumes** from the pop-up window, and click the dustbin icon to unmount it. +To delete a volume, make sure the volume is not mounted to any workload. To unmount a volume, go to the details page of a workload. From the **More** drop-down list, click **Edit Settings**. Select **Volumes** from the pop-up window, and click the dustbin icon to unmount it. If the status of a volume remains **Terminating** for a long time after you clicked **Delete**, manually delete it by using the following command: @@ -130,9 +130,9 @@ kubectl patch pvc -p '{"metadata":{"finalizers":null}}' From the **More** drop-down menu, there are three additional options provided by KubeSphere based on the underlying storage plugin, also known as `Storage Capability`. Volume features include: -- Clone a volume: Create a same volume. -- Create a volume snapshot: Create a volume snapshot which can be used to create volumes. For more information, see [Volume Snapshots](../volume-snapshots/). -- Expand a volume: Increase the size of a volume. Keep in mind that you cannot reduce the size of a volume on the console due to possible data loss. +- **Clone**: Create a same volume. +- **Create Snapshot**: Create a volume snapshot which can be used to create volumes. For more information, see [Volume Snapshots](../volume-snapshots/). +- **Expand**: Increase the size of a volume. Keep in mind that you cannot reduce the size of a volume on the console due to possible data loss. For more information about `Storage Capability`, see [Design Documentation](https://github.com/kubesphere/community/blob/master/sig-storage/concepts-and-designs/storage-capability-interface.md). diff --git a/content/zh/docs/installing-on-linux/on-premises/install-kubesphere-and-k3s.md b/content/zh/docs/installing-on-linux/on-premises/install-kubesphere-and-k3s.md index ede139f8b..6476e78a1 100644 --- a/content/zh/docs/installing-on-linux/on-premises/install-kubesphere-and-k3s.md +++ b/content/zh/docs/installing-on-linux/on-premises/install-kubesphere-and-k3s.md @@ -63,7 +63,7 @@ curl -sfL https://get-kk.kubesphere.io | VERSION=v1.2.0 sh - {{< notice note >}} -通过以上的命令可以下载 KubeKey 的最新版本 (v1.1.0)。请注意，更早版本的 KubeKey 无法下载 K3s。 +通过以上的命令可以下载 KubeKey 的最新版本 (v1.2.0)。请注意，更早版本的 KubeKey 无法下载 K3s。 {{}} @@ -78,12 +78,12 @@ chmod +x kk 1. 执行以下命令为集群创建一个配置文件： ```bash - ./kk create config --with-kubernetes v1.20.4-k3s --with-kubesphere v3.2.0 + ./kk create config --with-kubernetes v1.21.4-k3s --with-kubesphere v3.2.0 ``` {{< notice note >}} - - KubeKey v1.2.0 仅支持安装 K3s v1.20.4。 + - KubeKey v1.2.0 支持安装 K3s v1.21.4。 - 您可以在以上命令中使用 `-f` 或 `--file` 参数指定配置文件的路径和名称。如未指定路径和名称，KubeKey 将默认在当前目录下创建 `config-sample.yaml` 配置文件。 @@ -117,7 +117,7 @@ chmod +x kk address: "" port: 6443 kubernetes: - version: v1.21.5-k3s + version: v1.21.4-k3s imageRepo: kubesphere clusterName: cluster.local network: diff --git a/content/zh/docs/project-user-guide/application-workloads/container-image-settings.md b/content/zh/docs/project-user-guide/application-workloads/container-image-settings.md index 635e379d4..680adb676 100644 --- a/content/zh/docs/project-user-guide/application-workloads/container-image-settings.md +++ b/content/zh/docs/project-user-guide/application-workloads/container-image-settings.md @@ -73,6 +73,8 @@ CPU 资源以 CPU 单位计量，即 KubeSphere 中的 **Core**。内存资源 {{}} +要设置 **GPU 类型**，请在下拉列表中选择一个 GPU 类型，默认为 `nvidia.com/gpu`。**GPU 限制**默认为不限制。 + #### **端口设置** 您需要为容器设置访问协议和端口信息。请点击**使用默认端口**以自动填充默认设置。 diff --git a/content/zh/docs/project-user-guide/application-workloads/cronjobs.md b/content/zh/docs/project-user-guide/application-workloads/cronjobs.md index bd0f96516..1e94a67c8 100644 --- a/content/zh/docs/project-user-guide/application-workloads/cronjobs.md +++ b/content/zh/docs/project-user-guide/application-workloads/cronjobs.md @@ -66,7 +66,7 @@ weight: 10260 {{< notice note >}} -- 此示例定时任务输出 `KubeSphere`。有关设置镜像的更多信息，请参见[容器镜像设置](../container-image-settings/)。 +- 此示例定时任务输出 `KubeSphere`。有关设置镜像的更多信息，请参见[容器组设置](../container-image-settings/)。 - 有关**重启策略**的更多信息，请参见[任务](../jobs/#步骤-4设置镜像)。 - 您可以跳过本教程的**存储卷设置**和**高级设置**。有关更多信息，请参见部署一文中的[挂载存储卷](../deployments/#步骤-4挂载存储卷)和[配置高级设置](../deployments/#步骤-5配置高级设置)。 diff --git a/content/zh/docs/project-user-guide/application-workloads/daemonsets.md b/content/zh/docs/project-user-guide/application-workloads/daemonsets.md index 6508da0f0..1df14cc2a 100644 --- a/content/zh/docs/project-user-guide/application-workloads/daemonsets.md +++ b/content/zh/docs/project-user-guide/application-workloads/daemonsets.md @@ -52,7 +52,7 @@ weight: 10230 5. 在下拉菜单中选择镜像拉取策略。有关更多信息，请参见[容器镜像设置中关于镜像拉取策略的内容](../../../project-user-guide/application-workloads/container-image-settings/#添加容器镜像)。 -6. 对于其他设置（**健康检查**、**启动命令**、**环境变量**、**容器安全上下文** 以及**同步主机时区**），您也可以在仪表板上配置它们。有关更多信息，请参见[容器镜像设置](../../../project-user-guide/application-workloads/container-image-settings/#添加容器镜像)中对这些属性的详细说明。操作完成后，点击右下角的 **√** 继续。 +6. 对于其他设置（**健康检查**、**启动命令**、**环境变量**、**容器安全上下文** 以及**同步主机时区**），您也可以在仪表板上配置它们。有关更多信息，请参见[容器组设置](../../../project-user-guide/application-workloads/container-image-settings/#添加容器镜像)中对这些属性的详细说明。操作完成后，点击右下角的 **√** 继续。 7. 在下拉菜单中选择更新策略。建议您选择**滚动更新**。有关更多信息，请参见[更新策略](../../../project-user-guide/application-workloads/container-image-settings/#更新策略)。 diff --git a/content/zh/docs/project-user-guide/application-workloads/deployments.md b/content/zh/docs/project-user-guide/application-workloads/deployments.md index 8d4f92c06..a17b66ccd 100644 --- a/content/zh/docs/project-user-guide/application-workloads/deployments.md +++ b/content/zh/docs/project-user-guide/application-workloads/deployments.md @@ -50,7 +50,7 @@ weight: 10210 6. 在下拉列表中选择镜像拉取策略。有关更多信息，请参见[容器镜像设置中关于镜像拉取策略的内容](../../../project-user-guide/application-workloads/container-image-settings/#添加容器镜像)。 -7. 对于其他设置（**健康检查**、**启动命令**、**环境变量**、**容器安全上下文** 以及**同步主机时区**），您也可以在仪表板上配置它们。有关更多信息，请参见[容器镜像设置](../../../project-user-guide/application-workloads/container-image-settings/#添加容器镜像)中对这些属性的详细说明。操作完成后，点击右下角的 **√** 继续。 +7. 对于其他设置（**健康检查**、**启动命令**、**环境变量**、**容器安全上下文** 以及**同步主机时区**），您也可以在仪表板上配置它们。有关更多信息，请参见[容器组设置](../../../project-user-guide/application-workloads/container-image-settings/#添加容器镜像)中对这些属性的详细说明。操作完成后，点击右下角的 **√** 继续。 8. 在下拉菜单中选择更新策略。建议您选择**滚动更新**。有关更多信息，请参见[更新策略](../../../project-user-guide/application-workloads/container-image-settings/#更新策略)。 @@ -104,7 +104,7 @@ weight: 10210 4. 点击**资源状态**选项卡，查看该部署的端口和容器组信息。 - - **副本运行状态**：点击 或 来增加或减少容器组副本数量。 + - **副本运行状态**：点击 或 来增加或减少容器组副本数量。 - **容器组** - 容器组列表中显示了容器组详情（运行状态、节点、容器组 IP 以及资源使用情况）。 diff --git a/content/zh/docs/project-user-guide/application-workloads/jobs.md b/content/zh/docs/project-user-guide/application-workloads/jobs.md index 84960eb35..35f96e551 100644 --- a/content/zh/docs/project-user-guide/application-workloads/jobs.md +++ b/content/zh/docs/project-user-guide/application-workloads/jobs.md @@ -58,7 +58,7 @@ weight: 10250 perl,-Mbignum=bpi,-wle,print bpi(2000) ``` - {{< notice note >}}有关设置镜像的更多信息，请参见[容器镜像设置](../../../project-user-guide/application-workloads/container-image-settings/)。{{}} + {{< notice note >}}有关设置镜像的更多信息，请参见[容器组设置](../../../project-user-guide/application-workloads/container-image-settings/)。{{}} ### 步骤 5：检查任务清单（可选） diff --git a/content/zh/docs/project-user-guide/application-workloads/routes.md b/content/zh/docs/project-user-guide/application-workloads/routes.md index 39c09c51e..0a5dd8e43 100644 --- a/content/zh/docs/project-user-guide/application-workloads/routes.md +++ b/content/zh/docs/project-user-guide/application-workloads/routes.md @@ -19,9 +19,9 @@ KubeSphere 上的应用路由和 Kubernetes 上的 [Ingress](https://kubernetes. 1. 以 `project-admin` 身份登录 KubeSphere 的 Web 控制台，然后访问您的项目。 -2. 在左侧导航栏中选择**项目设置**下的**网关设置**，点击右侧的**设置网关**。 +2. 在左侧导航栏中选择**项目设置**下的**网关设置**，点击右侧的**开启网关**。 -3. 在出现的**设置网关**对话框中，将**访问模式**设置为 **NodePort** 或 **LoadBalancer**，然后点击**确认**。 +3. 在出现的对话框中，将**访问模式**设置为 **NodePort** 或 **LoadBalancer**，然后点击**确认**。 {{< notice note >}} @@ -74,7 +74,7 @@ KubeSphere 上的应用路由和 Kubernetes 上的 [Ingress](https://kubernetes. 1. 在左侧导航栏中选择**应用负载**中的**应用路由**，点击右侧的应用路由名称。 -2. 在**规则**区域获取域名和服务路径，在**详情**区域获取网关地址。 +2. 在**规则**区域获取域名和服务路径以及网关地址。 * 如果[应用路由访问模式](#配置应用路由访问方式)设置为 NodePort，则会使用 Kubernetes 集群节点的 IP 地址作为网关地址，NodePort 位于域名之后。 diff --git a/content/zh/docs/project-user-guide/application-workloads/services.md b/content/zh/docs/project-user-guide/application-workloads/services.md index 76073eab8..efe7582f6 100644 --- a/content/zh/docs/project-user-guide/application-workloads/services.md +++ b/content/zh/docs/project-user-guide/application-workloads/services.md @@ -119,11 +119,11 @@ KubeSphere 提供三种创建服务的基本方法：**无状态服务**、**有 ### 步骤 3：设置容器组 -为服务添加容器镜像，详情请参见[设置镜像](../../../project-user-guide/application-workloads/deployments/#步骤-3设置镜像)。 +为服务添加容器镜像，详情请参见[设置容器组](../../../project-user-guide/application-workloads/deployments/#步骤-3设置容器组)。 {{< notice tip >}} -有关仪表板上各项属性的详细说明，请直接参见[容器镜像设置](../../../project-user-guide/application-workloads/container-image-settings/)。 +有关仪表板上各项属性的详细说明，请直接参见[容器组设置](../../../project-user-guide/application-workloads/container-image-settings/)。 {{}} diff --git a/content/zh/docs/project-user-guide/application-workloads/statefulsets.md b/content/zh/docs/project-user-guide/application-workloads/statefulsets.md index b24b83209..8a746359a 100644 --- a/content/zh/docs/project-user-guide/application-workloads/statefulsets.md +++ b/content/zh/docs/project-user-guide/application-workloads/statefulsets.md @@ -65,7 +65,7 @@ weight: 10220 6. 从下拉列表中选择镜像拉取策略。有关更多信息，请参见[容器镜像设置中关于镜像拉取策略的内容](../../../project-user-guide/application-workloads/container-image-settings/#添加容器镜像)。 -7. 对于其他设置（**健康检查**、**启动命令**、**环境变量**、**容器安全上下文** 以及**同步主机时区**），您也可以在仪表板上配置它们。有关更多信息，请参见[容器镜像设置](../../../project-user-guide/application-workloads/container-image-settings/#添加容器镜像)中对这些属性的详细说明。操作完成后，点击右下角的 **√** 继续。 +7. 对于其他设置（**健康检查**、**启动命令**、**环境变量**、**容器安全上下文** 以及**同步主机时区**），您也可以在仪表板上配置它们。有关更多信息，请参见[容器组设置](../../../project-user-guide/application-workloads/container-image-settings/#添加容器镜像)中对这些属性的详细说明。操作完成后，点击右下角的 **√** 继续。 8. 在下拉菜单中选择更新策略。建议您选择**滚动更新**。有关更多信息，请参见[更新策略](../container-image-settings/#更新策略)。 @@ -113,7 +113,7 @@ weight: 10220 4. 点击**资源状态**选项卡，查看该有状态副本集的端口和容器组信息。 - - **副本运行状态**：点击 或 来增加或减少容器组副本数量。 + - **副本运行状态**：点击 或 来增加或减少容器组副本数量。 - **容器组** - 容器组列表中显示了容器组详情（运行状态、节点、容器组IP 以及资源使用情况）。 diff --git a/content/zh/docs/project-user-guide/application/compose-app.md b/content/zh/docs/project-user-guide/application/compose-app.md index 0953234c0..058504cc8 100644 --- a/content/zh/docs/project-user-guide/application/compose-app.md +++ b/content/zh/docs/project-user-guide/application/compose-app.md @@ -21,7 +21,7 @@ weight: 10140 2. 设置应用名称（例如 `bookinfo`）并点击**下一步**。 -3. 在**服务设置**页面，您需要构建自制应用的微服务。点击**创建服务**，选择**无状态服务**。 +3. 在**服务**页面，您需要构建自制应用的微服务。点击**创建服务**，选择**无状态服务**。 4. 设置服务名称（例如 `productpage`）并点击**下一步**。 @@ -39,11 +39,11 @@ weight: 10140 {{}} -6. 点击**使用默认端口**。有关更多镜像设置的信息，请参见[容器镜像设置](../../../project-user-guide/application-workloads/container-image-settings/)。点击右下角的 **√** 和**下一步**以继续操作。 +6. 点击**使用默认端口**。有关更多镜像设置的信息，请参见[容器组设置](../../../project-user-guide/application-workloads/container-image-settings/)。点击右下角的 **√** 和**下一步**以继续操作。 7. 在**存储卷设置**页面，[添加存储卷](../../../project-user-guide/storage/volumes/)或点击**下一步**以继续操作。 -8. 在**高级设置**页面，直接点击**添加**。 +8. 在**高级设置**页面，直接点击**创建**。 9. 同样，为该应用添加其他三个微服务。以下是相应的镜像信息： diff --git a/content/zh/docs/project-user-guide/application/deploy-app-from-appstore.md b/content/zh/docs/project-user-guide/application/deploy-app-from-appstore.md index c92fdc56a..c40b5dab9 100644 --- a/content/zh/docs/project-user-guide/application/deploy-app-from-appstore.md +++ b/content/zh/docs/project-user-guide/application/deploy-app-from-appstore.md @@ -27,11 +27,11 @@ weight: 10130 {{}} -2. 找到并点击 NGINX，在**应用信息**页面点击**部署**。请确保在**应用部署须知**对话框中点击**确认**。 +2. 找到并点击 NGINX，在**应用信息**页面点击**安装**。请确保在**应用部署须知**对话框中点击**确认**。 3. 设置应用的名称和版本，确保 NGINX 部署在 `demo-project` 项目中，点击**下一步**。 -4. 在**应用设置**页面，设置应用部署的副本数，根据需要启用或禁用 Ingress，然后点击**部署**。 +4. 在**应用设置**页面，设置应用部署的副本数，根据需要启用或禁用 Ingress，然后点击**安装**。 {{< notice note >}} diff --git a/content/zh/docs/project-user-guide/application/deploy-app-from-template.md b/content/zh/docs/project-user-guide/application/deploy-app-from-template.md index b3b823502..ee9b6ce41 100644 --- a/content/zh/docs/project-user-guide/application/deploy-app-from-template.md +++ b/content/zh/docs/project-user-guide/application/deploy-app-from-template.md @@ -22,7 +22,7 @@ weight: 10120 1. 以 `ws-admin` 用户登录 KubeSphere Web 控制台。在您的企业空间中，进入**应用管理**下的**应用仓库**页面，并点击**添加仓库**。 -2. 在弹出的对话框中，将应用仓库名称设置为 `test-repo`，将应用仓库的 URL 设置为 `https://helm-chart-repo.pek3a.qingstor.com/kubernetes-charts/`。点击**验证**对 URL 进行验证，根据您的需要设置**同步间隔**，再点击**确定**。 +2. 在弹出的对话框中，将应用仓库名称设置为 `test-repo`，将应用仓库的 URL 设置为 `https://helm-chart-repo.pek3a.qingstor.com/kubernetes-charts/`。点击**验证**对 URL 进行验证，根据您的需要设置**同步周期**，再点击**确定**。 3. 应用仓库导入成功后会显示在列表中。 @@ -58,7 +58,7 @@ weight: 10120 {{}} -5. 可以查看其应用信息和配置文件，在**版本**下拉列表中选择版本，然后点击**部署**。 +5. 可以查看其应用信息和配置文件，在**版本**下拉列表中选择版本，然后点击**安装**。 6. 设置应用名称，确认应用版本和部署位置，点击**下一步**。 diff --git a/content/zh/docs/project-user-guide/configuration/configmaps.md b/content/zh/docs/project-user-guide/configuration/configmaps.md index a60999b5e..630732e1c 100644 --- a/content/zh/docs/project-user-guide/configuration/configmaps.md +++ b/content/zh/docs/project-user-guide/configuration/configmaps.md @@ -54,7 +54,7 @@ Kubernetes [配置字典（ConfigMap）](https://kubernetes.io/docs/concepts/con - **编辑设置**：修改配置字典键值对。 - **删除**：删除配置字典。 -2. 点击配置字典名称打开其详情页面。在**详情**选项卡，您可以查看配置字典的所有键值对。 +2. 点击配置字典名称打开其详情页面。在**数据**选项卡，您可以查看配置字典的所有键值对。 3. 点击**更多操作**对配置字典进行其他操作。 diff --git a/content/zh/docs/project-user-guide/configuration/image-registry.md b/content/zh/docs/project-user-guide/configuration/image-registry.md index 8eb67ff40..8178d0108 100644 --- a/content/zh/docs/project-user-guide/configuration/image-registry.md +++ b/content/zh/docs/project-user-guide/configuration/image-registry.md @@ -34,7 +34,7 @@ Docker 镜像是一个只读的模板，可用于部署容器服务。每个镜 ### 步骤 3：配置镜像仓库信息 -将**类型**设置为 **kubernetes.io/dockerconfigjson（镜像仓库保密字典）**。要在创建应用负载时使用私有仓库中的镜像，您需要配置以下字段： +将**类型**设置为 **镜像仓库信息**。要在创建应用负载时使用私有仓库中的镜像，您需要配置以下字段： - **仓库地址**：镜像仓库的地址，其中包含创建应用负载时需要使用的镜像。 - **用户名**：登录镜像仓库所需的用户名。 @@ -81,7 +81,7 @@ Docker 镜像是一个只读的模板，可用于部署容器服务。每个镜 sudo systemctl restart docker ``` -3. 在 KubeSphere 控制台上进入创建保密字典的**保密字典设置**页面，将**类型**设置为**镜像仓库保密字典**，将**仓库地址**设置为您的 Harbor IP 地址，并设置用户名和密码。 +3. 在 KubeSphere 控制台上进入创建保密字典的**数据设置**页面，将**类型**设置为**镜像仓库信息**，将**仓库地址**设置为您的 Harbor IP 地址，并设置用户名和密码。 {{< notice note >}} diff --git a/content/zh/docs/project-user-guide/configuration/secrets.md b/content/zh/docs/project-user-guide/configuration/secrets.md index 1aec17970..142dd39cd 100644 --- a/content/zh/docs/project-user-guide/configuration/secrets.md +++ b/content/zh/docs/project-user-guide/configuration/secrets.md @@ -65,7 +65,7 @@ Kubernetes [保密字典 (Secret)](https://kubernetes.io/zh/docs/concepts/config - **编辑设置**：修改保密字典键值对。 - **删除**：删除保密字典。 -2. 点击保密字典名称打开保密字典详情页面。在**详情**选项卡，您可以查看保密字典的所有键值对。 +2. 点击保密字典名称打开保密字典详情页面。在**数据**选项卡，您可以查看保密字典的所有键值对。 {{< notice note >}} @@ -96,7 +96,7 @@ Kubernetes [保密字典 (Secret)](https://kubernetes.io/zh/docs/concepts/config 2. 设置保密字典名称（例如 `dockerhub-id`）并点击**下一步**。在**数据设置**页面，设置以下参数，然后点击**验证**以检查设置的信息是否有效。 - **类型**：选择**kubernetes.io/dockerconfigjson（镜像仓库保密字典）**。 + **类型**：选择**镜像仓库信息**。 **仓库地址**：输入您的 Docker Hub 仓库地址，例如 `docker.io`。 @@ -112,7 +112,7 @@ Kubernetes [保密字典 (Secret)](https://kubernetes.io/zh/docs/concepts/config 2. 设置保密字典名称（例如 `github-id`）并点击**下一步**。在**数据设置**页面，设置以下参数。 - **类型**：选择**kubernetes.io/basic-auth（帐户密码保密字典）**。 + **类型**：选择**用户名和密码**。 **用户名**：输入您的 GitHub 帐户。 diff --git a/content/zh/docs/project-user-guide/custom-application-monitoring/examples/monitor-mysql.md b/content/zh/docs/project-user-guide/custom-application-monitoring/examples/monitor-mysql.md index 5c3f95c6a..cb0c6689c 100644 --- a/content/zh/docs/project-user-guide/custom-application-monitoring/examples/monitor-mysql.md +++ b/content/zh/docs/project-user-guide/custom-application-monitoring/examples/monitor-mysql.md @@ -30,7 +30,7 @@ MySQL 是 KubeSphere 应用商店中的内置应用，应用商店启用后可 3. 在**基本信息**下，设置**名称**并选择**版本**。在**位置**下，选择要部署该应用的项目，然后点击**下一步**。 -4. 在**应用设置**下，取消 `mysqlRootPassword` 字段的注解，并设置 root 密码，然后点击**部署**。 +4. 在**应用设置**下，取消 `mysqlRootPassword` 字段的注解，并设置 root 密码，然后点击**安装**。 5. 等待 MySQL 启动并运行。 @@ -40,7 +40,7 @@ MySQL 是 KubeSphere 应用商店中的内置应用，应用商店启用后可 1. 前往**应用商店**，点击 **MySQL Exporter**。 -2. 在详情页面，点击**部署**。 +2. 在详情页面，点击**安装**。 3. 在**基本信息**下，设置**名称**并选择**版本**。在**位置**下，选择要部署该应用的项目（须和部署 MySQL 的项目相同），然后点击**下一步**。 @@ -50,7 +50,7 @@ MySQL 是 KubeSphere 应用商店中的内置应用，应用商店启用后可 如果您使用外部 Exporter 的 Helm Chart，请务必启用 ServiceMonitor CRD。此类 Chart 通常默认禁用 ServiceMonitor，需要手动修改。 {{}} -5. 修改 MySQL 连接参数。MySQL Exporter 需要连接到目标 MySQL。在本教程中，MySQL 以服务名 `mysql-dh3ily` 进行安装。在配置文件的 `mysql` 部分，将 `host` 设置为 `mysql-dh3ily`，`pass` 设置为 `testing`， `user` 设置为 `root`，如下所示。请注意，您 MySQL 服务的**名称可能不同**。编辑完成后，点击**部署**。 +5. 修改 MySQL 连接参数。MySQL Exporter 需要连接到目标 MySQL。在本教程中，MySQL 以服务名 `mysql-dh3ily` 进行安装。在配置文件的 `mysql` 部分，将 `host` 设置为 `mysql-dh3ily`，`pass` 设置为 `testing`， `user` 设置为 `root`，如下所示。请注意，您 MySQL 服务的**名称可能不同**。编辑完成后，点击**安装**。 6. 等待 MySQL Exporter 启动并运行。 @@ -58,7 +58,7 @@ MySQL 是 KubeSphere 应用商店中的内置应用，应用商店启用后可 您可以为 MySQL 创建监控面板，并将指标实时可视化。 -1. 在同一项目中，选择侧边栏中**监控告警**下的**自定义监控面板**，点击**创建**。 +1. 在同一项目中，选择侧边栏中**监控告警**下的**自定义监控**，点击**创建**。 2. 在弹出的对话框中，为监控面板设置名称（例如，`mysql-overview`）并选择 MySQL 模板。点击**下一步**继续。 diff --git a/content/zh/docs/project-user-guide/custom-application-monitoring/examples/monitor-sample-web.md b/content/zh/docs/project-user-guide/custom-application-monitoring/examples/monitor-sample-web.md index 88fb35642..5e81bb3c6 100644 --- a/content/zh/docs/project-user-guide/custom-application-monitoring/examples/monitor-sample-web.md +++ b/content/zh/docs/project-user-guide/custom-application-monitoring/examples/monitor-sample-web.md @@ -43,7 +43,7 @@ weight: 10813 1. 点击 `prometheus-example-app`。 -2. 展开菜单，点击**测试安装**。 +2. 展开菜单，点击**安装**。 3. 请确保将示例 Web 应用程序部署至 `test` 项目，点击**下一步**。 diff --git a/content/zh/docs/project-user-guide/image-builder/binary-to-image.md b/content/zh/docs/project-user-guide/image-builder/binary-to-image.md index 4c0e8085d..4f60fe105 100644 --- a/content/zh/docs/project-user-guide/image-builder/binary-to-image.md +++ b/content/zh/docs/project-user-guide/image-builder/binary-to-image.md @@ -69,7 +69,7 @@ Binary-to-Image (B2I) 是一个工具箱和工作流，用于从二进制可执 {{< notice note >}} - 有关如何在**容器设置**页面设置其他参数的更多信息，请参见[容器镜像设置](../../../project-user-guide/application-workloads/container-image-settings/)。 + 有关如何在**容器设置**页面设置其他参数的更多信息，请参见[容器组设置](../../../project-user-guide/application-workloads/container-image-settings/)。 {{}} diff --git a/content/zh/docs/project-user-guide/image-builder/source-to-image.md b/content/zh/docs/project-user-guide/image-builder/source-to-image.md index 5318818a8..a20a1316a 100644 --- a/content/zh/docs/project-user-guide/image-builder/source-to-image.md +++ b/content/zh/docs/project-user-guide/image-builder/source-to-image.md @@ -83,7 +83,7 @@ Source-to-Image (S2I) 是一个工具箱和工作流，用于从源代码构建 **超时时间（s）**：探针超时的秒数。本字段输入 `10`。 - 其他字段请直接使用默认值。有关如何在**容器设置**页面配置探针和设置其他参数的更多信息，请参见[容器镜像设置](../../../project-user-guide/application-workloads/container-image-settings/)。 + 其他字段请直接使用默认值。有关如何在**容器设置**页面配置探针和设置其他参数的更多信息，请参见[容器组设置](../../../project-user-guide/application-workloads/container-image-settings/)。 6. 在**存储卷设置**页面，您可以为容器添加存储卷。有关更多信息，请参见[存储卷](../../../project-user-guide/storage/volumes/)。点击**下一步**继续。 diff --git a/content/zh/docs/project-user-guide/storage/volumes.md b/content/zh/docs/project-user-guide/storage/volumes.md index 0e8fed146..3fc3ecf8c 100644 --- a/content/zh/docs/project-user-guide/storage/volumes.md +++ b/content/zh/docs/project-user-guide/storage/volumes.md @@ -34,13 +34,13 @@ weight: 10310 {{}} -4. 在**存储卷设置**页面，选择创建存储卷的方式。 +4. 在**存储设置**页面，选择创建存储卷的方式。 - - **通过存储类型**：您可以在 KubeSphere [安装前](../../../installing-on-linux/persistent-storage-configurations/understand-persistent-storage/)或[安装后](../../../cluster-administration/persistent-volume-and-storage-class/)配置存储类型。 + - **通过存储类型创建**：您可以在 KubeSphere [安装前](../../../installing-on-linux/persistent-storage-configurations/understand-persistent-storage/)或[安装后](../../../cluster-administration/persistent-volume-and-storage-class/)配置存储类型。 - **通过存储卷快照创建**：如需通过快照创建存储卷，您必须先创建存储卷快照。 - 选择**通过存储类型**。有关通过存储卷快照创建存储卷的更多信息，请参阅[存储卷快照](../volume-snapshots/)。 + 选择**通过存储类型创建**。有关通过存储卷快照创建存储卷的更多信息，请参阅[存储卷快照](../volume-snapshots/)。 5. 从下拉列表中选择存储类型。本教程以青云QingCloud 平台提供的 `csi-standard` 标准存储类型为例。您可以根据需要选择其他存储类型。 6. 由于一些 PersistentVolume 只支持特定的访问模式，页面上显示的访问模式会因您选择的存储类型而不同。访问模式一共有三种： @@ -129,9 +129,9 @@ kubectl patch pvc -p '{"metadata":{"finalizers":null}}' **更多操作**下拉菜单提供了三个额外功能，这些功能基于 KubeSphere 的底层存储插件 `Storage Capability`。具体如下： -- **存储卷克隆**：创建一个相同的存储卷。 +- **克隆**：创建一个相同的存储卷。 - **创建快照**：创建一个存储卷快照，可用于创建其他存储卷。有关更多信息，请参阅[存储卷快照](../volume-snapshots/)。 -- **存储卷扩容**：增加存储卷的容量。请注意，您无法在控制台上减少存储卷的容量，因为数据可能会因此丢失。 +- **扩容**：增加存储卷的容量。请注意，您无法在控制台上减少存储卷的容量，因为数据可能会因此丢失。 有关 `Storage Capability` 的更多信息，请参阅[设计文档](https://github.com/kubesphere/community/blob/master/sig-storage/concepts-and-designs/storage-capability-interface.md)。 diff --git a/static/images/docs/access-control-and-account-management/external-authentication/use-an-oauth2-identity-provider/kubesphere-login-page.png b/static/images/docs/access-control-and-account-management/external-authentication/use-an-oauth2-identity-provider/kubesphere-login-page.png deleted file mode 100644 index b75c20853..000000000 Binary files a/static/images/docs/access-control-and-account-management/external-authentication/use-an-oauth2-identity-provider/kubesphere-login-page.png and /dev/null differ