Skip to content

Commit

Permalink
Remove pangeo-hubs config files and references
Browse files Browse the repository at this point in the history
  • Loading branch information
sgibson91 committed Jan 29, 2025
1 parent 26cbdaf commit d02c128
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 280 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/deploy-hubs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ jobs:
failure_nmfs-openscapes: ${{ steps.declare-failure.outputs.failure_nmfs-openscapes }}
failure_openscapes: ${{ steps.declare-failure.outputs.failure_openscapes }}
failure_opensci: ${{ steps.declare-failure.outputs.failure_opensci }}
failure_pangeo-hubs: ${{ steps.declare-failure.outputs.failure_pangeo-hubs }}
failure_projectpythia: ${{ steps.declare-failure.outputs.failure_projectpythia }}
failure_queensu: ${{ steps.declare-failure.outputs.failure_queensu }}
failure_smithsonian: ${{ steps.declare-failure.outputs.failure_smithsonian }}
Expand Down Expand Up @@ -465,7 +464,6 @@ jobs:
failure_nmfs-openscapes_staging: ${{ steps.declare-failure.outputs.failure_nmfs-openscapes_staging }}
failure_openscapes_staging: ${{ steps.declare-failure.outputs.failure_openscapes_staging }}
failure_opensci_staging: ${{ steps.declare-failure.outputs.failure_opensci_staging }}
failure_pangeo-hubs_staging: ${{ steps.declare-failure.outputs.failure_pangeo-hubs_staging }}
failure_projectpythia_staging: ${{ steps.declare-failure.outputs.failure_projectpythia_staging }}
failure_queensu_staging: ${{ steps.declare-failure.outputs.failure_queensu_staging }}
failure_smithsonian_staging: ${{ steps.declare-failure.outputs.failure_smithsonian_staging }}
Expand Down
15 changes: 0 additions & 15 deletions config/clusters/pangeo-hubs/cluster.yaml

This file was deleted.

30 changes: 0 additions & 30 deletions config/clusters/pangeo-hubs/enc-deployer-credentials.secret.json

This file was deleted.

15 changes: 0 additions & 15 deletions config/clusters/pangeo-hubs/enc-grafana-token.secret.yaml

This file was deleted.

22 changes: 0 additions & 22 deletions config/clusters/pangeo-hubs/enc-support.secret.values.yaml

This file was deleted.

43 changes: 0 additions & 43 deletions config/clusters/pangeo-hubs/support.values.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,6 @@ gke:
cpu_requests: 354m
memory_requests: 656Mi
k8s_version: v1.29.1-gke.1589020
pangeo-hubs:
requesting_daemon_sets: calico-node,fluentbit-gke,gke-metadata-server,gke-metrics-agent,ip-masq-agent,netd,pdcsi-node,support-cryptnono,support-prometheus-node-exporter
other_daemon_sets: ""
cpu_requests: 354m
memory_requests: 656Mi
k8s_version: v1.29.1-gke.1589020
eks:
# Current overhead is 195m and 250Mi (May 15 2024 with EKS 1.29.4).
#
Expand Down
2 changes: 1 addition & 1 deletion docs/topic/infrastructure/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ A hub's helm chart values file can be encrypted as well, following the naming co
```

Where we run dedicated clusters that only host a `staging` and `prod` hub, we aggregate all helm chart values shared by each hub into a `common.values.yaml` file, and then describe the helm chart values specific to either `staging` or `prod` with a `staging.values.yaml` or `prod.values.yaml` file respectively.
See the [Pangeo config](https://github.com/2i2c-org/infrastructure/blob/HEAD/config/clusters/pangeo-hubs/cluster.yaml) for an example.
See the [Pangeo config](https://github.com/2i2c-org/infrastructure/blob/HEAD/config/clusters/kitware/cluster.yaml) for an example.

### Conventions for our configuration structure

Expand Down
31 changes: 16 additions & 15 deletions terraform/gcp/cluster.tf
Original file line number Diff line number Diff line change
Expand Up @@ -54,21 +54,22 @@ resource "google_container_cluster" "cluster" {

initial_node_count = 1
remove_default_node_pool = true
lifecycle {
# Any change to the default node_config forces cluster recreation,
# and sometimes terraform seems to mess up and think we have changed
# something here when we have not. So we explicitly ignore all changes
# to node_config - we remove any nodepool it might create with
# remove_default_node_pool = true.
ignore_changes = [
node_config
]

# An additional safeguard against accidentally deleting the cluster.
# The databases for the hubs are held in PVCs managed by the cluster,
# so cluster deletion will cause data loss!
prevent_destroy = true
}
deletion_protection = false
# lifecycle {
# # Any change to the default node_config forces cluster recreation,
# # and sometimes terraform seems to mess up and think we have changed
# # something here when we have not. So we explicitly ignore all changes
# # to node_config - we remove any nodepool it might create with
# # remove_default_node_pool = true.
# ignore_changes = [
# node_config
# ]

# # An additional safeguard against accidentally deleting the cluster.
# # The databases for the hubs are held in PVCs managed by the cluster,
# # so cluster deletion will cause data loss!
# prevent_destroy = true
# }

// For private clusters, pass the name of the network and subnetwork created
// by the VPC
Expand Down
131 changes: 0 additions & 131 deletions terraform/gcp/projects/pangeo-hubs.tfvars

This file was deleted.

0 comments on commit d02c128

Please sign in to comment.