Merge pull request #3 from mojaloop/upgrade-dep

revise wave ordering
mojaloop · May 23, 2023 · b3d61fb · b3d61fb
2 parents 20bdddf + 90331ae
commit b3d61fb
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 23 deletions.
diff --git a/terraform/foundation-install/external-dns-config.tf b/terraform/foundation-install/external-dns-config.tf
@@ -21,13 +21,6 @@ module "generate_extdns_files" {
   app_output_path = "${var.output_dir}/app-yamls"
 }
 
-
-variable "external_secret_sync_wave" {
-  type        = string
-  description = "external_secret_sync_wave"
-  default     = "-11"
-}
-
 variable "external_dns_credentials_secret" {
   type        = string
   description = "external_dns_credentials_secret"

diff --git a/...form/foundation-install/generate-files/templates/certmanager/app/certmanager-app.yaml.tpl b/...form/foundation-install/generate-files/templates/certmanager/app/certmanager-app.yaml.tpl
@@ -2,7 +2,7 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   annotations:
-    argocd.argoproj.io/sync-wave: "-8"
+    argocd.argoproj.io/sync-wave: "-10"
   name: certmanager-app
   namespace: argocd
   finalizers:

diff --git a/...nstall/generate-files/templates/certmanager/custom-resources/lets-cluster-issuer.yaml.tpl b/...nstall/generate-files/templates/certmanager/custom-resources/lets-cluster-issuer.yaml.tpl
@@ -3,7 +3,7 @@ kind: ClusterIssuer
 metadata:
   name: letsencrypt
   annotations:
-    argocd.argoproj.io/sync-wave: "${cert_manager_issuer_sync_wave}"
+    argocd.argoproj.io/sync-wave: "-9"
 spec:
   acme:
     # You must replace this email address with your own.

diff --git a/...rm/foundation-install/generate-files/templates/external-dns/app/external-dns-app.yaml.tpl b/...rm/foundation-install/generate-files/templates/external-dns/app/external-dns-app.yaml.tpl
@@ -2,7 +2,7 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   annotations:
-    argocd.argoproj.io/sync-wave: "-8"
+    argocd.argoproj.io/sync-wave: "-10"
   name: external-dns-app
   namespace: argocd
   finalizers:

diff --git a/terraform/foundation-install/generate-files/templates/ingress/app/ingress-app.yaml.tpl b/terraform/foundation-install/generate-files/templates/ingress/app/ingress-app.yaml.tpl
@@ -2,7 +2,7 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   annotations:
-    argocd.argoproj.io/sync-wave: "-7"
+    argocd.argoproj.io/sync-wave: "-8"
   name: ingress-app
   namespace: argocd
   finalizers:

diff --git a/terraform/foundation-install/generate-files/templates/ingress/ingress-external.yaml.tpl b/terraform/foundation-install/generate-files/templates/ingress/ingress-external.yaml.tpl
@@ -2,7 +2,7 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   annotations:
-    argocd.argoproj.io/sync-wave: "${ingress_sync_wave}"
+    argocd.argoproj.io/sync-wave: "-7"
   name: nginx-external-app
   namespace: argocd
   finalizers:

diff --git a/terraform/foundation-install/generate-files/templates/ingress/ingress-internal.yaml.tpl b/terraform/foundation-install/generate-files/templates/ingress/ingress-internal.yaml.tpl
@@ -2,7 +2,7 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   annotations:
-    argocd.argoproj.io/sync-wave: "${ingress_sync_wave}"
+    argocd.argoproj.io/sync-wave: "-7"
   name: nginx-internal-app
   namespace: argocd
   finalizers:

diff --git a/terraform/foundation-install/generate-files/templates/ingress/lets-wildcard-cert.yaml.tpl b/terraform/foundation-install/generate-files/templates/ingress/lets-wildcard-cert.yaml.tpl
@@ -4,7 +4,7 @@ metadata:
   name: wildcard-cert-internal
   namespace: default
   annotations:
-    argocd.argoproj.io/sync-wave: "${wildcare_certificate_wave}"
+    argocd.argoproj.io/sync-wave: "-8"
 spec:
   secretName: ${default_ssl_certificate}
   issuerRef:

diff --git a/terraform/foundation-install/generate-files/templates/loki/app/loki-app.yaml.tpl b/terraform/foundation-install/generate-files/templates/loki/app/loki-app.yaml.tpl
@@ -2,7 +2,7 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   annotations:
-    argocd.argoproj.io/sync-wave: "${loki_sync_wave}"
+    argocd.argoproj.io/sync-wave: "-2"
   name: loki-app
   namespace: argocd
   finalizers:

diff --git a/...oundation-install/generate-files/templates/loki/custom-resources/password-policy.yaml.tpl b/...oundation-install/generate-files/templates/loki/custom-resources/password-policy.yaml.tpl
@@ -2,6 +2,8 @@ apiVersion: redhatcop.redhat.io/v1alpha1
 kind: PasswordPolicy
 metadata:
   name: "grafana-admin"
+  annotations:
+    argocd.argoproj.io/sync-wave: "-3"
 spec:
   # Add fields here
   authentication: 

diff --git a/.../foundation-install/generate-files/templates/loki/custom-resources/random-secret.yaml.tpl b/.../foundation-install/generate-files/templates/loki/custom-resources/random-secret.yaml.tpl
@@ -2,6 +2,8 @@ apiVersion: redhatcop.redhat.io/v1alpha1
 kind: RandomSecret
 metadata:
   name: grafana-admin
+  annotations:
+    argocd.argoproj.io/sync-wave: "-3"
 spec:
   authentication: 
     path: kubernetes

diff --git a/...m/foundation-install/generate-files/templates/loki/custom-resources/vault-secret.yaml.tpl b/...m/foundation-install/generate-files/templates/loki/custom-resources/vault-secret.yaml.tpl
@@ -2,6 +2,8 @@ apiVersion: redhatcop.redhat.io/v1alpha1
 kind: VaultSecret
 metadata:
   name: grafana-admin-secret
+  annotations:
+    argocd.argoproj.io/sync-wave: "-3"
 spec:
   refreshPeriod: 1m0s
   vaultSecretDefinitions:

diff --git a/...oundation-install/generate-files/templates/storage/custom-resources/longhorn-job.yaml.tpl b/...oundation-install/generate-files/templates/storage/custom-resources/longhorn-job.yaml.tpl
@@ -3,7 +3,7 @@ kind: RecurringJob
 metadata:
   name: backup-1
   annotations:
-    argocd.argoproj.io/sync-wave: "${longhorn_job_sync_wave}"
+    argocd.argoproj.io/sync-wave: "-9"
 spec:
   cron: "0 * * * *"
   task: "backup"

diff --git a/terraform/foundation-install/generate-files/templates/vault/app/vault-app.yaml.tpl b/terraform/foundation-install/generate-files/templates/vault/app/vault-app.yaml.tpl
@@ -2,7 +2,7 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   annotations:
-    argocd.argoproj.io/sync-wave: "-5"
+    argocd.argoproj.io/sync-wave: "-6"
   name: vault-app
   namespace: argocd
   finalizers:

diff --git a/terraform/foundation-install/generate-files/templates/vault/post-config.yaml.tpl b/terraform/foundation-install/generate-files/templates/vault/post-config.yaml.tpl
@@ -3,7 +3,7 @@ kind: ConfigMap
 metadata:
   name: post-config
   annotations:
-    argocd.argoproj.io/sync-wave: "${vault_cm_sync_wave}"
+    argocd.argoproj.io/sync-wave: "-6"
 data:
   bootstrap.sh: |
     #!/bin/bash

diff --git a/terraform/foundation-install/generate-files/templates/vault/vault-config-operator.yaml.tpl b/terraform/foundation-install/generate-files/templates/vault/vault-config-operator.yaml.tpl
@@ -2,7 +2,7 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   annotations:
-    argocd.argoproj.io/sync-wave: "${vault_config_operator_sync_wave}"
+    argocd.argoproj.io/sync-wave: "-4"
   name: vault-config-operator
   namespace: argocd
   finalizers:

diff --git a/terraform/foundation-install/generate-files/templates/vault/vault-helm.yaml.tpl b/terraform/foundation-install/generate-files/templates/vault/vault-helm.yaml.tpl
@@ -2,7 +2,7 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   annotations:
-    argocd.argoproj.io/sync-wave: "${vault_sync_wave}"
+    argocd.argoproj.io/sync-wave: "-5"
   name: vault
   namespace: argocd
   finalizers:

diff --git a/terraform/foundation-install/variables.tf b/terraform/foundation-install/variables.tf
@@ -14,14 +14,11 @@ variable "gitlab_server_url" {
   description = "gitlab_server_url"
 }
 
-
-
 variable "gitlab_project_url" {
   type        = string
   description = "gitlab_project_url"
 }
 
-
 variable "nat_public_ips" {
   type        = string
   description = "nat_public_ips"
@@ -80,6 +77,12 @@ variable "gitlab_key_gitlab_ci_pat" {
   description = "gitlab_key_gitlab_ci_pat"
 }
 
+variable "external_secret_sync_wave" {
+  type        = string
+  description = "external_secret_sync_wave"
+  default     = "-11"
+}
+
 locals {
   cloud_region     = data.gitlab_project_variable.cloud_region.value
   k8s_cluster_type = data.gitlab_project_variable.k8s_cluster_type.value