Merge pull request #101 from tumido/cleanup-app-names

chore: Cleanup ArgoCD app names
operate-first · Mar 22, 2021 · 5cd6c62 · 5cd6c62
2 parents b23de35 + 75d21ed
commit 5cd6c62
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 4 deletions.
diff --git a/envs/moc/infra/cluster-management/alertreceiver.yaml b/envs/moc/infra/cluster-management/alertreceiver.yaml
@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: alertreceiver-infra
+  name: alertreceiver
 spec:
   destination:
     name: moc-infra

diff --git a/envs/moc/infra/cluster-management/cluster-resources.yaml b/envs/moc/infra/cluster-management/cluster-resources.yaml
@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: cluster-resources-infra
+  name: cluster-resources
 spec:
   destination:
     name: moc-infra

diff --git a/envs/moc/infra/cluster-management/kubevirt-hyperconverged.yaml b/envs/moc/infra/cluster-management/kubevirt-hyperconverged.yaml
@@ -2,7 +2,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: kubevirt-hyperconverged-infra
+  name: kubevirt-hyperconverged
 spec:
   destination:
     name: moc-infra

diff --git a/envs/moc/infra/cluster-management/kustomization.yaml b/envs/moc/infra/cluster-management/kustomization.yaml
@@ -6,3 +6,5 @@ resources:
   - argocd-projects.yaml
   - cluster-resources.yaml
   - kubevirt-hyperconverged.yaml
+
+nameSuffix: -infra
diff --git a/envs/moc/zero/cluster-management/alertreceiver.yaml b/envs/moc/zero/cluster-management/alertreceiver.yaml
@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: alertreceiver-zero
+  name: alertreceiver
 spec:
   destination:
     name: zero

diff --git a/envs/moc/zero/cluster-management/kustomization.yaml b/envs/moc/zero/cluster-management/kustomization.yaml
@@ -8,3 +8,5 @@ resources:
   - knative.yaml
   - kubevirt-hyperconverged.yaml
   - local-storage.yaml
+
+nameSuffix: -zero