From 64d1ce647a4983920e5d4a790dc73efc01d17ada Mon Sep 17 00:00:00 2001 From: wuzhongjian Date: Tue, 24 May 2022 20:50:23 +0800 Subject: [PATCH] Improve the type of Credential Signed-off-by: wuzhongjian --- .../examples/create-multi-cluster-pipeline.md | 4 ++-- .../how-to-use/create-a-pipeline-using-jenkinsfile.md | 6 +++--- .../how-to-use/gitlab-multibranch-pipeline.md | 4 ++-- content/tr/conferences/cicd-jenkinsfile.md | 6 +++--- content/zh/blogs/spring-cloud-on-kubeshpere.md | 2 +- .../examples/create-multi-cluster-pipeline.md | 4 ++-- .../how-to-use/create-a-pipeline-using-jenkinsfile.md | 4 ++-- .../how-to-use/gitlab-multibranch-pipeline.md | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/content/en/docs/devops-user-guide/examples/create-multi-cluster-pipeline.md b/content/en/docs/devops-user-guide/examples/create-multi-cluster-pipeline.md index 6b212fcd9..40affeffe 100644 --- a/content/en/docs/devops-user-guide/examples/create-multi-cluster-pipeline.md +++ b/content/en/docs/devops-user-guide/examples/create-multi-cluster-pipeline.md @@ -89,8 +89,8 @@ You must create the projects as shown in the table below in advance. Make sure y | host | kubeconfig | The host cluster for testing | | shire | kubeconfig | The member cluster for production | | rohan | kubeconfig | The member cluster for development | - | dockerhub-id | Account Credentials | Docker Hub | - | sonar-token | Secret Text | SonarQube | + | dockerhub-id | Username and password | Docker Hub | + | sonar-token | Access token | SonarQube | {{< notice note >}} diff --git a/content/en/docs/devops-user-guide/how-to-use/create-a-pipeline-using-jenkinsfile.md b/content/en/docs/devops-user-guide/how-to-use/create-a-pipeline-using-jenkinsfile.md index 82887121e..daedcccf5 100644 --- a/content/en/docs/devops-user-guide/how-to-use/create-a-pipeline-using-jenkinsfile.md +++ b/content/en/docs/devops-user-guide/how-to-use/create-a-pipeline-using-jenkinsfile.md @@ -57,13 +57,13 @@ There are eight stages as shown below in this example pipeline. | Credential ID | Type | Where to use | | --------------- | ------------------- | ------------ | - | dockerhub-id | Account Credentials | Docker Hub | - | github-id | Account Credentials | GitHub | + | dockerhub-id | Username and password | Docker Hub | + | github-id | Username and password | GitHub | | demo-kubeconfig | kubeconfig | Kubernetes | 2. You need to create an additional credential (`sonar-token`) for SonarQube, which is used in stage 3 (SonarQube analysis) mentioned above. Refer to [Create SonarQube Token for New Project](../../../devops-user-guide/how-to-integrate/sonarqube/#create-a-sonarqube-token-for-a-new-project) to enter your SonarQube token in the **Token** field for a credential of the **Access token** type. Click **OK** to finish. -3. You also need to create a GitHub personal access token with the permission as shown in the below image, and then use the generated token to create Account Credentials (for example, `github-token`) for GitHub authentication in your DevOps project. +3. You also need to create a GitHub personal access token with the permission as shown in the below image, and then use the generated token to create Username and password (for example, `github-token`) for GitHub authentication in your DevOps project. ![github-token-scope](/images/docs/devops-user-guide/using-devops/create-a-pipeline-using-a-jenkinsfile/github-token-scope.png) diff --git a/content/en/docs/devops-user-guide/how-to-use/gitlab-multibranch-pipeline.md b/content/en/docs/devops-user-guide/how-to-use/gitlab-multibranch-pipeline.md index 11160cd0c..371f5e329 100644 --- a/content/en/docs/devops-user-guide/how-to-use/gitlab-multibranch-pipeline.md +++ b/content/en/docs/devops-user-guide/how-to-use/gitlab-multibranch-pipeline.md @@ -30,8 +30,8 @@ In KubeSphere 3.1.x and later, you can create a multi-branch pipeline with GitLa | Credential ID | Type | Where to use | | --------------- | ------------------- | ------------ | - | dockerhub-id | Account Credentials | Docker Hub | - | gitlab-id | Account Credentials | GitLab | + | dockerhub-id | Username and password | Docker Hub | + | gitlab-id | Username and password | GitLab | | demo-kubeconfig | kubeconfig | Kubernetes | 2. After creation, you can see the credentials in the list. diff --git a/content/tr/conferences/cicd-jenkinsfile.md b/content/tr/conferences/cicd-jenkinsfile.md index ad32a2324..abe0cd8e6 100644 --- a/content/tr/conferences/cicd-jenkinsfile.md +++ b/content/tr/conferences/cicd-jenkinsfile.md @@ -30,8 +30,8 @@ To get started, we need to create 3 credentials, i.e. DockerHub、GitHub and kub | Credential ID | Type | Username/Password/Secret | Content | | --------------- | ------------------- | -------------------------------------------------------------------- | ------- | -| dockerhub-id | Account Credentials | Enter your personal DockerHub account information | \| | -| github-id | Account Credentials | Enter your personal GitHub account information | \| | +| dockerhub-id | Username and password | Enter your personal DockerHub account information | \| | +| github-id | Username and password | Enter your personal GitHub account information | \| | | kube-config | | demo-kubeconfig | kubeconfig | \|It will be automatically filled with the kubeconfig of the cluster | -| sonar-token | secret_text | You can get secret by creating SonarQube token | \ | +| sonar-token | Access token | You can get secret by creating SonarQube token | \ | diff --git a/content/zh/blogs/spring-cloud-on-kubeshpere.md b/content/zh/blogs/spring-cloud-on-kubeshpere.md index d33f41980..3e2e0857b 100644 --- a/content/zh/blogs/spring-cloud-on-kubeshpere.md +++ b/content/zh/blogs/spring-cloud-on-kubeshpere.md @@ -78,7 +78,7 @@ DevOps 项目是 KubeSphere 中的一个即插即用组件，提供了 CI/CD Pip 1. 登录 KubeSphere 后进入`pig-ops` DevOps 工程。 2. 在`凭证`页面中点击`创建`。 -3. 选择`账户凭证`类型，输入 DockerHub 用户名与密码，并将凭证命名为 dockerhub-id。 +3. 选择`用户名和密码`类型，输入 DockerHub 用户名与密码，并将凭证命名为 dockerhub-id。 4. 再次点击`创建`，并设置为`kubeconfig`类型, 拷贝您的 kubeconfig，并将凭证命名为 kubeconfig-id。 ![Credentials](../../../images/blogs/spring-cloud-on-kubesphere/1.Credentials.PNG) diff --git a/content/zh/docs/devops-user-guide/examples/create-multi-cluster-pipeline.md b/content/zh/docs/devops-user-guide/examples/create-multi-cluster-pipeline.md index 9f33a3b1e..c8f0bf3e2 100644 --- a/content/zh/docs/devops-user-guide/examples/create-multi-cluster-pipeline.md +++ b/content/zh/docs/devops-user-guide/examples/create-multi-cluster-pipeline.md @@ -89,8 +89,8 @@ weight: 11440 | host | kubeconfig | 用于主集群测试 | | shire | kubeconfig | 用于成员集群生产 | | rohan | kubeconfig | 用于成员集群开发 | -| dockerhub-id | 帐户凭证 | Docker Hub | -| sonar-token | 秘密文本 | SonarQube | +| dockerhub-id | 用户名和密码 | Docker Hub | +| sonar-token | 访问令牌 | SonarQube | {{< notice note >}} diff --git a/content/zh/docs/devops-user-guide/how-to-use/create-a-pipeline-using-jenkinsfile.md b/content/zh/docs/devops-user-guide/how-to-use/create-a-pipeline-using-jenkinsfile.md index e9e149915..6ca0a7c8f 100644 --- a/content/zh/docs/devops-user-guide/how-to-use/create-a-pipeline-using-jenkinsfile.md +++ b/content/zh/docs/devops-user-guide/how-to-use/create-a-pipeline-using-jenkinsfile.md @@ -57,8 +57,8 @@ KubeSphere 中可以创建两种类型的流水线：一种是本教程中介绍 | 凭证 ID | 类型 | 用途 | | --------------- | ---------- | ---------- | - | dockerhub-id | 帐户凭证 | Docker Hub | - | github-id | 帐户凭证 | GitHub | + | dockerhub-id | 用户名和密码 | Docker Hub | + | github-id | 用户名和密码 | GitHub | | demo-kubeconfig | kubeconfig | Kubernetes | 2. 您还需要为 SonarQube 创建一个凭证 (`sonar-token`)，用于上述的阶段 3（SonarQube 分析）。请参阅[为新项目创建 SonarQube 令牌 (Token)](../../../devops-user-guide/how-to-integrate/sonarqube/#为新项目创建-sonarqube-token)，在**访问令牌**类型的凭证的**令牌**字段中输入 SonarQube 令牌。点击**确定**完成操作。 diff --git a/content/zh/docs/devops-user-guide/how-to-use/gitlab-multibranch-pipeline.md b/content/zh/docs/devops-user-guide/how-to-use/gitlab-multibranch-pipeline.md index 10da18c7c..8369e34eb 100644 --- a/content/zh/docs/devops-user-guide/how-to-use/gitlab-multibranch-pipeline.md +++ b/content/zh/docs/devops-user-guide/how-to-use/gitlab-multibranch-pipeline.md @@ -30,8 +30,8 @@ weight: 11291 | 凭证 ID | 类型 | 用途 | | --------------- | ---------- | ---------- | - | dockerhub-id | 帐户凭证 | Docker Hub | - | gitlab-id | 帐户凭证 | GitLab | + | dockerhub-id | 用户名和密码 | Docker Hub | + | gitlab-id | 用户名和密码 | GitLab | | demo-kubeconfig | kubeconfig | Kubernetes | 2. 创建完成后，您可以在列表中看到创建的凭证。