Skip to content

WIP: rework repo structure to work with external charts #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 18, 2025
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.idea/*
.idea/*
.decrypted~*
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason there is a ~ here or should it be /?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vscode extension for sops creates a file .decrypted~<name-of-file> - which is the decrypted version of the sops file.

So this catches any file that starts with .decrypted~ in the repo and ignores it so we don't accidentally commit secrets

10 changes: 5 additions & 5 deletions charts/dev/capi-infra/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: capi-openstack-cluster
version: 1.3.0
name: capi-infra
version: 2.0.0
dependencies:
- repository: https://azimuth-cloud.github.io/capi-helm-charts
name: openstack-cluster
version: 0.12.2
- repository: https://stfc.github.io/cloud-helm-charts/
name: stfc-cloud-openstack-cluster
version: 1.4.0
381 changes: 0 additions & 381 deletions charts/dev/capi-infra/values.yaml

This file was deleted.

9 changes: 4 additions & 5 deletions charts/dev/cert-manager/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
apiVersion: v2
name: cert-manager
version: 1.1.0
version: 2.0.0
dependencies:
# https://github.com/cert-manager/cert-manager/releases
- name: cert-manager
version: 1.15.3
repository: https://charts.jetstack.io
- repository: https://stfc.github.io/cloud-helm-charts/
name: stfc-cloud-cert-manager
version: 1.2.0
19 changes: 0 additions & 19 deletions charts/dev/cert-manager/templates/le-prod-clusterissuer.yaml

This file was deleted.

19 changes: 0 additions & 19 deletions charts/dev/cert-manager/templates/le-staging-clusterissuer.yaml

This file was deleted.

This file was deleted.

12 changes: 0 additions & 12 deletions charts/dev/cert-manager/values.yaml

This file was deleted.

11 changes: 6 additions & 5 deletions charts/dev/chatops/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
apiVersion: v2
name: cloud-chatops
description: Cloud ChatOps helm chart
type: application
version: 0.1.0
appVersion: "5.0.2"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

curiosity: what's the difference between appVersion and version and why has the appVersion been omitted?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we're switching to use a wrapper chart - we're using this chart as a dependency - https://github.com/stfc/cloud-helm-charts/blob/main/charts/stfc-cloud-chatops/Chart.yaml. appVersion is defined there

version represents the version of the Helm Chart you are deploying - this version is most important

appVersion represents the version of the application/deployment we're deploying - so here I think it refers to the docker image

name: chatops
version: 2.0.0
dependencies:
- repository: https://stfc.github.io/cloud-helm-charts/
name: stfc-cloud-chatops
version: 0.1.0
8 changes: 0 additions & 8 deletions charts/dev/chatops/secrets-templates/secrets.yaml

This file was deleted.

46 changes: 0 additions & 46 deletions charts/dev/chatops/templates/cloud-chatops.yaml

This file was deleted.

15 changes: 0 additions & 15 deletions charts/dev/chatops/templates/config-map.yaml

This file was deleted.

11 changes: 0 additions & 11 deletions charts/dev/chatops/templates/secrets.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions charts/dev/chatops/values.yaml

This file was deleted.

Empty file.
9 changes: 4 additions & 5 deletions charts/dev/longhorn/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
apiVersion: v2
name: longhorn
version: 1.0.0
version: 2.0.0
dependencies:
# https://github.com/longhorn/charts/releases
- name: longhorn
version: 1.7.1
repository: https://charts.longhorn.io
- repository: https://stfc.github.io/cloud-helm-charts/
name: stfc-cloud-longhorn
version: 1.0.0
35 changes: 0 additions & 35 deletions charts/dev/longhorn/values.yaml

This file was deleted.

13 changes: 4 additions & 9 deletions charts/dev/manila-csi/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
apiVersion: v2
name: manila-csi
version: 1.0.0
version: 2.0.0
dependencies:
# https://github.com/kubernetes/cloud-provider-openstack/tree/master/charts/cinder-csi-plugin
- name: openstack-manila-csi
version: 2.31.0
repository: https://kubernetes.github.io/cloud-provider-openstack
# https://github.com/ceph/ceph-csi/tree/devel/charts/ceph-csi-cephfs
- name: ceph-csi-cephfs
version: 3.11.0
repository: https://ceph.github.io/csi-charts
- repository: https://stfc.github.io/cloud-helm-charts/
name: stfc-cloud-manila-csi
version: 1.0.0
18 changes: 0 additions & 18 deletions charts/dev/manila-csi/templates/manila-sc.yaml

This file was deleted.

11 changes: 0 additions & 11 deletions charts/dev/manila-csi/templates/manila-secret.yaml

This file was deleted.

11 changes: 0 additions & 11 deletions charts/dev/manila-csi/values.yaml

This file was deleted.

21 changes: 4 additions & 17 deletions charts/dev/materials-galaxy/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,7 @@
apiVersion: v2
name: materials-galaxy
version: 1.0.0
version: 2.0.0
dependencies:
# https://github.com/galaxyproject/galaxy-helm
- repository: https://raw.githubusercontent.com/CloudVE/helm-charts/master/
name: galaxy
version: 5.17.0
# https://github.com/oauth2-proxy/manifests/tree/main/helm/oauth2-proxy
- repository: "https://oauth2-proxy.github.io/manifests"
name: oauth2-proxy
version: 7.7.22
# https://github.com/zalando/postgres-operator/tree/master/charts/postgres-operator
- repository: "https://opensource.zalando.com/postgres-operator/charts/postgres-operator"
name: postgres-operator
version: 1.13.0
# https://github.com/bitnami/charts/tree/main/bitnami/rabbitmq-cluster-operator
- repository: "https://charts.bitnami.com/bitnami"
name: rabbitmq-cluster-operator
version: 4.3.24
- repository: https://stfc.github.io/cloud-helm-charts/
name: materials-galaxy
version: 1.1.0

This file was deleted.

Loading