From 9c6c0159d0fbce42358a428742231c40e203e89e Mon Sep 17 00:00:00 2001 From: ajayanto Date: Mon, 27 Jun 2022 18:08:20 +0530 Subject: [PATCH] removed operator proxy from installer --- installer/dfabproxy.yaml | 51 -------------------- installer/install.py | 12 ----- ksonnet/dkube/deployment.libsonnet | 69 --------------------------- ksonnet/service/dfabproxy.libsonnet | 34 ------------- ksonnet/ui/dkube-ui.libsonnet | 2 +- kustomize-nfs/dkube/base/dkube.yaml | 51 -------------------- kustomize/dkube-ui/base/dkube-ui.yaml | 5 +- kustomize/dkube/base/dkube.yaml | 51 -------------------- kustomize/service/base/service.yaml | 52 -------------------- 9 files changed, 3 insertions(+), 324 deletions(-) delete mode 100644 installer/dfabproxy.yaml delete mode 100644 ksonnet/service/dfabproxy.libsonnet diff --git a/installer/dfabproxy.yaml b/installer/dfabproxy.yaml deleted file mode 100644 index 4d3f458..0000000 --- a/installer/dfabproxy.yaml +++ /dev/null @@ -1,51 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: dfabproxy - namespace: dkube - annotations: - getambassador.io/config: |- - --- - apiVersion: ambassador/v0 - kind: Mapping - name: dfabproxy - use_websocket: true - timeout_ms: 600000 - prefix: /dkube/v2/operator - rewrite: /dkube/v2/operator - service: dfabproxy:8000 -spec: - ports: - - name: dfabproxy - port: 8000 - protocol: TCP - targetPort: 8000 - selector: - app: dfabproxy - type: ClusterIP - ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: dfabproxy - namespace: dkube - labels: - app: dfabproxy -spec: - replicas: 1 - selector: - matchLabels: - app: dfabproxy - template: - metadata: - labels: - app: dfabproxy - spec: - imagePullSecrets: - - name: dkube-dockerhub-secret - containers: - - name: dfabproxy - image: ocdr/dkube-dfabproxy:alpha3 - imagePullPolicy: IfNotPresent - diff --git a/installer/install.py b/installer/install.py index cffa588..f1b3180 100644 --- a/installer/install.py +++ b/installer/install.py @@ -386,18 +386,6 @@ def deploy_all(args, rdma_enabled=False): pretty_green("dKube-ui installation is done !!!") time.sleep(1) - pretty_green("Starting dfabproxy installation ...") - install_dfabproxy() - pretty_green("dfabproxy installation is done !!!") - - -def install_dfabproxy(): - if sp.call("kubectl apply -f /opt/dkube/dfabproxy.yaml",shell=True): - pretty_red("dfabproxy install failed") - sys.exit(1) - time.sleep(1) - - def deploy_all_rdma(args): pretty_green("Starting installation all+rdma...") diff --git a/ksonnet/dkube/deployment.libsonnet b/ksonnet/dkube/deployment.libsonnet index d881f2a..558597c 100644 --- a/ksonnet/dkube/deployment.libsonnet +++ b/ksonnet/dkube/deployment.libsonnet @@ -124,75 +124,6 @@ } } }, - dfabProxy(tag , dfabProxyImage, dkubeDockerSecret):: { - "apiVersion": "extensions/v1beta1", - "kind": "Deployment", - "metadata": { - "labels": { - "app": "dkube-operator-proxy" - }, - "name": "dkube-operator-api-proxy-" + tag , - "namespace": "dkube", - }, - "spec": { - "progressDeadlineSeconds": 600, - "replicas": 1, - "revisionHistoryLimit": 10, - "selector": { - "matchLabels": { - "app": "dkube-operator-proxy" - } - }, - "strategy": { - "rollingUpdate": { - "maxSurge": "25%", - "maxUnavailable": "25%" - }, - "type": "RollingUpdate" - }, - "template": { - "metadata": { - "labels": { - "app": "dkube-operator-proxy" - } - }, - "spec": { - "nodeSelector": if nodebind == "yes" then {"d3.nodetype": "dkube"} else {}, - "containers": [ - { - "image": dfabProxyImage, - "imagePullPolicy": "IfNotPresent", - "name": "main", - "resources": {}, - "terminationMessagePath": "/dev/termination-log", - "terminationMessagePolicy": "File" - } - ], - "dnsConfig": { - "options": [ - { - "name": "single-request-reopen" - }, - { - "name": "timeout", - "value": "30" - } - ] - }, - "dnsPolicy": "ClusterFirst", - "imagePullSecrets": [ - { - "name": dkubeDockerSecret - } - ], - "restartPolicy": "Always", - "schedulerName": "default-scheduler", - "securityContext": {}, - "terminationGracePeriodSeconds": 30 - } - } - }, - }, dkubeAuth(tag, dkubeAuthImage, dkubeDockerSecret, nfsServer, nfsBasePath, dkubePubIP):: { "apiVersion": "extensions/v1beta1", "kind": "Deployment", diff --git a/ksonnet/service/dfabproxy.libsonnet b/ksonnet/service/dfabproxy.libsonnet deleted file mode 100644 index caef90c..0000000 --- a/ksonnet/service/dfabproxy.libsonnet +++ /dev/null @@ -1,34 +0,0 @@ -{ - all(params):: [ - $.parts(params.namespace).service(), - ], - - parts(namespace):: { - service():: { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "getambassador.io/config": "---\napiVersion: ambassador/v0\nkind: Mapping\nname: dfabproxy\nuse_websocket: true\ntimeout_ms: 600000\nprefix: /dkube/v2/operator\nrewrite: /dkube/v2/operator\nservice: dkube-operator-api-proxy:8000" - }, - "name": "dkube-operator-api-proxy", - "namespace": "dkube", - }, - "spec": { - "ports": [ - { - "name": "dfabproxy", - "port": 8000, - "protocol": "TCP", - "targetPort": 8000 - } - ], - "selector": { - "app": "dkube-operator-proxy" - }, - "sessionAffinity": "None", - "type": "ClusterIP" - }, - } - } -} diff --git a/ksonnet/ui/dkube-ui.libsonnet b/ksonnet/ui/dkube-ui.libsonnet index 3d4d019..4ee79d0 100644 --- a/ksonnet/ui/dkube-ui.libsonnet +++ b/ksonnet/ui/dkube-ui.libsonnet @@ -38,7 +38,7 @@ "command": [ "bash", "-c", - "while true;\ndo\n nc dkube-operator-api-proxy.dkube 8000 -zv -w 5\n ret1=$? \n nc dkube-controller-master.dkube 5000 -zv -w 5\n ret2=$? \n if (( ret1 == 0 && ret2 == 0 )); then\n break \n fi \n sleep 5\ndone\nbash /entrypoint.sh\n" + "while true;\ndo\n nc dkube-controller-master.dkube 5000 -zv -w 5\n ret1=$? \n if (( ret1 == 0 )); then\n break \n fi \n sleep 5\ndone\nbash /entrypoint.sh\n" ], "image": dkubeUIImage, "imagePullPolicy": "IfNotPresent", diff --git a/kustomize-nfs/dkube/base/dkube.yaml b/kustomize-nfs/dkube/base/dkube.yaml index dc0b841..891353c 100644 --- a/kustomize-nfs/dkube/base/dkube.yaml +++ b/kustomize-nfs/dkube/base/dkube.yaml @@ -302,57 +302,6 @@ spec: --- apiVersion: apps/v1 kind: Deployment -metadata: - labels: - app: dkube-operator-proxy - ksonnet.io/component: dkube - name: dkube-operator-api-proxy-verTag - namespace: dkube -spec: - progressDeadlineSeconds: 600 - replicas: 1 - revisionHistoryLimit: 10 - selector: - matchLabels: - app: dkube-operator-proxy - strategy: - rollingUpdate: - maxSurge: 25% - maxUnavailable: 25% - type: RollingUpdate - template: - metadata: - labels: - app: dkube-operator-proxy - spec: - containers: - - image: dfabProxyImage - imagePullPolicy: IfNotPresent - name: main - env: - - name: DATABASE - value: databaseType - - name: DATABASE_DSN - value: databaseDSN - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - dnsConfig: - options: - - name: single-request-reopen - - name: timeout - value: "30" - dnsPolicy: ClusterFirst - imagePullSecrets: - - name: dkubeDockerSecret - nodeSelector: NODE_SELECTOR - restartPolicy: Always - schedulerName: default-scheduler - serviceAccount: dkube - serviceAccountName: dkube - terminationGracePeriodSeconds: 30 ---- -apiVersion: apps/v1 -kind: Deployment metadata: labels: app: dkube-exporter-deploy diff --git a/kustomize/dkube-ui/base/dkube-ui.yaml b/kustomize/dkube-ui/base/dkube-ui.yaml index 8779566..b4b580c 100644 --- a/kustomize/dkube-ui/base/dkube-ui.yaml +++ b/kustomize/dkube-ui/base/dkube-ui.yaml @@ -20,9 +20,8 @@ spec: - command: - bash - -c - - "while true;\ndo\n nc dkube-operator-api-proxy.dkube 8000 -zv -w 5\n - \ ret1=$? \n nc dkube-controller-master.dkube 5000 -zv -w 5\n ret2=$? - \n if (( ret1 == 0 && ret2 == 0 )); then\n break \n fi \n + - "while true;\ndo\n nc dkube-controller-master.dkube 5000 -zv -w 5\n ret1=$? + \n if (( ret1 == 0 )); then\n break \n fi \n \ sleep 5\ndone\nbash /entrypoint.sh\n" image: dkubeUIImage imagePullPolicy: IfNotPresent diff --git a/kustomize/dkube/base/dkube.yaml b/kustomize/dkube/base/dkube.yaml index b723ab2..44b380f 100644 --- a/kustomize/dkube/base/dkube.yaml +++ b/kustomize/dkube/base/dkube.yaml @@ -299,57 +299,6 @@ spec: --- apiVersion: apps/v1 kind: Deployment -metadata: - labels: - app: dkube-operator-proxy - ksonnet.io/component: dkube - name: dkube-operator-api-proxy-verTag - namespace: dkube -spec: - progressDeadlineSeconds: 600 - replicas: 1 - revisionHistoryLimit: 10 - selector: - matchLabels: - app: dkube-operator-proxy - strategy: - rollingUpdate: - maxSurge: 25% - maxUnavailable: 25% - type: RollingUpdate - template: - metadata: - labels: - app: dkube-operator-proxy - spec: - containers: - - image: dfabProxyImage - imagePullPolicy: IfNotPresent - name: main - env: - - name: DATABASE - value: databaseType - - name: DATABASE_DSN - value: databaseDSN - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - dnsConfig: - options: - - name: single-request-reopen - - name: timeout - value: "30" - dnsPolicy: ClusterFirst - imagePullSecrets: - - name: dkubeDockerSecret - nodeSelector: NODE_SELECTOR - restartPolicy: Always - schedulerName: default-scheduler - serviceAccount: dkube - serviceAccountName: dkube - terminationGracePeriodSeconds: 30 ---- -apiVersion: apps/v1 -kind: Deployment metadata: labels: app: dkube-exporter-deploy diff --git a/kustomize/service/base/service.yaml b/kustomize/service/base/service.yaml index 75184db..650c81e 100644 --- a/kustomize/service/base/service.yaml +++ b/kustomize/service/base/service.yaml @@ -410,22 +410,6 @@ spec: --- apiVersion: v1 kind: Service -metadata: - name: dkube-operator-api-proxy - namespace: dkube -spec: - ports: - - name: dfabproxy - port: 8000 - protocol: TCP - targetPort: 8000 - selector: - app: dkube-operator-proxy - sessionAffinity: None - type: ClusterIP ---- -apiVersion: v1 -kind: Service metadata: name: dkube-serving namespace: dkube @@ -849,42 +833,6 @@ spec: --- apiVersion: networking.istio.io/v1alpha3 kind: VirtualService -metadata: - name: dkube-operator-api-proxy - namespace: dkube -spec: - hosts: - - "*" - gateways: - - dkube-istio-gateway - http: - - match: - - uri: - prefix: /dkube/v2/operator - method: - exact: GET - route: - - destination: - port: - number: 8000 - host: dkube-operator-api-proxy - retries: - attempts: 3 - perTryTimeout: 60s - retryOn: gateway-error,connect-failure,refused-stream - timeout: 4m - - match: - - uri: - prefix: /dkube/v2/operator - route: - - destination: - port: - number: 8000 - host: dkube-operator-api-proxy - timeout: 60s ---- -apiVersion: networking.istio.io/v1alpha3 -kind: VirtualService metadata: name: dkube-prometheus namespace: dkube