Skip to content

Commit 462dc4a

Browse files
author
Thomas Michael
committed
fix mirror-repo handling
1 parent cd0abc6 commit 462dc4a

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

argocd/argocd/projects/cluster-resources.ftl.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ spec:
1616
sourceRepos:
1717
- ${scmm.repoUrl}argocd/cluster-resources<#if scmm.provider == "gitlab">.git</#if>
1818
<#if mirrorRepos>
19-
- ${scmm.repoUrl}3rd-party-dependencies/kube-prometheus-stack<#if scmm.provider == "gitlab">.git</#if>
20-
- ${scmm.repoUrl}3rd-party-dependencies/mailhog<#if scmm.provider == "gitlab">.git</#if>
21-
- ${scmm.repoUrl}3rd-party-dependencies/ingress-nginx<#if scmm.provider == "gitlab">.git</#if>
22-
- ${scmm.repoUrl}3rd-party-dependencies/external-secrets<#if scmm.provider == "gitlab">.git</#if>
23-
- ${scmm.repoUrl}3rd-party-dependencies/vault<#if scmm.provider == "gitlab">.git</#if>
24-
- ${scmm.repoUrl}3rd-party-dependencies/cert-manager<#if scmm.provider == "gitlab">.git</#if>
19+
- ${scmm.baseUrl}<#if scmm.provider == "gitlab">3rd-party-dependencies/kube-prometheus-stack.git<#else>/repo/3rd-party-dependencies/kube-prometheus-stack</#if>
20+
- ${scmm.baseUrl}<#if scmm.provider == "gitlab">3rd-party-dependencies/mailhog.git<#else>/repo/3rd-party-dependencies/mailhog</#if>
21+
- ${scmm.baseUrl}<#if scmm.provider == "gitlab">3rd-party-dependencies/ingress-nginx.git<#else>/repo/3rd-party-dependencies/ingress-nginx</#if>
22+
- ${scmm.baseUrl}<#if scmm.provider == "gitlab">3rd-party-dependencies/external-secrets.git<#else>/repo/3rd-party-dependencies/external-secrets</#if>
23+
- ${scmm.baseUrl}<#if scmm.provider == "gitlab">3rd-party-dependencies/vault.git<#else>/repo/3rd-party-dependencies/vault</#if>
24+
- ${scmm.baseUrl}<#if scmm.provider == "gitlab">3rd-party-dependencies/cert-manager.git<#else>/repo/3rd-party-dependencies/cert-manager</#if>
2525
<#else>
2626
- https://prometheus-community.github.io/helm-charts
2727
- https://codecentric.github.io/helm-charts

docs/developers.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,8 @@ skopeo copy docker://quay.io/jetstack/cert-manager-webhook:v1.16.1 --dest-creds
589589
skopeo copy docker://bitnami/kubectl:1.29 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/bitnami/kubectl:1.29
590590
skopeo copy docker://eclipse-temurin:17-jre-alpine --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/eclipse-temurin:17-jre-alpine
591591
skopeo copy docker://ghcr.io/cloudogu/helm:3.16.1-1 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/helm:latest
592+
skopeo copy docker://cytopia/yamllint:1.25-0.7 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/yamllint:latest
593+
592594
```
593595

594596
* Deploy playground:
@@ -614,6 +616,9 @@ docker run --rm -t -u $(id -u) \
614616
--registry-password-read-only=RegistryRead12345 \
615617
--kubectl-image=localhost:30000/proxy/bitnami/kubectl:1.29 \
616618
--helm-image=localhost:30000/proxy/helm:latest \
619+
--helmkubeval-image=localhost:30000/proxy/helm:latest \
620+
--kubeval-image=localhost:30000/proxy/helm:latest \
621+
--yamllint-image=localhost:30000/proxy/yamllint:latest \
617622
--petclinic-image=localhost:30000/proxy/eclipse-temurin:17-jre-alpine \
618623
--mailhog-image=localhost:30000/proxy/mailhog:latest \
619624
--vault-image=localhost:30000/proxy/vault:latest \

0 commit comments

Comments
 (0)