diff --git a/charts/lagoon-remote/Chart.lock b/charts/lagoon-remote/Chart.lock index 1cf84259..9ce6677d 100644 --- a/charts/lagoon-remote/Chart.lock +++ b/charts/lagoon-remote/Chart.lock @@ -1,12 +1,12 @@ dependencies: - name: lagoon-build-deploy repository: https://uselagoon.github.io/lagoon-charts/ - version: 0.31.0 + version: 0.31.1 - name: dbaas-operator repository: https://amazeeio.github.io/charts/ version: 0.3.1 - name: nats repository: https://nats-io.github.io/k8s/helm/charts/ version: 1.2.8 -digest: sha256:9814199e2380bbb6f3bb972a0c961b6078a22a363b9ab2b72a1817358690497c -generated: "2024-12-18T23:16:59.119513362Z" +digest: sha256:976ff2199d6ca6fce5afbe053bb0ad47b646c84a11e8af019173fe7854656b60 +generated: "2025-01-10T08:48:03.095235516+11:00" diff --git a/charts/lagoon-remote/Chart.yaml b/charts/lagoon-remote/Chart.yaml index 110d7048..cf3d13c7 100644 --- a/charts/lagoon-remote/Chart.yaml +++ b/charts/lagoon-remote/Chart.yaml @@ -19,7 +19,7 @@ type: application # This is the chart version. This version number should be incremented each # time you make changes to the chart and its templates, including the app # version. -version: 0.96.0 +version: 0.96.1 dependencies: - name: lagoon-build-deploy @@ -41,14 +41,6 @@ dependencies: annotations: artifacthub.io/changes: | - kind: changed - description: update dbaas-operator chart dependency to 0.3.1 + description: update build-deploy chart dependency to 0.31.1 - kind: changed - description: update build-deploy chart dependency to 0.31.0 - - kind: changed - description: update NATS chart dependency to 1.2.8 - - kind: added - description: add daemonset to manage node sysctl changes - - kind: changed - description: update uselagoon/lagoon-ssh-portal/ssh-portal from v0.41.3 to v0.41.4 - - kind: changed - description: update storage-calculator to v0.7.0 and adjust metrics endpoint + description: update storage-calculator to metrics servicemonitor diff --git a/charts/lagoon-remote/templates/storage-calculator.role.yaml b/charts/lagoon-remote/templates/storage-calculator.role.yaml index 1fbf4b66..2b25fe74 100644 --- a/charts/lagoon-remote/templates/storage-calculator.role.yaml +++ b/charts/lagoon-remote/templates/storage-calculator.role.yaml @@ -37,4 +37,28 @@ rules: verbs: - create - patch +- apiGroups: + - "authentication.k8s.io" + resources: + - tokenreviews + verbs: + - "create" +- apiGroups: + - "authorization.k8s.io" + resources: + - subjectaccessreviews + verbs: + - "create" +- apiGroups: + - authentication.k8s.io + resources: + - tokenreviews + verbs: + - create +- apiGroups: + - authorization.k8s.io + resources: + - subjectaccessreviews + verbs: + - create {{- end }} diff --git a/charts/lagoon-remote/templates/storage-calculator.servicemonitor.yaml b/charts/lagoon-remote/templates/storage-calculator.servicemonitor.yaml index 33b14443..4f5e8617 100644 --- a/charts/lagoon-remote/templates/storage-calculator.servicemonitor.yaml +++ b/charts/lagoon-remote/templates/storage-calculator.servicemonitor.yaml @@ -7,7 +7,12 @@ metadata: {{- include "lagoon-remote.storageCalculator.labels" . | nindent 4 }} spec: endpoints: - - port: https + - path: /metrics + port: https + scheme: https + bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token + tlsConfig: + insecureSkipVerify: true namespaceSelector: matchNames: - {{ .Release.Namespace }}