Skip to content

The Unified and Autonomous Development Platform

Remove redundant k8s manifests

Robin Shen4f4abe421f44
diff --git a/server-product/k8s/production/cpu-settings.yaml b/server-product/k8s/production/cpu-settings.yaml
index 21fbfbdbc5..0818094c53 100644
--- a/server-product/k8s/production/cpu-settings.yaml
+++ b/server-product/k8s/production/cpu-settings.yaml
@@ -9,7 +9,7 @@ spec:
- name: onedev
resources:
requests:
- cpu: "1"
+ cpu: "2"
---
apiVersion: apps/v1
kind: Deployment
@@ -22,4 +22,4 @@ spec:
- name: mysql
resources:
requests:
- cpu: 500m
+ cpu: "1"
diff --git a/server-product/k8s/production/deployments.yaml b/server-product/k8s/production/deployments.yaml
deleted file mode 100644
index 84b2e9cd8c..0000000000
--- a/server-product/k8s/production/deployments.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: onedev
- labels:
- tier: server
-spec:
- selector:
- matchLabels:
- tier: server
- strategy:
- type: Recreate
- template:
- metadata:
- name: onedev
- labels:
- tier: server
- spec:
- containers:
- - name: onedev
- image: 1dev/server
- volumeMounts:
- - mountPath: "/opt/onedev"
- name: onedev
- ports:
- - containerPort: 6610
- env:
- - name: hibernate_dialect
- value: org.hibernate.dialect.MySQL5InnoDBDialect
- - name: hibernate_connection_driver_class
- value: com.mysql.cj.jdbc.Driver
- - name: hibernate_connection_url
- value: jdbc:mysql://mysql:3306/onedev?serverTimezone=UTC&allowPublicKeyRetrieval=true&useSSL=false
- - name: hibernate_connection_username
- value: onedev
- - name: hibernate_connection_password
- valueFrom:
- secretKeyRef:
- name: mysql
- key: password
- initContainers:
- - name: init
- image: busybox
- command: ["sh", "-c", "until nslookup mysql.onedev.svc.cluster.local; do echo waiting for mysql; sleep 2; done;"]
- volumes:
- - name: onedev
- persistentVolumeClaim:
- claimName: onedev
- serviceAccountName: onedev
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: mysql
- labels:
- tier: database
-spec:
- selector:
- matchLabels:
- tier: database
- strategy:
- type: Recreate
- template:
- metadata:
- name: mysql
- labels:
- tier: database
- spec:
- containers:
- - name: mysql
- image: mysql:5.7
- args:
- - "--ignore-db-dir=lost+found"
- env:
- - name: MYSQL_RANDOM_ROOT_PASSWORD
- value: "yes"
- - name: MYSQL_DATABASE
- value: onedev
- - name: MYSQL_USER
- value: onedev
- - name: MYSQL_PASSWORD
- valueFrom:
- secretKeyRef:
- name: mysql
- key: password
- ports:
- - containerPort: 3306
- volumeMounts:
- - name: mysql
- mountPath: /var/lib/mysql
- readinessProbe:
- exec:
- command:
- - bash
- - "-c"
- - |
- mysql -uonedev -p$MYSQL_PASSWORD -e 'SELECT 1'
- initialDelaySeconds: 5
- periodSeconds: 2
- timeoutSeconds: 1
- volumes:
- - name: mysql
- persistentVolumeClaim:
- claimName: mysql
diff --git a/server-product/k8s/production/namespaces.yaml b/server-product/k8s/production/namespaces.yaml
deleted file mode 100644
index 053687d32e..0000000000
--- a/server-product/k8s/production/namespaces.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
- name: onedev
diff --git a/server-product/k8s/production/persistent-volume-claims.yaml b/server-product/k8s/production/persistent-volume-claims.yaml
deleted file mode 100644
index e92fe30aed..0000000000
--- a/server-product/k8s/production/persistent-volume-claims.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
- name: onedev
- labels:
- tier: server
-spec:
- accessModes:
- - ReadWriteOnce
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
- name: mysql
- labels:
- tier: database
-spec:
- accessModes:
- - ReadWriteOnce
diff --git a/server-product/k8s/production/role-bindings.yaml b/server-product/k8s/production/role-bindings.yaml
deleted file mode 100644
index c8fd2babff..0000000000
--- a/server-product/k8s/production/role-bindings.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
- name: onedev
-subjects:
-- kind: ServiceAccount
- name: onedev
-roleRef:
- kind: ClusterRole
- name: onedev
- apiGroup: rbac.authorization.k8s.io
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
- name: onedev
-roleRef:
- apiGroup: rbac.authorization.k8s.io
- kind: Role
- name: onedev
-subjects:
-- kind: ServiceAccount
- name: onedev
diff --git a/server-product/k8s/production/roles.yaml b/server-product/k8s/production/roles.yaml
deleted file mode 100644
index ed81f73614..0000000000
--- a/server-product/k8s/production/roles.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
- name: onedev
-rules:
-- apiGroups: [""]
- resources: ["namespaces"]
- verbs: ["get", "list"]
-- apiGroups: [""]
- resources: ["nodes"]
- verbs: ["get", "list", "patch"]
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
- name: onedev
-rules:
-- apiGroups: [""]
- resources: ["pods", "pods/log", "secrets", "configmaps", "events"]
- verbs: ["create", "get", "list", "watch", "delete"]
diff --git a/server-product/k8s/production/service-accounts.yaml b/server-product/k8s/production/service-accounts.yaml
deleted file mode 100644
index 94919ff538..0000000000
--- a/server-product/k8s/production/service-accounts.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
- name: onedev
diff --git a/server-product/k8s/production/services.yaml b/server-product/k8s/production/services.yaml
deleted file mode 100644
index 26471e108b..0000000000
--- a/server-product/k8s/production/services.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
- name: onedev
- labels:
- tier: server
-spec:
- type: LoadBalancer
- ports:
- - name: http
- port: 80
- targetPort: 6610
- protocol: TCP
- selector:
- tier: server
----
-apiVersion: v1
-kind: Service
-metadata:
- name: mysql
- labels:
- tier: database
-spec:
- ports:
- - port: 3306
- selector:
- tier: database