rename shogun-cloud to shogun

README.md

@@ -30,19 +30,18 @@ Please note: changes in `README.md` are ignored.
 
 ## Setting up shogun cluster with kind-dev-cluster
 ```bash
-# first we need to build a container containing the default realm settings 
+# first we need to build a container containing the default realm settings
 docker build -t keycloak-data:1.0 data/keycloak/
 kind load docker-image --name kind-dev-cluster keycloak-data:1.0 docker.terrestris.de/postgis/postgis:15-3.3-alpine docker-public.terrestris.de/terrestris/shogun-admin:11.4.0 docker-public.terrestris.de/shogun/shogun-boot:18.0.0 docker-public.terrestris.de/terrestris/shogun-gis-client:6.9.0
-kubectl create secret generic postgiscred --from-literal=username=postgres --from-literal=password=postgres
-kubectl create secret generic keycloakcred --from-literal=username=admin --from-literal=password=admin
-cd charts/shogun-cloud
+kubectl create secret generic postgis-credentials --from-literal=username=postgres --from-literal=password=postgres
+kubectl create secret generic keycloak-credentials --from-literal=username=admin --from-literal=password=admin
+cd charts/shogun
 helm dependency build
-helm install shogun-cloud ./ --values ./values.yaml
+helm install shogun ./ --values ./values.yaml
 
-
-kubectl port-forward service/shogun-cloud-keycloak 1234:https
-kubectl port-forward service/shogun-cloud-shogun-boot 1235:http
-kubectl port-forward service/shogun-cloud-shogun-client 1236:http
-kubectl port-forward service/shogun-cloud-shogun-admin 1237:http
+kubectl port-forward service/shogun-keycloak 1234:https
+kubectl port-forward service/shogun-shogun-boot 1235:http
+kubectl port-forward service/shogun-shogun-client 1236:http
+kubectl port-forward service/shogun-shogun-admin 1237:http
 # TODO: use ingress and map services to different folders instead of using port-forwardings
 ```

charts/shogun-cloud/Chart.yaml → charts/shogun/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-name: shogun-cloud
+name: shogun
 description: A Helm chart for Kubernetes
 
 # A chart can be either an 'application' or a 'library' chart.

charts/shogun-cloud/charts/shogun-boot/README.md → charts/shogun/charts/shogun-boot/README.md

@@ -44,9 +44,9 @@ This table lists all required secrets for the chart. Please note that currently
 
 | Internal environment variable name | Description                                                                                                                                                                                                                                                                                             | Secret name | Secret key |
 |------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------|------------|
-| `DB_USER` | The database user (see `postgres.host`).                                                                                                                                                                                                                                                                | `postgiscred` | `username` |
-| `DB_PASSWORD` | The password for the database user.                                                                                                                                                                                                                                                                     | `postgiscred` | `password` |
-| `KEYCLOAK_USER` | The name of a Keycloak user (inside the `keycloak.masterRealm`) that has granted some asorted realm management roles (currently `query_users` and `view_users` are required). This user is  needed for getting some user details like the username on-the-fly and doesn't require any write priviliges. | `keycloakcred` | `username` |
-| `KEYCLOAK_PASSWORD` | The password of the Keycloak user.                                                                                                                                                                                                                                                                      | `keycloakcred` | `password` |
-| `MAIL_USER` | The name of the mail user (only needed if `mail.enabled`).                                                                                                                                                                                                                                              | `mailcred` | `username` |
-| `MAIL_PASSWORD` | The password of the mail user (only needed if `mail.enabled`).                                                                                                                                                                                                                                                                         | `mailcred` | `password` |
+| `DB_USER` | The database user (see `postgres.host`).                                                                                                                                                                                                                                                                | `postgres-credentials` | `username` |
+| `DB_PASSWORD` | The password for the database user.                                                                                                                                                                                                                                                                     | `postgres-credentials` | `password` |
+| `KEYCLOAK_USER` | The name of a Keycloak user (inside the `keycloak.masterRealm`) that has granted some asorted realm management roles (currently `query_users` and `view_users` are required). This user is  needed for getting some user details like the username on-the-fly and doesn't require any write priviliges. | `keycloak-credentials` | `username` |
+| `KEYCLOAK_PASSWORD` | The password of the Keycloak user.                                                                                                                                                                                                                                                                      | `keycloak-credentials` | `password` |
+| `MAIL_USER` | The name of the mail user (only needed if `mail.enabled`).                                                                                                                                                                                                                                              | `mail-credentials` | `username` |
+| `MAIL_PASSWORD` | The password of the mail user (only needed if `mail.enabled`).                                                                                                                                                                                                                                                                         | `mail-credentials` | `password` |

