Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitda78597

Browse files
authored
Merge branch 'master' into gitops-auto-promotion-req
2 parents3efab63 +de199cb commitda78597

File tree

33 files changed

+205
-94
lines changed

33 files changed

+205
-94
lines changed

‎_data/argohub-home-content.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@
150150
localurl:/gitops/gitops-runtimes/runtime-install-with-existing-argo-cd/
151151
-title:Install GitOps Runtime with new Argo CD
152152
localurl:/gitops/gitops-runtimes/hybrid-gitops-helm-installation/
153+
-title:Troubleshooting Runtime installation
154+
localurl:/gitops/gitops-runtimes/runtime-troubleshooting/
153155

154156

155157
-title:Administration
@@ -160,8 +162,6 @@
160162
localurl:/gitops/administration/account-user-management/create-codefresh-account/
161163
-title:Adding users and teams
162164
localurl:/gitops/administration/account-user-management/add-users/
163-
-title:Set up OAuth2 for GitOps
164-
localurl:/gitops/administration/account-user-management/oauth-setup/
165165
-title:Access control for GitOps
166166
localurl:/gitops/administration/account-user-management/gitops-abac/
167167
-title:User settings

‎_data/argohub-nav.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@
7575
url:"/hybrid-gitops-helm-installation"
7676
-title:Configure GitOps Runtime
7777
url:"/runtime-configuration"
78+
-title:Troubleshoot installation
79+
url:"/runtime-troubleshooting"
7880
-title:Runtime values file validation
7981
url:"/gitops-values-yaml-validation"
8082
-title:Ingress and service-mesh access modes
@@ -114,8 +116,6 @@
114116
url:"/service-accounts"
115117
-title:Configuring access control for GitOps
116118
url:"/gitops-abac"
117-
-title:Setting up OAuth2 for GitOps
118-
url:"/oauth-setup"
119119
-title:Authorize access to organizations/projects
120120
url:"/hosted-authorize-orgs"
121121
-title:Single Sign-On

‎_data/home-content.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,8 @@
214214
localurl:/docs/installation/gitops/runtime-install-with-existing-argo-cd/
215215
-title:Install GitOps Runtime with new Argo CD
216216
localurl:/docs/installation/gitops/hybrid-gitops-helm-installation/
217+
-title:Troubleshooting Runtime installation
218+
localurl:/docs/installation/gitops/runtime-troubleshooting/
217219

218220

219221
-title:Administration

‎_data/nav.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,9 @@
612612
-title:Install GitOps Runtime with existing Argo CD
613613
url:"/runtime-install-with-existing-argo-cd"
614614
-title:Install GitOps Runtime with new Argo CD
615-
url:"/hybrid-gitops-helm-installation"
615+
url:"/hybrid-gitops-helm-installation"
616+
-title:Troubleshoot installation
617+
url:"/runtime-troubleshooting"
616618
-title:On-premises GitOps Runtime
617619
url:"/on-prem-gitops-runtime-install"
618620
-title:Runtime values file validation

‎_docs/administration/account-user-management/oauth-setup.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,9 @@ Create and register an OAuth App under your organization to authorize Codefresh.
127127
{:start="2"}
128128
1. Note down the following, as you will need them to create the K8s secret for the Git OAuth2 application:
129129
* GitHub: Application ID from the URL, Client ID, and the client secret
130-
{% if page.collection != site.gitops_collection %}
131130
* GitLab Cloud and Server: Application ID and Secret
132131
* Bitbucket Data Center: Key and Secret
133-
{% endif %}
132+
134133

135134
<br>
136135

‎_docs/administration/user-self-management/manage-pats.md‎

Lines changed: 42 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ toc: true
88
##Git user token management
99
As a user in Codefresh, you must authorize access to your Git provider accounts and authenticate Git-based actions from Codefresh clients, per provisioned GitOps Runtime. This is done through the Git user token, which is an access token unique to each user. For more details, including required scopes and how the Git user token differs from the Git Runtime token, see[Git tokens in Codefresh]({{site.baseurl}}/docs/security/git-tokens/).
1010

11-
11+
{% if page.collection != site.gitops_collection %}
1212
The authorization mode depends on the authorization method set up by your account admin:
1313
***OAuth2**
1414
If your admin has set up authentication with OAuth2, you can authorize access using OAuth2.
@@ -27,18 +27,14 @@ If you have access to more than one GitOps Runtime in the same or in different a
2727
For OAuth2, the administrator pre-configures the permissions and expiry date. Once you supply your credentials for authorization, you are automatically directed to the Git Personal Tokens page.
2828

2929
#####Before you begin
30-
{% if page.collection != site.gitops_collection %}
3130
Make sure you have:
3231
* For Bitbucket only, your Bitbucket account username
3332
* If needed, a_user access token_ from your Git provider with the required scopes:
3433
*[GitHub](#generate-github-user-access-tokens)
3534
*[GitLab](#generate-gitlab-user-access-tokens)
3635
*[Bitbucket](#generate-bitbucket-user-access-tokens)
37-
{% endif %}
3836

39-
{% if page.collection== site.gitops_collection %}
4037
* Make sure you have a_user access token_ with the required scopes for[GitHub](#generate-github-user-access-tokens)
41-
{% endif %}
4238

4339
#####How to
4440
1. In the Codefresh UI, on the toolbar, click your avatar, and then select**Git Personal Access Token**.
@@ -50,9 +46,7 @@ Make sure you have:
5046
1. Complete the verification if required, as when two-factor authentication is configured, for example.
5147
* For**Git user tokens**:
5248
1. Expand**Advanced authorization options**.
53-
{% if page.collection != site.gitops_collection %}
5449
1. For Bitbucket, enter your**Bitbucket username**.
55-
{% endif %}
5650
1. In the**Personal Access Token** field, paste the token you generated.
5751

5852
{%
@@ -69,15 +63,54 @@ max-width="50%"
6963
{:start="4"}
7064
1. Click**Add Token**.
7165
In the Git Personal Access Tokens list, you can see that the new token is assigned to the GitOps Runtime.
66+
{% endif %}
67+
68+
69+
{% if page.collection == site.gitops_collection %}
70+
>**NOTE**
71+
Codefresh GitOps does not officially support fine-grained tokens, or tokens with custom scopes. If you are using such tokens, make sure you turn off validation for Git tokens in the`values.yaml` file, as described in[Skipping token values.yaml]({{site.baseurl}}/docs/security/git-tokens#skipping-token-validation-in-valuesyaml).
72+
73+
##Authorize Git access to GitOps Runtimes
74+
Authorize Git access to GitOps Runtimes through Git user access tokens from your Git provider.
75+
76+
If you have access to more than one GitOps Runtime in the same or in different accounts, you can use the same Git user token for all the Runtimes you have access to._You must however authorize access for each GitOps Runtime individually_.
77+
78+
79+
#####Before you begin
80+
81+
* Make sure you have a_user access token_ with the required scopes for[GitHub](#generate-github-user-access-tokens)
82+
83+
#####How to
84+
1. In the Codefresh UI, on the toolbar, click your avatar, and then select**Git Personal Access Token**.
85+
1. Select the GitOps Runtime to authenticate to, and then click**Add Token**.
86+
1. For**Git user tokens**:
87+
1. Expand**Advanced authorization options**.
88+
1. In the**Personal Access Token** field, paste the token you generated.
89+
90+
{%
91+
include
92+
image.html
93+
lightbox="true"
94+
file="/images/runtime/gitops-user-authorize-runtime-access.png"
95+
url="/images/runtime/gitops-user-authorize-runtime-access.png"
96+
alt="Authorize access to GitOps Runtime with OAuth/Git user token"
97+
caption="Authorize access to GitOps Runtime with OAuth/Git user token"
98+
max-width="50%"
99+
%}
100+
101+
{:start="4"}
102+
1. Click**Add Token**.
103+
In the Git Personal Access Tokens list, you can see that the new token is assigned to the GitOps Runtime.
104+
{% endif %}
72105

73106
##Manage Git user tokens for GitOps Runtimes
74-
Once you authorize access to one or more GitOps Runtimes through OAuth or Git user tokens, the GitOps Runtimes and their associated tokens are listed in the Git Personal Access Tokens page.
107+
Once you authorize access to one or more GitOps Runtimes through{% if page.collection != site.gitops_collection %}OAuth or{% endif %} Git user tokens, the GitOps Runtimes and their associated tokens are listed in the Git Personal Access Tokens page.
75108

76109
#####Manage Git user access tokens
77110
You can manage Git user tokens for any GitOps Runtime, without affecting the GitOps Runtime at the account-level. Deleting the Git user token for a GitOps Runtime will deny_you_ access to the Git repositories, Git Sources and other resources associated with that Runtime, while the Runtime itself is not affected.
78111

79112
#####Notifications for GitOps Runtimes
80-
If you have turned on notifications for GitOps Runtimes, Codefresh alerts you toGitOps Runtimes with invalid or expired Git personal access tokens.
113+
If you have turned on notifications for GitOps Runtimes, Codefresh alerts you tothose Runtimes with invalid or expired Git personal access tokens.
81114
You can turn off these notifications for selectively for Runtimes for which these alerts are less critical.
82115

83116
#####Before you begin

‎_docs/environments/manage-apps-in-environments.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,10 @@ Promote a product or application from the Environments dashboard using one of tw
4848
Drag a product or application with changes to the target environment to promote it. Customize the Promotion Settings to control promotion behavior for the environment.
4949
This method is best for quick promotions to test changes within a specific environment, typically in internal environments.
5050

51-
Watch this video:
52-
{::nomarkdown}<img src=../../../images/icons/video-play-icon-blue.svg?display=inline-block>{:/}[Drag-and-drop promotions](https://www.youtube.com/watch?v=4isYoutmRco){:target="\_blank"}
51+
<iframewidth="560"height="315"src="https://www.youtube.com/embed/4isYoutmRco?si=DYKHnarfK2Wx6rNI"title="YouTube video player"frameborder="0"allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"referrerpolicy="strict-origin-when-cross-origin"allowfullscreen></iframe>
52+
53+
<!--- Watch this video:
54+
{::nomarkdown}<img src=../../../images/icons/video-play-icon-blue.svg?display=inline-block>{:/} [Drag-and-drop promotions](https://www.youtube.com/watch?v=4isYoutmRco){:target="\_blank"}-->
5355

5456

5557

‎_docs/installation/gitops/git-sources.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ A Git Source is a unique entity created for use with GitOps Runtimes in Codefres
1010
The Git Source connects to a Git repository within your organization, serving as an easy way to manage the deployment and configuration of Argo CD applications on clusters.
1111
The Git repository referenced by the Git Source stores application manifests and other resources which are always synced to the cluster. Codefresh manages the Git Source itself as an Argo CD application.
1212

13-
Watch this video:
14-
{::nomarkdown}{% if page.collection != site.gitops_collection %}<img src=../../../../images/icons/video-play-icon-blue.svg?display=inline-block>{% endif %}{% if page.collection == site.gitops_collection %}<img src=../../../images/icons/video-play-icon-blue.svg?display=inline-block>{% endif %}{:/}[Git Sources in Runtimes](https://www.youtube.com/watch?v=StKxdCcOIQc&t=2s){:target="\_blank"}
13+
<iframewidth="560"height="315"src="https://www.youtube.com/embed/StKxdCcOIQc?si=s3tc2tcq7fwxBUbz"title="YouTube video player"frameborder="0"allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"referrerpolicy="strict-origin-when-cross-origin"allowfullscreen></iframe>
14+
15+
<!--- Watch this video:
16+
{::nomarkdown}{% if page.collection != site.gitops_collection %}<img src=../../../../images/icons/video-play-icon-blue.svg?display=inline-block>{% endif %}{% if page.collection == site.gitops_collection %}<img src=../../../images/icons/video-play-icon-blue.svg?display=inline-block>{% endif %}{:/} [Git Sources in Runtimes](https://www.youtube.com/watch?v=StKxdCcOIQc&t=2s){:target="\_blank"}-->
1517

1618

1719
#####Types of Git Sources

‎_docs/installation/gitops/gitops-runtime.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ See [Install GitOps Runtime with new Argo CD]({{site.baseurl}}/docs/installation
5252

5353
You can install one GitOps Runtime per cluster. To add more, each Runtime must be on a separate cluster and have a unique name.
5454

55-
55+
<iframewidth="560"height="315"src="https://www.youtube.com/embed/vtCoi3-Rt6w?si=EqlKsiRtdIGcZLaX"title="YouTube video player"frameborder="0"allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"referrerpolicy="strict-origin-when-cross-origin"allowfullscreen></iframe>
5656

5757

5858
{% if page.collection != site.gitops_collection %}

‎_docs/installation/gitops/gitops-values-yaml-validation.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,10 @@ global:
7979
{% endhighlight %}
8080

8181
##Disable validation for custom/fine-grained Git tokens
82-
When using token with custom scopes, or GitHub's fine-grained tokens (currently not officially supported by Codefresh),_skip token validation_ to avoid validation failures during installation.
82+
When using token with custom scopes, or GitHub's fine-grained tokens (currently not officially supported by Codefresh),_for Runtime version v0.18.0 or lower, skip token validation_ to avoid validation failures during installation.
8383

84-
Add the`skipGitPermissionValidation` flag to your`values.yaml` file:
84+
85+
* Add the`skipGitPermissionValidation` flag to your`values.yaml` file:
8586

8687
```yaml
8788
app-proxy:
@@ -105,6 +106,5 @@ where:
105106
* `<version>` is the version of the runtime to install.
106107

107108

108-
## Install first GitOps Runtime in account
109-
If you are installing the first GitOps Runtime in your Codefresh account, follow the installation wizard for guided instructions.
109+
110110

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp