From a3569be53f20d6bbece1811ec6c2ae509709a298 Mon Sep 17 00:00:00 2001 From: Sven Ketelsen Date: Wed, 20 Apr 2022 19:10:40 +0200 Subject: [PATCH 1/5] SMARCH-126: bootstrap argocd with argocd --- config/default/kustomization.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 6f9870c..25ddcb9 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -1,5 +1,5 @@ # Adds namespace to all resources. -namespace: observability +namespace: jaeger-operator # Value of this field is prepended to the # names of all resources, e.g. a deployment named @@ -21,8 +21,7 @@ bases: - ../manager - ../webhook - ../certmanager -# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'. -#- ../prometheus +- ../prometheus patchesStrategicMerge: # Protect the /metrics endpoint by putting it behind auth. From fd1ed47e4f2431d4ca5803794caf52fb350bfdc2 Mon Sep 17 00:00:00 2001 From: Sven Ketelsen Date: Wed, 20 Apr 2022 19:34:05 +0200 Subject: [PATCH 2/5] SMARCH-126: bootstrap argocd with argocd --- config/default/kustomization.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 25ddcb9..d25aec5 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -1,5 +1,5 @@ # Adds namespace to all resources. -namespace: jaeger-operator +namespace: operator-jaeger # Value of this field is prepended to the # names of all resources, e.g. a deployment named From de6e77c95c17f2d0fab0fab1c95e893128774af1 Mon Sep 17 00:00:00 2001 From: Sven Ketelsen Date: Wed, 20 Apr 2022 19:48:25 +0200 Subject: [PATCH 3/5] SMARCH-126: bootstrap argocd with argocd --- config/manager/kustomization.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 41c25aa..e18af66 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -1,3 +1,4 @@ +namespace: operator-jaeger resources: - manager.yaml apiVersion: kustomize.config.k8s.io/v1beta1 From 89c4bec274a7cf1515dbe4ea8aa16a48e26df6a8 Mon Sep 17 00:00:00 2001 From: Sven Ketelsen Date: Wed, 20 Apr 2022 19:53:04 +0200 Subject: [PATCH 4/5] SMARCH-126: bootstrap argocd with argocd --- config/default/kustomization.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index d25aec5..faf325a 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -1,5 +1,5 @@ # Adds namespace to all resources. -namespace: operator-jaeger +namespace: observability # Value of this field is prepended to the # names of all resources, e.g. a deployment named From 5dfadb39471d7c516c64c62c345413e830246f51 Mon Sep 17 00:00:00 2001 From: Sven Ketelsen Date: Wed, 20 Apr 2022 19:56:23 +0200 Subject: [PATCH 5/5] SMARCH-126: bootstrap argocd with argocd --- config/default/kustomization.yaml | 2 +- config/manager/kustomization.yaml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index faf325a..d25aec5 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -1,5 +1,5 @@ # Adds namespace to all resources. -namespace: observability +namespace: operator-jaeger # Value of this field is prepended to the # names of all resources, e.g. a deployment named diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index e18af66..41c25aa 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -1,4 +1,3 @@ -namespace: operator-jaeger resources: - manager.yaml apiVersion: kustomize.config.k8s.io/v1beta1