Merge branch 'main' of https://git.forteapps.net/Forte/launchpad

infra/base/kustomization.yaml

@@ -22,4 +22,3 @@ resources:
 - karpor
 - databunker
 - homepage
-- vault

infra/base/vault/kustomization.yaml

@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- vault.yaml

infra/base/vault/vault.yaml

@@ -1,43 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: vault
-  namespace: argocd
-  annotations:
-    argocd.argoproj.io/sync-wave: "1"
-  labels:
-    app.kubernetes.io/name: vault
-    app.kubernetes.io/part-of: security
-    app.kubernetes.io/managed-by: argocd
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: default
-
-  sources:
-  - repoURL: https://helm.releases.hashicorp.com
-    chart: vault
-    targetRevision: "0.32.0"
-    helm:
-      releaseName: vault
-      valueFiles:
-      - $values/infra/values/base/vault-values.yaml
-      - $values/infra/values/upc-dev/vault-values.yaml
-
-  - repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
-    targetRevision: HEAD
-    ref: values
-
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: vault
-
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-      allowEmpty: false
-    syncOptions:
-    - CreateNamespace=true
-    - Validate=true
-    - ServerSideApply=true

infra/values/base/homepage-values.yaml

@@ -22,16 +22,16 @@ config:
     layout:
       Apps:
         style: row
-        columns: 3
+        columns: 4
-      Security:
+      Identity:
         style: row
-        columns: 3
+        columns: 4
       DevOps:
         style: row
-        columns: 2
+        columns: 4
       Monitoring:
         style: row
-        columns: 1
+        columns: 4
 
   # Top-of-page cluster overview widget
   widgets:

infra/values/base/keycloak-values.yaml

@@ -21,9 +21,9 @@ ingress:
     gethomepage.dev/enabled: "true"
     gethomepage.dev/name: "Keycloak"
     gethomepage.dev/description: "Identity & access management"
-    gethomepage.dev/group: "Security"
+    gethomepage.dev/group: "Identity"
     gethomepage.dev/icon: "keycloak"
-    gethomepage.dev/href: "https://id.forteapps.net/admin/forte-test/console/"
+    gethomepage.dev/href: "https://id.forteapps.net"
 
 metrics:
   enabled: true

infra/values/base/vault-values.yaml

@@ -1,36 +0,0 @@
-# HashiCorp Vault Helm Chart Values
-# Chart: hashicorp/vault v0.32.0
-
-server:
-  standalone:
-    enabled: true
-
-  dataStorage:
-    enabled: true
-    size: 5Gi
-
-  resources:
-    requests:
-      cpu: 100m
-      memory: 128Mi
-    limits:
-      cpu: 250m
-      memory: 256Mi
-
-  ingress:
-    enabled: true
-    ingressClassName: traefik
-    pathType: Prefix
-    activeService: true
-    annotations:
-      cert-manager.io/cluster-issuer: letsencrypt-prod
-      gethomepage.dev/enabled: "true"
-      gethomepage.dev/name: "Vault"
-      gethomepage.dev/description: "Secrets management"
-      gethomepage.dev/group: "Security"
-      gethomepage.dev/icon: "vault"
-      gethomepage.dev/href: "https://vault.forteapps.net"
-
-ui:
-  enabled: true
-  serviceType: ClusterIP

infra/values/upc-dev/databunker-values.yaml

@@ -5,6 +5,6 @@ ingress:
     gethomepage.dev/enabled: "true"
     gethomepage.dev/name: "Databunker"
     gethomepage.dev/description: "Secure Database for PII and PCI Records"
-    gethomepage.dev/group: "Security"
+    gethomepage.dev/group: "Identity"
     gethomepage.dev/icon: "adminer"
     gethomepage.dev/href: "https://databunker.forteapps.net"

infra/values/upc-dev/vault-values.yaml

@@ -1,9 +0,0 @@
-server:
-  ingress:
-    hosts:
-    - host: vault.forteapps.net
-      paths: []
-    tls:
-    - secretName: vault-tls
-      hosts:
-      - vault.forteapps.net