Skip to content

Commit

Permalink
Merge pull request #35 from geoffallendev/helm-user1-error
Browse files Browse the repository at this point in the history
user1  hardcoded in Helm Documentation
  • Loading branch information
gnunn1 authored Aug 15, 2024
2 parents 6ca1b81 + ec54698 commit 5ad3205
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ ADD . /antora/

RUN antora generate --stacktrace site.yml

FROM registry.access.redhat.com/rhscl/httpd-24-rhel7
FROM registry.access.redhat.com/ubi8/httpd-24

COPY --from=builder /antora/gh-pages/ /var/www/html/
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: bgd-helm
spec:
destination:
namespace: user1-bgdh
namespace: user%USERNUM%-bgdh
server: 'https://kubernetes.default.svc'
source:
path: documentation/modules/ROOT/examples/bgd-helm-chart
Expand Down
2 changes: 1 addition & 1 deletion documentation/modules/ROOT/examples/bgd-app-helm-para.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: bgd-helm
spec:
destination:
namespace: user1-bgdh
namespace: user%USERNUM%-bgdh
server: 'https://kubernetes.default.svc'
source:
path: documentation/modules/ROOT/examples/bgd-helm-chart
Expand Down
2 changes: 1 addition & 1 deletion documentation/modules/ROOT/examples/bgd-app-helm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: bgd-helm
spec:
destination:
namespace: user1-bgdh
namespace: user%USERNUM%-bgdh
server: 'https://kubernetes.default.svc'
source:
path: documentation/modules/ROOT/examples/bgd-helm-chart
Expand Down
10 changes: 5 additions & 5 deletions documentation/modules/ROOT/pages/04-helm.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -207,17 +207,17 @@ You should see the following output:
include::ROOT:example$bgd-app-helm.yaml[]
----

This YAML configuration defines an Argo CD Application named "bgd-helm" that deploys a Helm chart from a specific Git repository to the "user1-bgdh" namespace.
This YAML configuration defines an Argo CD Application named "bgd-helm" that deploys a Helm chart from a specific Git repository to the "%USERNUM%-bgdh" namespace.

==== Step 2: Deploy/Observe the Argo CD Application


Apply the configuration in the file to create the Argo CD Application in the namespace user1-argocd. This application will deploy the Helm chart for the BGD app:
Apply the configuration in the file to create the Argo CD Application in the namespace user%USERNUM%-argocd. This application will deploy the Helm chart for the BGD app:

[.console-input]
[source,bash,subs="attributes+,+macros"]
----
oc apply -f ~/openshift-gitops-workshop/documentation/modules/ROOT/examples/bgd-app-helm.yaml -n user1-argocd
oc apply -f ~/openshift-gitops-workshop/documentation/modules/ROOT/examples/bgd-app-helm.yaml -n user%USERNUM%-argocd
----

In the ArgoCD interface you should see the successful deployment of the "bgd-helm" application.
Expand Down Expand Up @@ -308,7 +308,7 @@ Now, apply the custom values file to the initial application using Argo CD:
[.console-input]
[source,bash,subs="attributes+,+macros"]
----
oc apply -f ~/openshift-gitops-workshop/documentation/modules/ROOT/examples/bgd-app-helm-custom.yaml -n user1-argocd
oc apply -f ~/openshift-gitops-workshop/documentation/modules/ROOT/examples/bgd-app-helm-custom.yaml -n user%USERNUM%-argocd
----

==== Step 4: Verify the Changes
Expand Down Expand Up @@ -368,7 +368,7 @@ Apply this parameterised configuration to Argo CD:
[.console-input]
[source,bash,subs="attributes+,+macros"]
----
oc apply -f ~/openshift-gitops-workshop/documentation/modules/ROOT/examples/bgd-app-helm-para.yaml -n user1-argocd
oc apply -f ~/openshift-gitops-workshop/documentation/modules/ROOT/examples/bgd-app-helm-para.yaml -n user%USERNUM%-argocd
----

Return to the ArgoCD interface and navigate to the 'App Details' section. Click on 'Parameters.' You will notice that the custom values file, which was present in the previous example, has been successfully removed from the ArgoCD Application.
Expand Down

0 comments on commit 5ad3205

Please sign in to comment.