Merge branch 'main' of gitlab.com:oceanbox/manifests

charts/plume/templates/NOTES.txt

@@ -6,16 +6,16 @@
   {{- end }}
 {{- end }}
 {{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "Sorcerer.fullname" . }})
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "Plume.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
 {{- else if contains "LoadBalancer" .Values.service.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "Sorcerer.fullname" . }}'
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "Plume.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "Sorcerer.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "Plume.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
   echo http://$SERVICE_IP:{{ .Values.service.port }}
 {{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "Sorcerer.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "Plume.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
   echo "Visit http://127.0.0.1:8080 to use your application"
   kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT

charts/plume/values.yaml

@@ -46,25 +46,7 @@ service:
   type: ClusterIP
   port: 8085
 ingress:
-  enabled: true
+  enabled: false
-  className: "nginx"
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt-staging
-    nginx.ingress.kubernetes.io/backend-protocol: HTTPS
-    nginx.ingress.kubernetes.io/ssl-passthrough: "true"
-    nginx.ingress.kubernetes.io/ssl-redirect: "true"
-  hosts:
-    - host: plume.srv.oceanbox.io
-      paths:
-        - path: /
-          pathType: ImplementationSpecific
-      internal:
-        - path: /internal
-          pathType: ImplementationSpecific
-  tls:
-    - hosts:
-        - plume.srv.oceanbox.io
-      secretName: plume-tls
 persistence:
   enabled: false
   existingClaim: oceanbox-archives

values/headscale/values.yaml

@@ -237,6 +237,7 @@ configMaps:
            { "name": "grafana.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
            { "name": "slurmrestd.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
            { "name": "sorcrerer.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
+           { "name": "plume.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
 
            { "name": "dashboard.ob-ceph.local", "type": "A", "value": "10.255.241.10" },
            { "name": "grafana.ob-ceph.local", "type": "A", "value": "10.255.241.10" },

values/plume/values/plume-staging.yaml.gotmpl

@@ -0,0 +1,20 @@
+ingress:
+  enabled: true
+  className: "nginx"
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-staging
+    nginx.ingress.kubernetes.io/backend-protocol: HTTP
+    nginx.ingress.kubernetes.io/ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/whitelist-source-range: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16,172.19.255.0/24
+  hosts:
+    - host: plume.ekman.oceanbox.io
+      paths:
+        - path: /
+          pathType: ImplementationSpecific
+      internal:
+        - path: /internal
+          pathType: ImplementationSpecific
+  tls:
+    - hosts:
+        - plume.ekman.oceanbox.io
+      secretName: plume-tls

values/prometheus/env-oceanbox.yaml.gotmpl

@@ -5,8 +5,8 @@ prometheus:
   certRenewCronEnabled: false
   fullname: prom
   enableFeatures:
-    - otlp-write-reciever
+  - otlp-write-reciever
-    - remote-write-reciever
+  - remote-write-reciever
   grafana:
     persistence: true
   thanos: