From 8ae7c6e63837dd531b8a178e0c4807161700317a Mon Sep 17 00:00:00 2001 From: Andrew Prokhorenkov Date: Sun, 17 Jan 2021 10:57:44 -0600 Subject: [PATCH] feat: converge to BroadSea WebTools --- .../ohdsi-atlas/ohdsi-atlas-deploy.yaml | 59 ---------------- .../ohdsi-atlas/ohdsi-atlas-service-elb.yaml | 18 ----- .../ohdsi-atlas/ohdsi-atlas-service.yaml | 12 ---- .../ohdsi-webapi/ohdsi-webapi-deploy.yaml | 68 ------------------- .../ohdsi-webapi-service-elb.yaml | 18 ----- .../ohdsi-webapi/ohdsi-webapi-service.yaml | 12 ---- .../gen3.nginx.conf/ohdsi-atlas-service.conf | 8 --- .../gen3.nginx.conf/ohdsi-webapi-service.conf | 8 --- 8 files changed, 203 deletions(-) delete mode 100644 kube/services/ohdsi-atlas/ohdsi-atlas-deploy.yaml delete mode 100644 kube/services/ohdsi-atlas/ohdsi-atlas-service-elb.yaml delete mode 100644 kube/services/ohdsi-atlas/ohdsi-atlas-service.yaml delete mode 100644 kube/services/ohdsi-webapi/ohdsi-webapi-deploy.yaml delete mode 100644 kube/services/ohdsi-webapi/ohdsi-webapi-service-elb.yaml delete mode 100644 kube/services/ohdsi-webapi/ohdsi-webapi-service.yaml delete mode 100644 kube/services/revproxy/gen3.nginx.conf/ohdsi-atlas-service.conf delete mode 100644 kube/services/revproxy/gen3.nginx.conf/ohdsi-webapi-service.conf diff --git a/kube/services/ohdsi-atlas/ohdsi-atlas-deploy.yaml b/kube/services/ohdsi-atlas/ohdsi-atlas-deploy.yaml deleted file mode 100644 index 7255ac23b..000000000 --- a/kube/services/ohdsi-atlas/ohdsi-atlas-deploy.yaml +++ /dev/null @@ -1,59 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: ohdsi-atlas-deployment -spec: - selector: - # Only select pods based on the 'app' label - matchLabels: - app: ohdsi-atlas - revisionHistoryLimit: 2 - strategy: - type: RollingUpdate - rollingUpdate: - maxSurge: 1 - maxUnavailable: 0 - template: - metadata: - labels: - app: ohdsi-atlas - public: "yes" - GEN3_DATE_LABEL - spec: - affinity: - podAntiAffinity: - preferredDuringSchedulingIgnoredDuringExecution: - - weight: 100 - podAffinityTerm: - labelSelector: - matchExpressions: - - key: app - operator: In - values: - - ohdsi-atlas - topologyKey: "kubernetes.io/hostname" - automountServiceAccountToken: false - containers: - - name: ohdsi-atlas - GEN3_OHDSI_ATLAS_IMAGE|-image: quay.io/cdis/ohdsi-atlas:latest-| - livenessProbe: - httpGet: - path: / - port: 80 - initialDelaySeconds: 30 - periodSeconds: 60 - timeoutSeconds: 30 - readinessProbe: - httpGet: - path: / - port: 80 - ports: - - containerPort: 80 - imagePullPolicy: Always - resources: - requests: - cpu: 0.5 - memory: 1024Mi - limits: - cpu: 1 - memory: 2400Mi diff --git a/kube/services/ohdsi-atlas/ohdsi-atlas-service-elb.yaml b/kube/services/ohdsi-atlas/ohdsi-atlas-service-elb.yaml deleted file mode 100644 index 55a498ce7..000000000 --- a/kube/services/ohdsi-atlas/ohdsi-atlas-service-elb.yaml +++ /dev/null @@ -1,18 +0,0 @@ -kind: Service -apiVersion: v1 -metadata: - name: ohdsi-atlas-service-elb - annotations: - service.beta.kubernetes.io/aws-load-balancer-backend-protocol: tcp - service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "443" - service.beta.kubernetes.io/aws-load-balancer-ssl-cert: see-kube-setup-ohdsi-atlas - service.beta.kubernetes.io/aws-load-balancer-ssl-negotiation-policy: "ELBSecurityPolicy-TLS-1-2-2017-01" -spec: - selector: - app: ohdsi-atlas - ports: - - protocol: TCP - port: 443 - targetPort: 80 - name: https - type: LoadBalancer diff --git a/kube/services/ohdsi-atlas/ohdsi-atlas-service.yaml b/kube/services/ohdsi-atlas/ohdsi-atlas-service.yaml deleted file mode 100644 index 9a6cd907d..000000000 --- a/kube/services/ohdsi-atlas/ohdsi-atlas-service.yaml +++ /dev/null @@ -1,12 +0,0 @@ -kind: Service -apiVersion: v1 -metadata: - name: ohdsi-atlas-service -spec: - selector: - app: ohdsi-atlas - ports: - - protocol: TCP - port: 80 - targetPort: 80 - name: http diff --git a/kube/services/ohdsi-webapi/ohdsi-webapi-deploy.yaml b/kube/services/ohdsi-webapi/ohdsi-webapi-deploy.yaml deleted file mode 100644 index 4c484b9ea..000000000 --- a/kube/services/ohdsi-webapi/ohdsi-webapi-deploy.yaml +++ /dev/null @@ -1,68 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: ohdsi-webapi-deployment -spec: - selector: - # Only select pods based on the 'app' label - matchLabels: - app: ohdsi-webapi - revisionHistoryLimit: 2 - strategy: - type: RollingUpdate - rollingUpdate: - maxSurge: 1 - maxUnavailable: 0 - template: - metadata: - labels: - app: ohdsi-webapi - public: "yes" - GEN3_DATE_LABEL - spec: - affinity: - podAntiAffinity: - preferredDuringSchedulingIgnoredDuringExecution: - - weight: 100 - podAffinityTerm: - labelSelector: - matchExpressions: - - key: app - operator: In - values: - - ohdsi-webapi - topologyKey: "kubernetes.io/hostname" - automountServiceAccountToken: false - volumes: - - name: ohdsi-webapi-settings - secret: - secretName: "ohdsi-webapi-settings" - containers: - - name: ohdsi-webapi - GEN3_OHDSI_WEBAPI_IMAGE|-image: quay.io/cdis/ohdsi-webapi:latest-| - livenessProbe: - httpGet: - path: / - port: 8080 - initialDelaySeconds: 30 - periodSeconds: 60 - timeoutSeconds: 30 - readinessProbe: - httpGet: - path: / - port: 8080 - ports: - - containerPort: 8080 - volumeMounts: - - name: "ohdsi-webapi-settings" - readOnly: true - mountPath: "/root/.m2/settings.xml" - subPath: "settings.xml" - imagePullPolicy: Always - resources: - requests: - cpu: 1 - memory: 1024Mi - limits: - cpu: 1 - memory: 2400Mi diff --git a/kube/services/ohdsi-webapi/ohdsi-webapi-service-elb.yaml b/kube/services/ohdsi-webapi/ohdsi-webapi-service-elb.yaml deleted file mode 100644 index 6d3c4fd1e..000000000 --- a/kube/services/ohdsi-webapi/ohdsi-webapi-service-elb.yaml +++ /dev/null @@ -1,18 +0,0 @@ -kind: Service -apiVersion: v1 -metadata: - name: ohdsi-webapi-service-elb - annotations: - service.beta.kubernetes.io/aws-load-balancer-backend-protocol: tcp - service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "443" - service.beta.kubernetes.io/aws-load-balancer-ssl-cert: see-kube-setup-ohdsi-webapi - service.beta.kubernetes.io/aws-load-balancer-ssl-negotiation-policy: "ELBSecurityPolicy-TLS-1-2-2017-01" -spec: - selector: - app: ohdsi-webapi - ports: - - protocol: TCP - port: 443 - targetPort: 8080 - name: https - type: LoadBalancer diff --git a/kube/services/ohdsi-webapi/ohdsi-webapi-service.yaml b/kube/services/ohdsi-webapi/ohdsi-webapi-service.yaml deleted file mode 100644 index ebca42108..000000000 --- a/kube/services/ohdsi-webapi/ohdsi-webapi-service.yaml +++ /dev/null @@ -1,12 +0,0 @@ -kind: Service -apiVersion: v1 -metadata: - name: ohdsi-webapi-service -spec: - selector: - app: ohdsi-webapi - ports: - - protocol: TCP - port: 80 - targetPort: 8080 - name: http diff --git a/kube/services/revproxy/gen3.nginx.conf/ohdsi-atlas-service.conf b/kube/services/revproxy/gen3.nginx.conf/ohdsi-atlas-service.conf deleted file mode 100644 index 01bcc96ef..000000000 --- a/kube/services/revproxy/gen3.nginx.conf/ohdsi-atlas-service.conf +++ /dev/null @@ -1,8 +0,0 @@ - location /ohdsi-atlas/ { - set $proxy_service "ohdsi-atlas"; - # upstream is written to logs - set $upstream http://ohdsi-atlas-service.$namespace.svc.cluster.local; - rewrite ^/ohdsi-atlas/(.*) /$1 break; - proxy_pass $upstream; - client_max_body_size 0; - } diff --git a/kube/services/revproxy/gen3.nginx.conf/ohdsi-webapi-service.conf b/kube/services/revproxy/gen3.nginx.conf/ohdsi-webapi-service.conf deleted file mode 100644 index ff5096214..000000000 --- a/kube/services/revproxy/gen3.nginx.conf/ohdsi-webapi-service.conf +++ /dev/null @@ -1,8 +0,0 @@ - location /ohdsi-webapi/ { - set $proxy_service "ohdsi-webapi"; - # upstream is written to logs - set $upstream http://ohdsi-webapi-service.$namespace.svc.cluster.local; - rewrite ^/ohdsi-webapi/(.*) /$1 break; - proxy_pass $upstream; - client_max_body_size 0; - }