Skip to content

Commit 3aa501b

Browse files
committed
Refactor ftl.yaml files that contain bitnami/nginx images and rename bitnami to bitnamilegacy
1 parent cd0abc6 commit 3aa501b

File tree

4 files changed

+15
-4
lines changed

4 files changed

+15
-4
lines changed

applications/argocd/nginx/helm-jenkins/k8s/values-shared.ftl.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
<#if nginxImage??>
1+
<#if nginxImage?has_content>
22
image:
33
registry: ${nginxImage.registry}
44
repository: ${nginxImage.repository}
55
tag: ${nginxImage.tag}
6+
<#else>
7+
image:
8+
repository: bitnamilegacy/nginx
69
</#if>
710
<#if config.registry.createImagePullSecrets == true>
811

applications/argocd/nginx/helm-umbrella/values.ftl.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
nginx:
2-
<#if nginxImage??>
2+
<#if nginxImage?has_content>
33
image:
44
registry: ${nginxImage.registry}
55
repository: ${nginxImage.repository}
66
tag: ${nginxImage.tag}
7+
<#else>
8+
image:
9+
repository: bitnamilegacy/nginx
710
</#if>
11+
812
<#if config.registry.createImagePullSecrets == true>
913

1014
global:

exercises/broken-application/broken-application.ftl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
spec:
1919
containers:
2020
- name: broken-application
21-
image: <#if nginxImage??>${nginxImage}<#else>bitnami/nginx:1.25.1</#if>
21+
image: <#if nginxImage??>${nginxImage}<#else>bitnamilegacy/nginx:1.25.1</#if>
2222
ports:
2323
- containerPort: 8080
2424
<#if podResources == true>

exercises/nginx-validation/k8s/values-shared.ftl.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
<#if nginxImage??>
1+
<#if nginxImage?has_content>
22
image:
33
registry: ${nginxImage.registry}
44
repository: ${nginxImage.repository}
55
tag: ${nginxImage.tag}
6+
<#else>
7+
image:
8+
repository: bitnamilegacy/nginx
69
</#if>
10+
711
<#if config.registry.createImagePullSecrets == true>
812
global:
913
imagePullSecrets:

0 commit comments

Comments
 (0)