From 9ad75a99c8fccb9faa3d0b0d8962b9e28142d3d5 Mon Sep 17 00:00:00 2001 From: Baptiste Bonnot Date: Fri, 25 Oct 2024 17:52:49 +0200 Subject: [PATCH] Correct Variables --- README.md | 6 +++--- echo-server/app/helmrelease.yaml | 4 ++-- echo-server/ks.yaml | 8 ++++---- repos/helm/bjw-s.yaml | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 58cda29..7085467 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Welcome to your ${REPOS_NAME}-tenant +# Welcome to your ${REPO_NAME}-tenant ## Table of contents @@ -19,7 +19,7 @@ several reference in the [How](#How-To) section that README. ### Usefull links -* [Get me to my Namespace](https://console-openshift-console.apps.${CLUSTER_NAME}.kvant.cloud/k8s/cluster/projects/${REPOS_NAME}-ns) +* [Get me to my Namespace](https://console-openshift-console.apps.${CLUSTER_NAME}.kvant.cloud/k8s/cluster/projects/${REPO_NAME}-ns) * [Monitoring](XXXXX) * [Flux Doc](https://fluxcd.io/flux/) * [Sops](https://getsops.io/) @@ -77,7 +77,7 @@ should cover pretty much all you need to deploy an app. #### Use Predefined Domain You can spawn any application using your namespace associated Domain. -`${REPOS_NAME}.pub.${CLUSTER}.kvant.cloud` +`${REPO_NAME}.pub.${CLUSTER}.kvant.cloud` ### Storage diff --git a/echo-server/app/helmrelease.yaml b/echo-server/app/helmrelease.yaml index 8f17cf2..df78aa4 100644 --- a/echo-server/app/helmrelease.yaml +++ b/echo-server/app/helmrelease.yaml @@ -5,7 +5,7 @@ kind: HelmRelease metadata: name: &app echo-server spec: - serviceAccountName: ${REPOS_NAME}-sa + serviceAccountName: ${REPO_NAME}-sa interval: 30m chart: spec: @@ -14,7 +14,7 @@ spec: sourceRef: kind: HelmRepository name: bjw-s - namespace: ${REPOS_NAME}-ns + namespace: ${REPO_NAME}-ns install: remediation: retries: 3 diff --git a/echo-server/ks.yaml b/echo-server/ks.yaml index 20bd16c..386d00f 100644 --- a/echo-server/ks.yaml +++ b/echo-server/ks.yaml @@ -4,18 +4,18 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: &app echo-server - namespace: ${REPOS_NAME}-ns + namespace: ${REPO_NAME}-ns spec: - targetNamespace: ${REPOS_NAME}-ns + targetNamespace: ${REPO_NAME}-ns commonMetadata: labels: app.kubernetes.io/name: *app path: ./echo-server/app prune: true - serviceAccountName: ${REPOS_NAME}-sa + serviceAccountName: ${REPO_NAME}-sa sourceRef: kind: GitRepository - name: ${REPOS_NAME}-tenant-repos + name: ${REPO_NAME}-tenant-repos wait: false interval: 30m retryInterval: 1m diff --git a/repos/helm/bjw-s.yaml b/repos/helm/bjw-s.yaml index 65e6749..5fd54ca 100644 --- a/repos/helm/bjw-s.yaml +++ b/repos/helm/bjw-s.yaml @@ -4,7 +4,7 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: bjw-s - namespace: ${REPOS_NAME}-ns + namespace: ${REPO_NAME}-ns spec: type: oci interval: 5m