diff --git a/bootstrap/argocd/applications/dh-prod-superset.ocp4.yaml b/bootstrap/argocd/applications/superset-prod.yaml similarity index 74% rename from bootstrap/argocd/applications/dh-prod-superset.ocp4.yaml rename to bootstrap/argocd/applications/superset-prod.yaml index b0c03c8c..f1b88315 100644 --- a/bootstrap/argocd/applications/dh-prod-superset.ocp4.yaml +++ b/bootstrap/argocd/applications/superset-prod.yaml @@ -1,12 +1,12 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: ocp4.dh-prod-superset + name: superset-prod namespace: internal-data-hub--argocd spec: destination: - namespace: dh-prod-superset - server: https://api.datahub-ocp4.prod.psi.redhat.com:6443 + namespace: internal-data-hub--superset-prod + server: https://api.gpc.ocp-hub.prod.psi.redhat.com:6443 project: internal-data-hub source: path: superset/overlays/prod diff --git a/bootstrap/argocd/rolebindings/superset-prod-argocd-manager-admin-rolebinding.yml b/bootstrap/argocd/rolebindings/superset-prod-argocd-manager-admin-rolebinding.yml new file mode 100644 index 00000000..3e4f238c --- /dev/null +++ b/bootstrap/argocd/rolebindings/superset-prod-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--superset-prod +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/superset-prod-tenantnamespace.yaml b/bootstrap/namespaces/superset-prod-tenantnamespace.yaml new file mode 100644 index 00000000..f9d14d8b --- /dev/null +++ b/bootstrap/namespaces/superset-prod-tenantnamespace.yaml @@ -0,0 +1,9 @@ +apiVersion: tenant.paas.redhat.com/v1alpha1 +kind: TenantNamespace +metadata: + name: superset-prod + namespace: internal-data-hub--config +spec: + type: runtime + network: + security-zone: internal diff --git a/superset/overlays/prod/kustomization.yaml b/superset/overlays/prod/kustomization.yaml index 55ae487f..dae92baa 100644 --- a/superset/overlays/prod/kustomization.yaml +++ b/superset/overlays/prod/kustomization.yaml @@ -1,7 +1,7 @@ --- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: dh-prod-superset +namespace: internal-data-hub--superset-prod resources: - ../../base/ @@ -131,6 +131,9 @@ patchesJson6902: path: "/metadata/annotations" value: haproxy.router.openshift.io/timeout: 200s + - op: add + path: "/spec/host" + value: "superset-internal-data-hub--superset-prod.apps.int.gpc.ocp-hub.prod.psi.redhat.com" target: kind: Route name: superset diff --git a/superset/overlays/prod/superset-secured-route.enc.yaml b/superset/overlays/prod/superset-secured-route.enc.yaml index 5070176f..4c1f7c44 100644 --- a/superset/overlays/prod/superset-secured-route.enc.yaml +++ b/superset/overlays/prod/superset-secured-route.enc.yaml @@ -5,6 +5,7 @@ metadata: haproxy.router.openshift.io/timeout: 1800s labels: app: superset + shard: internal name: superset-datahub spec: host: superset.datahub.redhat.com @@ -24,8 +25,8 @@ sops: azure_kv: [] hc_vault: [] age: [] - lastmodified: "2024-02-27T18:31:22Z" - mac: ENC[AES256_GCM,data:WJpDBruSjMB6uNnuii4lTm4V/zppx9L3A9KUqJX3Vw60bZRQrEC1qPv4MB8cYb34ZfnYnD7SjT7YRrZSJiXpTWG+sqyeoJvjgGPWdzZ5CZTlh8NlE9zUKWrr0OEw9i8xAVOUMQ0pENMcR6ZDsptjXjex7db29SQnSukFYGvwnBc=,iv:ofxFGMLGTej1CFA89Ee6qAcyyYd0RIpZk2d9dB+r+A8=,tag:Tb4GSHJxeLZ13PRPCcL7rQ==,type:str] + lastmodified: "2024-02-28T13:05:07Z" + mac: ENC[AES256_GCM,data:aZ0y1R4skDvaFA6oK66YZx9GkdTrQbM0NjseRP7KaCsZf02AG/I8VaKaYYKl65899Nb4o+MhVkNcCBsjBNKBDgbYVif1nDCsrFDkhFrhTNj++kGG7SfPnvUwNdrXYeEph0IkbqIideXoRlhWkLKNbrze4nuqU4ZqNRUwPPwYLAg=,iv:KYxGNWcmPoqdolKq4IlRKCpVoqQrrN6vSE3DvvP555I=,tag:byLoRZ1/kMvGQerkmXg2dw==,type:str] pgp: - created_at: "2021-09-08T20:35:36Z" enc: | diff --git a/superset/overlays/prod/supersetdb-route.yaml b/superset/overlays/prod/supersetdb-route.yaml index 7c01d6ab..6d80651e 100644 --- a/superset/overlays/prod/supersetdb-route.yaml +++ b/superset/overlays/prod/supersetdb-route.yaml @@ -3,6 +3,7 @@ kind: Route metadata: labels: app: supersetdb + shard: internal name: supersetdb spec: host: supersetdb.cloud.datahub.psi.redhat.com