Skip to content

Commit ddeafbd

Browse files
authored
Merge pull request #134866 from shashankbarsin/master
Add AKS-HCI to supported distros and make repository-url more generic
2 parents 4cf896e + c259baa commit ddeafbd

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

articles/azure-arc/kubernetes/overview.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ Azure Arc enabled Kubernetes features have been tested by the Arc team on follow
3333
* Canonical Charmed Kubernetes 1.18
3434
* AKS Engine
3535
* AKS Engine on Azure Stack Hub
36+
* AKS on Azure Stack HCI
3637
* Cluster API Provider Azure
3738

3839
## Supported scenarios

articles/azure-arc/kubernetes/use-gitops-connected-cluster.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,16 @@ Here are the supported scenarios for the value of --repository-url parameter.
9494

9595
| Scenario | Format | Description |
9696
| ------------- | ------------- | ------------- |
97-
| Private GitHub repo - SSH | [email protected]:username/repo | SSH keypair generated by Flux. User must add the public key to the GitHub account as Deploy Key. |
98-
| Public GitHub repo | `http://github.com/username/repo` or git://github.com/username/repo | Public Git repo |
97+
| Public Git repo | http[s]://server/repo.git or git://server/repo.git | Public Git repo |
98+
| Private Git repo – SSH – Flux-created keys | ssh://[user@]server/repo.git or [user@]server:repo.git | Public key generated by Flux needs to be added to the user account or repo in your Git service provider. More details can be found [here](#apply-configuration-from-a-private-git-repository) |
9999

100-
These scenarios are supported by Flux but not by sourceControlConfiguration yet.
100+
These scenarios are supported by Flux but not yet by sourceControlConfiguration.
101101

102102
| Scenario | Format | Description |
103103
| ------------- | ------------- | ------------- |
104-
| Private GitHub repo - HTTPS | `https://github.com/username/repo` | Flux does not generate SSH keypair. [Instructions](https://docs.fluxcd.io/en/1.17.0/guides/use-git-https.html) |
105-
| Private Git host | user@githost:path/to/repo | [Instructions](https://docs.fluxcd.io/en/1.18.0/guides/use-private-git-host.html) |
106-
| Private GitHub repo - SSH (bring your own key) | [email protected]:username/repo | [Use your own SSH keypair](https://docs.fluxcd.io/en/1.17.0/guides/provide-own-ssh-key.html) |
107-
104+
| Private Git repo - HTTPS | https://server/repo.git | Coming soon (will support username/password, username/token, certificate) |
105+
| Private Git repo - SSH – User-provided keys | ssh://[user@]server/repo.git or [user@]server:repo.git | Coming soon |
106+
| Private Git host – SSH – Custom known_hosts | ssh://[user@]server/repo.git or [user@]server:repo.git | Coming soon |
108107

109108
#### Additional Parameters
110109

@@ -221,7 +220,7 @@ Command group 'k8sconfiguration' is in preview. It may be changed/removed in a f
221220

222221
**Add the public key as a deploy key to the git repo**
223222

224-
1. Open GitHub, navigate to your fork, to **Settings**, then to **Deploy keys**
223+
1. Open GitHub, navigate to your repo, to **Settings**, then to **Deploy keys**
225224
2. Click **Add deploy key**
226225
3. Supply a Title
227226
4. Check **Allow write access**

0 commit comments

Comments
 (0)