From 67df0741561e20c8a4fb222395ffcbed8eb86be0 Mon Sep 17 00:00:00 2001 From: gammazero Date: Sat, 8 Jul 2023 14:50:49 -0700 Subject: [PATCH] Remove dhfind instances from production --- .../dhfind-helga/deployment.yaml | 30 ------------------- .../storetheindex/dhfind-helga/ingress.yaml | 23 -------------- .../dhfind-helga/kustomization.yaml | 25 ---------------- .../storetheindex/dhfind-helga/pdb.yaml | 8 ----- .../dhfind-helga/pod-monitor.yaml | 16 ---------- .../storetheindex/dhfind-helga/service.yaml | 21 ------------- .../dhfind-porvy/deployment.yaml | 30 ------------------- .../storetheindex/dhfind-porvy/ingress.yaml | 23 -------------- .../dhfind-porvy/kustomization.yaml | 25 ---------------- .../storetheindex/dhfind-porvy/pdb.yaml | 8 ----- .../dhfind-porvy/pod-monitor.yaml | 16 ---------- .../storetheindex/dhfind-porvy/service.yaml | 21 ------------- .../storetheindex/dhfind-qiu/deployment.yaml | 30 ------------------- .../storetheindex/dhfind-qiu/ingress.yaml | 23 -------------- .../dhfind-qiu/kustomization.yaml | 26 ---------------- .../storetheindex/dhfind-qiu/pod-monitor.yaml | 14 --------- .../dhfind-stateless/deployment.yaml | 23 -------------- .../dhfind-stateless/kustomization.yaml | 29 ------------------ .../dhfind-stateless/pod-monitor.yaml | 14 --------- .../dhfind-stateless/service.yaml | 7 ----- .../storetheindex/dhfind/deployment.yaml | 24 --------------- .../tenant/storetheindex/dhfind/ingress.yaml | 23 -------------- .../storetheindex/dhfind/kustomization.yaml | 22 -------------- .../storetheindex/dhfind/pod-monitor.yaml | 16 ---------- .../tenant/storetheindex/dhfind/service.yaml | 18 ----------- .../tenant/storetheindex/kustomization.yaml | 5 ---- 26 files changed, 520 deletions(-) delete mode 100644 deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-helga/deployment.yaml delete mode 100644 deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-helga/ingress.yaml delete mode 100644 deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-helga/kustomization.yaml delete mode 100644 deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-helga/pdb.yaml delete mode 100644 deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-helga/pod-monitor.yaml delete mode 100644 deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-helga/service.yaml delete mode 100644 deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-porvy/deployment.yaml delete mode 100644 deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-porvy/ingress.yaml delete mode 100644 deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-porvy/kustomization.yaml delete mode 100644 deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-porvy/pdb.yaml delete mode 100644 deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-porvy/pod-monitor.yaml delete mode 100644 deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-porvy/service.yaml delete mode 100644 deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-qiu/deployment.yaml delete mode 100644 deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-qiu/ingress.yaml delete mode 100644 deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-qiu/kustomization.yaml delete mode 100644 deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-qiu/pod-monitor.yaml delete mode 100644 deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-stateless/deployment.yaml delete mode 100644 deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-stateless/kustomization.yaml delete mode 100644 deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-stateless/pod-monitor.yaml delete mode 100644 deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-stateless/service.yaml delete mode 100644 deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind/deployment.yaml delete mode 100644 deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind/ingress.yaml delete mode 100644 deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind/kustomization.yaml delete mode 100644 deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind/pod-monitor.yaml delete mode 100644 deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind/service.yaml diff --git a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-helga/deployment.yaml b/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-helga/deployment.yaml deleted file mode 100644 index 6f1c22003..000000000 --- a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-helga/deployment.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: dhfind -spec: - replicas: 2 - selector: - matchLabels: - app: dhfind-helga - template: - metadata: - labels: - app: dhfind-helga - spec: - topologySpreadConstraints: - - maxSkew: 1 - topologyKey: topology.kubernetes.io/zone - whenUnsatisfiable: ScheduleAnyway - containers: - - name: dhfind - args: - - '--dhstoreAddr=http://dhstore-helga.internal.prod.cid.contact/' - - '--stiAddr=http://indexstar:8080/' - resources: - limits: - cpu: "1.5" - memory: 512Mi - requests: - cpu: "1.5" - memory: 512Mi diff --git a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-helga/ingress.yaml b/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-helga/ingress.yaml deleted file mode 100644 index d34cf53ff..000000000 --- a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-helga/ingress.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: dhfind - annotations: - kubernetes.io/ingress.class: "nginx" - cert-manager.io/cluster-issuer: "letsencrypt" -spec: - tls: - - hosts: - - dhfind-helga.prod.cid.contact - secretName: dhfind-helga-ingress-tls - rules: - - host: dhfind-helga.prod.cid.contact - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: dhfind-helga - port: - number: 80 diff --git a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-helga/kustomization.yaml b/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-helga/kustomization.yaml deleted file mode 100644 index a924087c2..000000000 --- a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-helga/kustomization.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: storetheindex - -nameSuffix: -helga - -resources: - - ../../../../../base/dhfind - - pod-monitor.yaml - - ingress.yaml - -patchesStrategicMerge: - - deployment.yaml - - service.yaml - - pdb.yaml - -images: - - name: dhfind - newName: 407967248065.dkr.ecr.us-east-2.amazonaws.com/ipni/dhfind - newTag: 20230628142546-6ec4eb394679e183e8c16519cd528feffdf506bf - -replicas: - - name: dhfind - count: 0 diff --git a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-helga/pdb.yaml b/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-helga/pdb.yaml deleted file mode 100644 index c6683c14e..000000000 --- a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-helga/pdb.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: policy/v1 -kind: PodDisruptionBudget -metadata: - name: dhfind -spec: - selector: - matchLabels: - app: dhfind-helga diff --git a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-helga/pod-monitor.yaml b/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-helga/pod-monitor.yaml deleted file mode 100644 index 6acc5e51a..000000000 --- a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-helga/pod-monitor.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PodMonitor -metadata: - name: dhfind - labels: - app: dhfind-helga -spec: - selector: - matchLabels: - app: dhfind-helga - namespaceSelector: - matchNames: - - storetheindex - podMetricsEndpoints: - - path: /metrics - port: metrics diff --git a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-helga/service.yaml b/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-helga/service.yaml deleted file mode 100644 index e69548460..000000000 --- a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-helga/service.yaml +++ /dev/null @@ -1,21 +0,0 @@ -# dhfind service is accessible only within K8S cluster VPC via: -# - http://dhfind.internal.dev.cid.contact -# -# See: https://github.com/ipni/dhfind -kind: Service -apiVersion: v1 -metadata: - name: dhfind - 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: dhfind-helga.internal.prod.cid.contact -spec: - externalTrafficPolicy: Cluster - type: LoadBalancer - selector: - app: dhfind-helga - diff --git a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-porvy/deployment.yaml b/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-porvy/deployment.yaml deleted file mode 100644 index c32741d90..000000000 --- a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-porvy/deployment.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: dhfind -spec: - replicas: 2 - selector: - matchLabels: - app: dhfind-porvy - template: - metadata: - labels: - app: dhfind-porvy - spec: - topologySpreadConstraints: - - maxSkew: 1 - topologyKey: topology.kubernetes.io/zone - whenUnsatisfiable: ScheduleAnyway - containers: - - name: dhfind - args: - - '--dhstoreAddr=http://dhstore-porvy.internal.prod.cid.contact/' - - '--stiAddr=http://indexstar:8080/' - resources: - limits: - cpu: "1.5" - memory: 512Mi - requests: - cpu: "1.5" - memory: 512Mi diff --git a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-porvy/ingress.yaml b/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-porvy/ingress.yaml deleted file mode 100644 index 321c9f729..000000000 --- a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-porvy/ingress.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: dhfind - annotations: - kubernetes.io/ingress.class: "nginx" - cert-manager.io/cluster-issuer: "letsencrypt" -spec: - tls: - - hosts: - - dhfind-porvy.prod.cid.contact - secretName: dhfind-porvy-ingress-tls - rules: - - host: dhfind-porvy.prod.cid.contact - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: dhfind-porvy - port: - number: 80 diff --git a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-porvy/kustomization.yaml b/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-porvy/kustomization.yaml deleted file mode 100644 index a58b35113..000000000 --- a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-porvy/kustomization.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: storetheindex - -nameSuffix: -porvy - -resources: - - ../../../../../base/dhfind - - pod-monitor.yaml - - ingress.yaml - -patchesStrategicMerge: - - deployment.yaml - - service.yaml - - pdb.yaml - -images: - - name: dhfind - newName: 407967248065.dkr.ecr.us-east-2.amazonaws.com/ipni/dhfind - newTag: 20230628142546-6ec4eb394679e183e8c16519cd528feffdf506bf - -replicas: - - name: dhfind - count: 0 diff --git a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-porvy/pdb.yaml b/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-porvy/pdb.yaml deleted file mode 100644 index a66ffcbc9..000000000 --- a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-porvy/pdb.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: policy/v1 -kind: PodDisruptionBudget -metadata: - name: dhfind -spec: - selector: - matchLabels: - app: dhfind-porvy diff --git a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-porvy/pod-monitor.yaml b/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-porvy/pod-monitor.yaml deleted file mode 100644 index 38fdf856b..000000000 --- a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-porvy/pod-monitor.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PodMonitor -metadata: - name: dhfind - labels: - app: dhfind-porvy -spec: - selector: - matchLabels: - app: dhfind-porvy - namespaceSelector: - matchNames: - - storetheindex - podMetricsEndpoints: - - path: /metrics - port: metrics diff --git a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-porvy/service.yaml b/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-porvy/service.yaml deleted file mode 100644 index 9ad867c85..000000000 --- a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-porvy/service.yaml +++ /dev/null @@ -1,21 +0,0 @@ -# dhfind service is accessible only within K8S cluster VPC via: -# - http://dhfind.internal.dev.cid.contact -# -# See: https://github.com/ipni/dhfind -kind: Service -apiVersion: v1 -metadata: - name: dhfind - 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: dhfind-porvy.internal.prod.cid.contact -spec: - externalTrafficPolicy: Cluster - type: LoadBalancer - selector: - app: dhfind-porvy - diff --git a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-qiu/deployment.yaml b/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-qiu/deployment.yaml deleted file mode 100644 index 10da97eb6..000000000 --- a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-qiu/deployment.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: dhfind -spec: - replicas: 1 - selector: - matchLabels: - app: dhfind-qiu - template: - metadata: - labels: - app: dhfind-qiu - spec: - topologySpreadConstraints: - - maxSkew: 1 - topologyKey: topology.kubernetes.io/zone - whenUnsatisfiable: ScheduleAnyway - containers: - - name: dhfind - args: - - '--dhstoreAddr=http://dhstore-qiu:40080/' - - '--stiAddr=http://indexstar:8080/' - resources: - limits: - cpu: "1.5" - memory: 512Mi - requests: - cpu: "1.5" - memory: 512Mi diff --git a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-qiu/ingress.yaml b/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-qiu/ingress.yaml deleted file mode 100644 index 53dec758c..000000000 --- a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-qiu/ingress.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: dhfind - annotations: - kubernetes.io/ingress.class: "nginx" - cert-manager.io/cluster-issuer: "letsencrypt" -spec: - tls: - - hosts: - - dhfind-qiu.prod.cid.contact - secretName: dhfind-qiu-ingress-tls - rules: - - host: dhfind-qiu.prod.cid.contact - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: dhfind-qiu - port: - number: 80 diff --git a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-qiu/kustomization.yaml b/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-qiu/kustomization.yaml deleted file mode 100644 index ea770006f..000000000 --- a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-qiu/kustomization.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: storetheindex - -nameSuffix: -qiu - -commonLabels: - app: dhfind-qiu - -resources: - - ../../../../../base/dhfind - - pod-monitor.yaml - - ingress.yaml - -patchesStrategicMerge: - - deployment.yaml - -images: - - name: dhfind - newName: 407967248065.dkr.ecr.us-east-2.amazonaws.com/ipni/dhfind - newTag: 20230628142546-6ec4eb394679e183e8c16519cd528feffdf506bf - -replicas: - - name: dhfind - count: 0 diff --git a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-qiu/pod-monitor.yaml b/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-qiu/pod-monitor.yaml deleted file mode 100644 index dd16e8c0c..000000000 --- a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-qiu/pod-monitor.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PodMonitor -metadata: - name: dhfind -spec: - selector: - matchLabels: - app: dhfind-qiu - namespaceSelector: - matchNames: - - storetheindex - podMetricsEndpoints: - - path: /metrics - port: metrics diff --git a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-stateless/deployment.yaml b/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-stateless/deployment.yaml deleted file mode 100644 index 9b43acf5c..000000000 --- a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-stateless/deployment.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: dhfind -spec: - template: - spec: - topologySpreadConstraints: - - maxSkew: 1 - topologyKey: topology.kubernetes.io/zone - whenUnsatisfiable: ScheduleAnyway - containers: - - name: dhfind - args: - - '--dhstoreAddr=http://dhstore-stateless:40080' - - '--stiAddr=http://indexstar:8080/' - resources: - limits: - cpu: "2" - memory: 512Mi - requests: - cpu: "2" - memory: 512Mi diff --git a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-stateless/kustomization.yaml b/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-stateless/kustomization.yaml deleted file mode 100644 index add07863a..000000000 --- a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-stateless/kustomization.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: storetheindex - -nameSuffix: -stateless -commonLabels: - app: dhfind-stateless - -resources: - - ../../../../../base/dhfind - - pod-monitor.yaml - -patchesStrategicMerge: - - deployment.yaml - - service.yaml - -replicas: - - name: dhfind - count: 2 - -images: - - name: dhfind - newName: 407967248065.dkr.ecr.us-east-2.amazonaws.com/ipni/dhfind - newTag: 20230628142546-6ec4eb394679e183e8c16519cd528feffdf506bf - -replicas: - - name: dhfind - count: 0 diff --git a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-stateless/pod-monitor.yaml b/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-stateless/pod-monitor.yaml deleted file mode 100644 index f741a08c8..000000000 --- a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-stateless/pod-monitor.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PodMonitor -metadata: - name: dhfind -spec: - selector: - matchLabels: - app: dhfind-stateless - namespaceSelector: - matchNames: - - storetheindex - podMetricsEndpoints: - - path: /metrics - port: metrics diff --git a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-stateless/service.yaml b/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-stateless/service.yaml deleted file mode 100644 index 0f254fb03..000000000 --- a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind-stateless/service.yaml +++ /dev/null @@ -1,7 +0,0 @@ -kind: Service -apiVersion: v1 -metadata: - name: dhfind -spec: - externalTrafficPolicy: Cluster - type: LoadBalancer diff --git a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind/deployment.yaml b/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind/deployment.yaml deleted file mode 100644 index b3da6349d..000000000 --- a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind/deployment.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: dhfind -spec: - replicas: 2 - template: - spec: - topologySpreadConstraints: - - maxSkew: 1 - topologyKey: topology.kubernetes.io/zone - whenUnsatisfiable: ScheduleAnyway - containers: - - name: dhfind - args: - - '--dhstoreAddr=http://dhstore.internal.prod.cid.contact/' - - '--stiAddr=http://indexstar:8080/' - resources: - limits: - cpu: "2" - memory: 512Mi - requests: - cpu: "2" - memory: 512Mi diff --git a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind/ingress.yaml b/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind/ingress.yaml deleted file mode 100644 index 63756cf29..000000000 --- a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind/ingress.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: dhfind - annotations: - kubernetes.io/ingress.class: "nginx" - cert-manager.io/cluster-issuer: "letsencrypt" -spec: - tls: - - hosts: - - dhfind.prod.cid.contact - secretName: dhfind-ingress-tls - rules: - - host: dhfind.prod.cid.contact - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: dhfind - port: - number: 80 diff --git a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind/kustomization.yaml b/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind/kustomization.yaml deleted file mode 100644 index ee9999d2d..000000000 --- a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind/kustomization.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: storetheindex - -resources: - - ../../../../../base/dhfind - - pod-monitor.yaml - - ingress.yaml - -patchesStrategicMerge: - - deployment.yaml - - service.yaml - -images: - - name: dhfind - newName: 407967248065.dkr.ecr.us-east-2.amazonaws.com/ipni/dhfind - newTag: 20230628142546-6ec4eb394679e183e8c16519cd528feffdf506bf - -replicas: - - name: dhfind - count: 0 diff --git a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind/pod-monitor.yaml b/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind/pod-monitor.yaml deleted file mode 100644 index 62fc54605..000000000 --- a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind/pod-monitor.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PodMonitor -metadata: - name: dhfind - labels: - app: dhfind -spec: - selector: - matchLabels: - app: dhfind - namespaceSelector: - matchNames: - - storetheindex - podMetricsEndpoints: - - path: /metrics - port: metrics diff --git a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind/service.yaml b/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind/service.yaml deleted file mode 100644 index 8f7d40e9a..000000000 --- a/deploy/manifests/prod/us-east-2/tenant/storetheindex/dhfind/service.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# dhfind service is accessible only within K8S cluster VPC via: -# - http://dhfind.internal.dev.cid.contact -# -# See: https://github.com/ipni/dhfind -kind: Service -apiVersion: v1 -metadata: - name: dhfind - 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: dhfind.internal.prod.cid.contact -spec: - externalTrafficPolicy: Cluster - type: LoadBalancer diff --git a/deploy/manifests/prod/us-east-2/tenant/storetheindex/kustomization.yaml b/deploy/manifests/prod/us-east-2/tenant/storetheindex/kustomization.yaml index caf2b699c..7c2b5104a 100644 --- a/deploy/manifests/prod/us-east-2/tenant/storetheindex/kustomization.yaml +++ b/deploy/manifests/prod/us-east-2/tenant/storetheindex/kustomization.yaml @@ -13,17 +13,12 @@ resources: - dhstore - dhstore-helga - dhstore-porvy -- dhfind -- dhfind-helga -- dhfind-porvy - cassette - fdb-manager - dhstore-stateless - fdb-cluster -- dhfind-stateless - fdbmeter - dhstore-qiu -- dhfind-qiu images: - name: storetheindex newName: 407967248065.dkr.ecr.us-east-2.amazonaws.com/storetheindex/storetheindex # {"$imagepolicy": "storetheindex:storetheindex:name"}