diff --git a/charts/staging/fission/Chart.yaml b/charts/staging/fission/Chart.yaml new file mode 100644 index 00000000..12b1a5e6 --- /dev/null +++ b/charts/staging/fission/Chart.yaml @@ -0,0 +1,7 @@ +apiVersion: v2 +name: fission +version: 1.0.0 +dependencies: + - name: stfc-cloud-fission + version: 1.0.0 + repository: https://davewox.github.io/cloud-helm-charts \ No newline at end of file diff --git a/clusters/staging/davidepa/apps.yaml b/clusters/staging/davidepa/apps.yaml index 1c49b421..9fa9e851 100644 --- a/clusters/staging/davidepa/apps.yaml +++ b/clusters/staging/davidepa/apps.yaml @@ -9,7 +9,7 @@ spec: server: https://kubernetes.default.svc project: default source: - repoURL: https://github.com/stfc/cloud-deployed-apps.git + repoURL: https://github.com/DaveWox/cloud-deployed-apps.git targetRevision: david-epa-branch path: clusters/staging/davidepa syncPolicy: @@ -64,12 +64,6 @@ spec: namespace: ingress-nginx-external valuesFile: ../../../clusters/staging/davidepa/ingress-nginx-external-values.yaml - - name: manila-csi - chartName: manila-csi - namespace: manila-csi - valuesFile: ../../../clusters/staging/davidepa/argocd-setup-values.yaml - secretsFile: ../../../clusters/staging/davidepa/secrets/apps/manila-csi.yaml - - name: longhorn chartName: longhorn namespace: longhorn-system @@ -87,7 +81,7 @@ spec: spec: project: default source: - repoURL: "https://github.com/stfc/cloud-deployed-apps.git" + repoURL: "https://github.com/DaveWox/cloud-deployed-apps.git" targetRevision: david-epa-branch path: "charts/staging/{{.chartName}}" helm: diff --git a/clusters/staging/davidepa/infra-values.yaml b/clusters/staging/davidepa/infra-values.yaml index df8cb9bb..27c230fc 100644 --- a/clusters/staging/davidepa/infra-values.yaml +++ b/clusters/staging/davidepa/infra-values.yaml @@ -78,7 +78,7 @@ stfc-cloud-openstack-cluster: - grafana.david-epa.nubes.stfc.ac.uk secretName: tls-keypair alertmanager: - enabled: true + enabled: false ingress: ingressClassName: internal-nginx annotations: diff --git a/clusters/staging/davidepa/logging.yaml b/clusters/staging/davidepa/logging.yaml index c10eb298..90c66c56 100644 --- a/clusters/staging/davidepa/logging.yaml +++ b/clusters/staging/davidepa/logging.yaml @@ -12,7 +12,7 @@ stfc-cloud-logging: loki: enable: false opensearch: - logstashPrefix: kube_logs_staging_david-epa + logstashPrefix: kube_logs_staging_davidepa # staging worker opensearch for now, with plans to move it to prod/olaf - host: opensearch.staging.nubes.stfc.ac.uk + host: opensearch.staging-worker.nubes.stfc.ac.uk port: 443