diff --git a/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore-ago2/deployment.yaml b/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore-ago2/deployment.yaml deleted file mode 100644 index a6262104d..000000000 --- a/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore-ago2/deployment.yaml +++ /dev/null @@ -1,60 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: dhstore -spec: - selector: - matchLabels: - app: dhstore-ago2 - template: - metadata: - labels: - app: dhstore-ago2 - spec: - topologySpreadConstraints: - - maxSkew: 1 - topologyKey: topology.kubernetes.io/zone - whenUnsatisfiable: ScheduleAnyway - containers: - - name: dhstore - args: - - '--providersURL=http://ago-indexer:3000/' - - '--storePath=/data' - - '--disableWAL' - - '--blockCacheSize=2Gi' - volumeMounts: - - name: data - mountPath: /data - resources: - limits: - cpu: "7" - memory: 60Gi - requests: - cpu: "7" - memory: 60Gi - ports: - - containerPort: 40081 - name: metrics - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: node.kubernetes.io/instance-type - operator: In - values: - - r5n.2xlarge - - key: topology.kubernetes.io/zone - operator: In - values: - - us-east-2c - volumes: - - name: data - persistentVolumeClaim: - claimName: dhstore-data-ago2 - tolerations: - - key: dedicated - operator: Equal - value: r5n-2xl - effect: NoSchedule - diff --git a/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore-ago2/internal-service.yaml b/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore-ago2/internal-service.yaml deleted file mode 100644 index 747bc9b4d..000000000 --- a/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore-ago2/internal-service.yaml +++ /dev/null @@ -1,26 +0,0 @@ -# DHStore internal service, accessible only within K8S cluster VPC via: -# - http://dhstore-ago2.internal.dev.cid.contact -# -# See: https://github.com/ipni/dhstore -kind: Service -apiVersion: v1 -metadata: - name: dhstore-internal - annotations: - service.beta.kubernetes.io/aws-load-balancer-internal: "true" - service.beta.kubernetes.io/aws-load-balancer-scheme: internal - service.beta.kubernetes.io/aws-load-balancer-type: nlb - service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: ip - external-dns.alpha.kubernetes.io/access: private - external-dns.alpha.kubernetes.io/hostname: dhstore-ago2.internal.dev.cid.contact - labels: - app: dhstore-ago2 -spec: - externalTrafficPolicy: Cluster - ports: - - name: http - port: 80 - targetPort: http - selector: - app: dhstore-ago2 - type: LoadBalancer diff --git a/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore-ago2/kustomization.yaml b/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore-ago2/kustomization.yaml deleted file mode 100644 index 2f724cbcd..000000000 --- a/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore-ago2/kustomization.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: storetheindex - -resources: - - github.com/ipni/dhstore/deploy/kubernetes?ref=58dfcad7aae9c172c68237dad25494625d8ac160 - - pvc.yaml - - internal-service.yaml - - pod-monitor.yaml - -nameSuffix: -ago2 - -patchesStrategicMerge: - - deployment.yaml - - service.yaml - -replicas: - - name: dhstore - count: 0 - -images: - - name: dhstore - newName: 407967248065.dkr.ecr.us-east-2.amazonaws.com/ipni/dhstore - newTag: 20231130062633-638e69afc14179ce171c98f0045f03efb8773cd4 diff --git a/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore-ago2/pod-monitor.yaml b/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore-ago2/pod-monitor.yaml deleted file mode 100644 index 39caae88d..000000000 --- a/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore-ago2/pod-monitor.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PodMonitor -metadata: - name: dhstore - labels: - app: dhstore-ago2 -spec: - selector: - matchLabels: - app: dhstore-ago2 - namespaceSelector: - matchNames: - - storetheindex - podMetricsEndpoints: - - path: /metrics - port: metrics diff --git a/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore-ago2/pvc.yaml b/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore-ago2/pvc.yaml deleted file mode 100644 index 521686ea4..000000000 --- a/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore-ago2/pvc.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: dhstore-data-ago2 -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 16Ti - storageClassName: gp3-iops5k-t300 diff --git a/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore-ago2/service.yaml b/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore-ago2/service.yaml deleted file mode 100644 index 62706bf9e..000000000 --- a/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore-ago2/service.yaml +++ /dev/null @@ -1,9 +0,0 @@ -kind: Service -apiVersion: v1 -metadata: - name: dhstore - labels: - app: dhstore-ago2 -spec: - selector: - app: dhstore-ago2 diff --git a/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore/deployment.yaml b/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore/deployment.yaml deleted file mode 100644 index 8ad857bd8..000000000 --- a/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore/deployment.yaml +++ /dev/null @@ -1,53 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: dhstore -spec: - template: - spec: - topologySpreadConstraints: - - maxSkew: 1 - topologyKey: topology.kubernetes.io/zone - whenUnsatisfiable: ScheduleAnyway - containers: - - name: dhstore - args: - - '--providersURL=http://ago-indexer:3000/' - - '--storePath=/data' - - '--disableWAL' - volumeMounts: - - name: data - mountPath: /data - resources: - limits: - cpu: "2" - memory: 16Gi - requests: - cpu: "2" - memory: 16Gi - ports: - - containerPort: 40081 - name: metrics - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: node.kubernetes.io/instance-type - operator: In - values: - - r5n.2xlarge - - key: topology.kubernetes.io/zone - operator: In - values: - - us-east-2c - volumes: - - name: data - persistentVolumeClaim: - claimName: dhstore-data-gp3 - tolerations: - - key: dedicated - operator: Equal - value: r5n-2xl - effect: NoSchedule - diff --git a/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore/internal-service.yaml b/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore/internal-service.yaml deleted file mode 100644 index 22133a13c..000000000 --- a/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore/internal-service.yaml +++ /dev/null @@ -1,26 +0,0 @@ -# DHStore internal service, accessible only within K8S cluster VPC via: -# - http://dhstore.internal.dev.cid.contact -# -# See: https://github.com/ipni/dhstore -kind: Service -apiVersion: v1 -metadata: - name: dhstore-internal - annotations: - service.beta.kubernetes.io/aws-load-balancer-internal: "true" - service.beta.kubernetes.io/aws-load-balancer-scheme: internal - service.beta.kubernetes.io/aws-load-balancer-type: nlb - service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: ip - external-dns.alpha.kubernetes.io/access: private - external-dns.alpha.kubernetes.io/hostname: dhstore.internal.dev.cid.contact - labels: - app: dhstore -spec: - externalTrafficPolicy: Cluster - ports: - - name: http - port: 80 - targetPort: http - selector: - app: dhstore - type: LoadBalancer diff --git a/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore/kustomization.yaml b/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore/kustomization.yaml deleted file mode 100644 index efb86911c..000000000 --- a/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore/kustomization.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: storetheindex - -resources: - - github.com/ipni/dhstore/deploy/kubernetes?ref=58dfcad7aae9c172c68237dad25494625d8ac160 - - internal-service.yaml - - pod-monitor.yaml - - pvc-gp3.yaml - -patchesStrategicMerge: - - deployment.yaml - -replicas: - - name: dhstore - count: 0 - -images: - - name: dhstore - newName: 407967248065.dkr.ecr.us-east-2.amazonaws.com/ipni/dhstore - newTag: 20231130062633-638e69afc14179ce171c98f0045f03efb8773cd4 diff --git a/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore/pod-monitor.yaml b/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore/pod-monitor.yaml deleted file mode 100644 index 9281be4a1..000000000 --- a/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore/pod-monitor.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PodMonitor -metadata: - name: dhstore - labels: - app: dhstore -spec: - selector: - matchLabels: - app: dhstore - namespaceSelector: - matchNames: - - storetheindex - podMetricsEndpoints: - - path: /metrics - port: metrics diff --git a/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore/pvc-gp3.yaml b/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore/pvc-gp3.yaml deleted file mode 100644 index 540d95f5c..000000000 --- a/deploy/manifests/dev/us-east-2/tenant/storetheindex/dhstore/pvc-gp3.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: dhstore-data-gp3 -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 16Ti - dataSource: - name: dhstore-20230406 - kind: VolumeSnapshot - apiGroup: snapshot.storage.k8s.io - storageClassName: gp3-iops5k-t300 diff --git a/deploy/manifests/dev/us-east-2/tenant/storetheindex/kustomization.yaml b/deploy/manifests/dev/us-east-2/tenant/storetheindex/kustomization.yaml index b62ee0809..e1eddff34 100644 --- a/deploy/manifests/dev/us-east-2/tenant/storetheindex/kustomization.yaml +++ b/deploy/manifests/dev/us-east-2/tenant/storetheindex/kustomization.yaml @@ -6,8 +6,6 @@ resources: - assigner - instances - indexstar -- dhstore -- dhstore-ago2 - dhstore-ago3 - dhstore-ago4 - dhstore-ago5 diff --git a/deploy/manifests/dev/us-east-2/tenant/storetheindex/snapshots/dhstore-snapshot.yaml b/deploy/manifests/dev/us-east-2/tenant/storetheindex/snapshots/dhstore-snapshot.yaml deleted file mode 100644 index 00873d38d..000000000 --- a/deploy/manifests/dev/us-east-2/tenant/storetheindex/snapshots/dhstore-snapshot.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: snapshot.storage.k8s.io/v1 -kind: VolumeSnapshot -metadata: - name: dhstore-20230406 -spec: - volumeSnapshotClassName: csi-aws-vsc - source: - persistentVolumeClaimName: dhstore-data diff --git a/deploy/manifests/dev/us-east-2/tenant/storetheindex/snapshots/kustomization.yaml b/deploy/manifests/dev/us-east-2/tenant/storetheindex/snapshots/kustomization.yaml index d7d0dbe1f..01ab38a02 100644 --- a/deploy/manifests/dev/us-east-2/tenant/storetheindex/snapshots/kustomization.yaml +++ b/deploy/manifests/dev/us-east-2/tenant/storetheindex/snapshots/kustomization.yaml @@ -4,6 +4,5 @@ kind: Kustomization namespace: storetheindex resources: - - dhstore-snapshot.yaml - ago-data-snapshot.yaml