From a5de0c3af9c187b3a00d3547e7829a9eea6f5d65 Mon Sep 17 00:00:00 2001 From: Wahab Ali Date: Tue, 27 Aug 2024 15:10:49 -0400 Subject: [PATCH] Rename installApps to installBeachHeadServices --- config/dev/deployment.yaml | 1 - templates/aws-standalone-cp/README.md | 4 ++-- .../templates/{apps => beachheadservices}/cert-manager.yaml | 2 +- .../{apps => beachheadservices}/nginx-ingress.yaml | 2 +- templates/aws-standalone-cp/values.yaml | 6 +++--- 5 files changed, 7 insertions(+), 8 deletions(-) rename templates/aws-standalone-cp/templates/{apps => beachheadservices}/cert-manager.yaml (95%) rename templates/aws-standalone-cp/templates/{apps => beachheadservices}/nginx-ingress.yaml (94%) diff --git a/config/dev/deployment.yaml b/config/dev/deployment.yaml index c764f5450..58ba18e32 100644 --- a/config/dev/deployment.yaml +++ b/config/dev/deployment.yaml @@ -15,4 +15,3 @@ spec: worker: amiID: ami-02f3416038bdb17fb instanceType: t3.small - installApps: true diff --git a/templates/aws-standalone-cp/README.md b/templates/aws-standalone-cp/README.md index 83a39630c..268e26297 100644 --- a/templates/aws-standalone-cp/README.md +++ b/templates/aws-standalone-cp/README.md @@ -4,8 +4,8 @@ To install applications into the target cluster created using Cluster API (CAPI) **Reference:** https://fluxcd.io/flux/components/helm/helmreleases/#remote-clusters--cluster-api -This chart/template already defines the following applications under `templates/apps` which can be be installed into the target cluster by setting `.Values.installApps=true`: +This chart/template already defines the following applications under `templates/beachheadservices` which can be be installed into the target cluster by setting `.Values.installBeachHeadServices=true`: 1. cert-manager 2. nginx-ingress -**Important:** The Flux objects added to `templates/apps` to install custom applications must have the `hmc.mirantis.com/managed: "true"` label to be reconciled by HMC. +**Important:** The Flux objects added to `templates/beachheadservices` to install custom applications must have the `hmc.mirantis.com/managed: "true"` label to be reconciled by HMC. diff --git a/templates/aws-standalone-cp/templates/apps/cert-manager.yaml b/templates/aws-standalone-cp/templates/beachheadservices/cert-manager.yaml similarity index 95% rename from templates/aws-standalone-cp/templates/apps/cert-manager.yaml rename to templates/aws-standalone-cp/templates/beachheadservices/cert-manager.yaml index cf25e1f81..36c6b8f33 100644 --- a/templates/aws-standalone-cp/templates/apps/cert-manager.yaml +++ b/templates/aws-standalone-cp/templates/beachheadservices/cert-manager.yaml @@ -1,4 +1,4 @@ -{{- if .Values.installApps }} +{{- if .Values.installBeachHeadServices }} apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: diff --git a/templates/aws-standalone-cp/templates/apps/nginx-ingress.yaml b/templates/aws-standalone-cp/templates/beachheadservices/nginx-ingress.yaml similarity index 94% rename from templates/aws-standalone-cp/templates/apps/nginx-ingress.yaml rename to templates/aws-standalone-cp/templates/beachheadservices/nginx-ingress.yaml index 118994fe2..73c329159 100644 --- a/templates/aws-standalone-cp/templates/apps/nginx-ingress.yaml +++ b/templates/aws-standalone-cp/templates/beachheadservices/nginx-ingress.yaml @@ -1,4 +1,4 @@ -{{- if .Values.installApps }} +{{- if .Values.installBeachHeadServices }} apiVersion: source.toolkit.fluxcd.io/v1beta2 kind: OCIRepository metadata: diff --git a/templates/aws-standalone-cp/values.yaml b/templates/aws-standalone-cp/values.yaml index 3dd4409ad..e7ac91c8a 100644 --- a/templates/aws-standalone-cp/values.yaml +++ b/templates/aws-standalone-cp/values.yaml @@ -45,6 +45,6 @@ worker: k0s: version: v1.30.2+k0s.0 -# Optionally install apps defined under -# templates/apps into target cluster -installApps: false +# Optionally install applications defined under +# templates/beachheadservices into target cluster +installBeachHeadServices: true