From 8145209ed70e52db8d7d76221c1fef37c211c286 Mon Sep 17 00:00:00 2001 From: dennisvankekem Date: Tue, 2 Jul 2024 16:33:51 +0200 Subject: [PATCH 1/5] feat: changed console prefix --- core.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core.yaml b/core.yaml index d3a06cfe8d..80cf0a2090 100644 --- a/core.yaml +++ b/core.yaml @@ -304,7 +304,7 @@ adminApps: auth: true removeRequestHeaders: - authorization - - name: otomi + - name: console hide: true isShared: true ownHost: true From 5c13163e4d791f7e7f17ca572c47c4d53082217c Mon Sep 17 00:00:00 2001 From: dennisvankekem Date: Tue, 2 Jul 2024 17:07:26 +0200 Subject: [PATCH 2/5] fix: changed welcome message --- src/cmd/commit.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/commit.ts b/src/cmd/commit.ts index c266ba3d69..86ba161449 100644 --- a/src/cmd/commit.ts +++ b/src/cmd/commit.ts @@ -111,7 +111,7 @@ export const printWelcomeMessage = async (): Promise => { const message = ` ######################################################################################################################################## # - # To start using Otomi, go to https://otomi.${values.cluster.domainSuffix} and sign in to the web console + # To start using APL, go to https://console.${values.cluster.domainSuffix} and sign in to the web console # with username "${credentials.adminUsername}" and password "${credentials.adminPassword}". # ########################################################################################################################################` From 93aeab22b327bc6e5f480b8ff3ec8cd5c8f3d0fc Mon Sep 17 00:00:00 2001 From: dennisvankekem Date: Thu, 4 Jul 2024 13:38:26 +0200 Subject: [PATCH 3/5] feat: removed shortcuts --- core.yaml | 15 --------------- values-schema.yaml | 17 ----------------- 2 files changed, 32 deletions(-) diff --git a/core.yaml b/core.yaml index 80cf0a2090..b999387f6d 100644 --- a/core.yaml +++ b/core.yaml @@ -188,10 +188,6 @@ adminApps: - authorization type: public auth: true - shortcuts: - - title: NGINX - description: NGINX ingress controller metrics - path: /d/nginx/nginx-ingress-controller?orgId=1&refresh=5s - name: harbor tags: [security] isShared: true @@ -248,10 +244,6 @@ adminApps: svc: keycloak-service type: public port: 8080 - shortcuts: - - title: Account - description: Edit your account settings. - path: /realms/otomi/account/ - name: kiali tags: [tracing, telemetry, observability] deps: [istio, prometheus] @@ -286,13 +278,6 @@ adminApps: deps: [grafana, prometheus, minio] useHost: grafana path: /explore?orgId=1&left=%7B"datasource":"loki","queries":%5B%7B"refId":"A"%7D%5D,"range":%7B"from":"now-1h","to":"now"%7D%7D - shortcuts: - - title: Ingress logs - description: All logs generated in the "ingress" namespace - path: /explore?orgId=1&left=%5B"now-1h","now","Loki",%7B"expr":"%7Bnamespace%3D%5C"ingress%5C"%7D","refId":"A"%7D%5D - - title: OWASP violations - description: All OWASP rule violations - path: /explore?orgId=1&left=%5B"now-1h","now","Loki",%7B"expr":"%7Bnamespace%3D%5C"ingress%5C"%7D%20%7C%3D%5C"ModSecurity:%20%5C""%7D%5D - name: minio tags: [storage, backup] ownHost: true diff --git a/values-schema.yaml b/values-schema.yaml index 9c7271b897..ce63134f72 100644 --- a/values-schema.yaml +++ b/values-schema.yaml @@ -790,20 +790,6 @@ definitions: - limits - requests title: Pod resources - shortcuts: - type: array - items: - additionalProperties: false - properties: - title: - type: string - description: Title for the shortcut - description: - type: string - description: A short description about the target of this shortcut. - path: - $ref: '#/definitions/path' - type: object unixOwnerIdRange: type: object additionalProperties: false @@ -1131,9 +1117,6 @@ definitions: $ref: '#/definitions/alerts' apps: type: object - properties: - shortcuts: - $ref: '#/definitions/shortcuts' backups: type: array items: From 3b36f0fd2e72f103a2b59ee77181eae558ebb754 Mon Sep 17 00:00:00 2001 From: dennisvankekem Date: Tue, 9 Jul 2024 14:19:40 +0200 Subject: [PATCH 4/5] fix: values changes migration --- values-changes.yaml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/values-changes.yaml b/values-changes.yaml index b9644302f9..f04b077635 100644 --- a/values-changes.yaml +++ b/values-changes.yaml @@ -225,3 +225,29 @@ changes: - 'kms.sops.vault' - 'platformBackups.persistentVolumes.vault' - 'apps.exteral-secrets' + - version: 24 + deletions: + - 'teamConfig.{team}.apps.alertmanager.shortcuts' + - 'teamConfig.{team}.apps.argocd.shortcuts' + - 'teamConfig.{team}.apps.cert-manager.shortcuts' + - 'teamConfig.{team}.apps.cnpg.shortcuts' + - 'teamConfig.{team}.apps.drone.shortcuts' + - 'teamConfig.{team}.apps.external-dns.shortcuts' + - 'teamConfig.{team}.apps.falco.shortcuts' + - 'teamConfig.{team}.apps.gitea.shortcuts' + - 'teamConfig.{team}.apps.grafana.shortcuts' + - 'teamConfig.{team}.apps.harbor.shortcuts' + - 'teamConfig.{team}.apps.httpbin.shortcuts' + - 'teamConfig.{team}.apps.ingress-nginx.shortcuts' + - 'teamConfig.{team}.apps.istio.shortcuts' + - 'teamConfig.{team}.apps.jaeger.shortcuts' + - 'teamConfig.{team}.apps.keycloak.shortcuts' + - 'teamConfig.{team}.apps.kiali.shortcuts' + - 'teamConfig.{team}.apps.knative.shortcuts' + - 'teamConfig.{team}.apps.kured.shortcuts' + - 'teamConfig.{team}.apps.loki.shortcuts' + - 'teamConfig.{team}.apps.minio.shortcuts' + - 'teamConfig.{team}.apps.prometheus.shortcuts' + - 'teamConfig.{team}.apps.rabbitmq.shortcuts' + - 'teamConfig.{team}.apps.sealed-secrets.shortcuts' + - 'teamConfig.{team}.apps.tempo.shortcuts' \ No newline at end of file From 68f082f511e9163f54fe1a2c3c853bee30712c35 Mon Sep 17 00:00:00 2001 From: dennisvankekem Date: Tue, 9 Jul 2024 15:36:35 +0200 Subject: [PATCH 5/5] fix: defaults yaml version bump --- helmfile.d/snippets/defaults.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helmfile.d/snippets/defaults.yaml b/helmfile.d/snippets/defaults.yaml index ba1c2e6a9a..2491ee8962 100644 --- a/helmfile.d/snippets/defaults.yaml +++ b/helmfile.d/snippets/defaults.yaml @@ -718,7 +718,7 @@ environments: upgrade: version: main # TODO: update this when schema version changes: (and think more?) - version: 22 + version: 24 letsencryptRootCA: | -----BEGIN CERTIFICATE----- MIIFmDCCA4CgAwIBAgIQU9C87nMpOIFKYpfvOHFHFDANBgkqhkiG9w0BAQsFADBm