charts/shogun-cloud/charts/shogun-boot/templates/deployment.yaml → charts/shogun/charts/shogun-boot/templates/deployment.yaml

@@ -35,12 +35,12 @@ spec:
             - name: DB_USER
               valueFrom:
                 secretKeyRef:
-                  name: postgiscred
+                  name: postgres-credentials
                   key: username
             - name: DB_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: postgiscred
+                  name: postgres-credentials
                   key: password
       containers:
         - name: {{ .Chart.Name }}
@@ -50,33 +50,33 @@ spec:
             - name: DB_USER
               valueFrom:
                 secretKeyRef:
-                  name: postgiscred
+                  name: postgres-credentials
                   key: username
             - name: DB_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: postgiscred
+                  name: postgres-credentials
                   key: password
             - name: KEYCLOAK_USER
               valueFrom:
                 secretKeyRef:
-                  name: keycloakcred
+                  name: keycloak-credentials
                   key: username
             - name: KEYCLOAK_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: keycloakcred
+                  name: keycloak-credentials
                   key: password
             {{- if .Values.mail.enabled }}
             - name: MAIL_USER
               valueFrom:
                 secretKeyRef:
-                  name: mailcred
+                  name: mail-credentials
                   key: username
             - name: MAIL_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: mailcred
+                  name: mail-credentials
                   key: password
             {{- end }}
             - name: JAVA_TOOL_OPTIONS

charts/shogun-cloud/todos.md → charts/shogun/todos.md

@@ -1,11 +1,11 @@
 1. variable to disable postgis, admin, client, keycloak, geoserver
 2. secrets should be used on both sides (future: sealed secret?)
    1. remove all password from config files
-3. shogun-cloud -> shogun
+~3. shogun-cloud -> shogun~
 4. geoserver
 5. update templates and values with newer version (already updated: _helpers, ingress, service)
 5. ingress:
-   1. / -> shogun-client
+   1. /shogun-client/ -> shogun-client
    2. /shogun-admin/ -> shogun-admin
    3. /shogun-boot/ -> shogun-boot
    4. /keycloak/ -> keycloak

charts/shogun-cloud/values.yaml → charts/shogun/values.yaml

@@ -26,49 +26,49 @@ keycloak:
 postgis:
   enabled: true
 
-shogun-boot:
+shogun-admin:
   enabled: true
   ingress:
     enabled: false
     className: ""
-    annotations: { }
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
+    annotations: {}
+      # kubernetes.io/ingress.class: nginx
+      # kubernetes.io/tls-acme: "true"
     hosts:
       - host: shogun.local
         paths:
-          - path: /shogun-boot/
+          - path: /shogun-admin/
             pathType: ImplementationSpecific
-    tls: [ ]
+    tls: []
     #  - secretName: shogun-tls
     #    hosts:
     #      - shogun.local
-  postgres:
-    host: shogun-cloud-postgis.default.svc.cluster.local
   keycloak:
-    host: shogun-cloud-keycloak.default.svc.cluster.local
+    host: localhost:1234/
+  shogun:
+    base: http://localhost:1235/
 
-shogun-admin:
+shogun-boot:
   enabled: true
   ingress:
     enabled: false
     className: ""
-    annotations: {}
-      # kubernetes.io/ingress.class: nginx
-      # kubernetes.io/tls-acme: "true"
+    annotations: { }
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
     hosts:
       - host: shogun.local
         paths:
-          - path: /shogun-admin/
+          - path: /shogun-boot/
             pathType: ImplementationSpecific
-    tls: []
+    tls: [ ]
     #  - secretName: shogun-tls
     #    hosts:
     #      - shogun.local
+  postgres:
+    host: shogun-postgis.default.svc.cluster.local
   keycloak:
-    host: localhost:1234/
-  shogun:
-    base: http://localhost:1235/
+    host: shogun-keycloak.default.svc.cluster.local
 
 shogun-client:
   enabled: true