Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions charts/staging/fission/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
10 changes: 2 additions & 8 deletions clusters/staging/davidepa/apps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion clusters/staging/davidepa/infra-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions clusters/staging/davidepa/logging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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