From b9aab101dacb7e8962a81a0ebdc598b8b06e9ef1 Mon Sep 17 00:00:00 2001 From: Alex Corvin Date: Fri, 16 Feb 2024 11:03:03 -0500 Subject: [PATCH] Move sandbox telemetry grafana to new cluster --- .../applications/dh-sandbox-telemetry-grafana.yaml | 8 ++++---- ...ana-sandbox-argocd-manager-admin-rolebinding.yml | 13 +++++++++++++ .../telemetry-grafana-sandbox-tenantnamespace.yaml | 9 +++++++++ .../overlays/sandbox/kustomization.yaml | 2 +- 4 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 bootstrap/argocd/rolebindings/telemetry-grafana-sandbox-argocd-manager-admin-rolebinding.yml create mode 100644 bootstrap/namespaces/telemetry-grafana-sandbox-tenantnamespace.yaml diff --git a/bootstrap/argocd/applications/dh-sandbox-telemetry-grafana.yaml b/bootstrap/argocd/applications/dh-sandbox-telemetry-grafana.yaml index c9033ff2..655cf8a6 100644 --- a/bootstrap/argocd/applications/dh-sandbox-telemetry-grafana.yaml +++ b/bootstrap/argocd/applications/dh-sandbox-telemetry-grafana.yaml @@ -6,8 +6,8 @@ metadata: namespace: internal-data-hub--argocd spec: destination: - namespace: dh-sandbox-telemetry-grafana - server: https://api.datahub-ocp4.prod.psi.redhat.com:6443 + namespace: internal-data-hub--telemetry-grafana-sandbox + server: https://api.gpc.ocp-hub.prod.psi.redhat.com:6443 project: internal-data-hub source: path: telemetry-grafana/overlays/sandbox @@ -32,8 +32,8 @@ metadata: namespace: internal-data-hub--argocd spec: destination: - namespace: dh-sandbox-telemetry-grafana - server: https://api.datahub-ocp4.prod.psi.redhat.com:6443 + namespace: internal-data-hub--telemetry-grafana-sandbox + server: https://api.gpc.ocp-hub.prod.psi.redhat.com:6443 project: internal-data-hub source: path: overlays/sandbox diff --git a/bootstrap/argocd/rolebindings/telemetry-grafana-sandbox-argocd-manager-admin-rolebinding.yml b/bootstrap/argocd/rolebindings/telemetry-grafana-sandbox-argocd-manager-admin-rolebinding.yml new file mode 100644 index 00000000..dd7026c1 --- /dev/null +++ b/bootstrap/argocd/rolebindings/telemetry-grafana-sandbox-argocd-manager-admin-rolebinding.yml @@ -0,0 +1,13 @@ +kind: RoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: argocd-manager-admin + namespace: internal-data-hub--telemetry-grafana-sandbox +subjects: + - kind: ServiceAccount + name: tenantaccess-argocd-manager + namespace: internal-data-hub--config +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: admin diff --git a/bootstrap/namespaces/telemetry-grafana-sandbox-tenantnamespace.yaml b/bootstrap/namespaces/telemetry-grafana-sandbox-tenantnamespace.yaml new file mode 100644 index 00000000..8849c030 --- /dev/null +++ b/bootstrap/namespaces/telemetry-grafana-sandbox-tenantnamespace.yaml @@ -0,0 +1,9 @@ +apiVersion: tenant.paas.redhat.com/v1alpha1 +kind: TenantNamespace +metadata: + name: telemetry-grafana-sandbox + namespace: internal-data-hub--config +spec: + type: runtime + network: + security-zone: internal diff --git a/telemetry-grafana/overlays/sandbox/kustomization.yaml b/telemetry-grafana/overlays/sandbox/kustomization.yaml index 4779a919..59aa25b9 100644 --- a/telemetry-grafana/overlays/sandbox/kustomization.yaml +++ b/telemetry-grafana/overlays/sandbox/kustomization.yaml @@ -9,7 +9,7 @@ resources: generators: - ./secret-generator.yaml -namespace: dh-sandbox-telemetry-grafana +namespace: internal-data-hub--telemetry-grafana-sandbox patchesJson6902: - target: