Skip to content

removed operator proxy from installer #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ajayanto wants to merge 1 commit into
base: dkube-installer-3.4
Choose a base branch
from
Open

removed operator proxy from installer #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 0 additions & 51 deletions installer/dfabproxy.yaml
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions installer/install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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...")

Expand Down
69 changes: 0 additions & 69 deletions ksonnet/dkube/deployment.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
34 changes: 0 additions & 34 deletions ksonnet/service/dfabproxy.libsonnet
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ksonnet/ui/dkube-ui.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
51 changes: 0 additions & 51 deletions kustomize-nfs/dkube/base/dkube.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions kustomize/dkube-ui/base/dkube-ui.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
51 changes: 0 additions & 51 deletions kustomize/dkube/base/dkube.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
52 changes: 0 additions & 52 deletions kustomize/service/base/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down