Skip to content

The Unified and Autonomous Development Platform

improved k8s and docker scripts

Robin Shen7e2369bcf06d
diff --git a/server-product/docker/Dockerfile b/docker/Dockerfile
similarity index 100%
rename from server-product/docker/Dockerfile
rename to docker/Dockerfile
diff --git a/docker/build.sh b/docker/build.sh
new file mode 100755
index 0000000000..af8d54bedb
--- /dev/null
+++ b/docker/build.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+mvn clean package -f ../pom.xml
+rm -rf build onedev-*
+unzip ../server-product/target/onedev-*.zip
+mv onedev-* build
+cp ../server-product/target/sandbox/site/lib/mysql* ../server-product/target/sandbox/site/lib/postgresql* build/site/lib
+docker build -t 1dev/server:latest .
+docker push 1dev/server:latest
+rm -rf build
diff --git a/server-product/docker/entrypoint.sh b/docker/entrypoint.sh
similarity index 100%
rename from server-product/docker/entrypoint.sh
rename to docker/entrypoint.sh
diff --git a/server-product/docker/idle.sh b/docker/idle.sh
similarity index 100%
rename from server-product/docker/idle.sh
rename to docker/idle.sh
diff --git a/server-product/docker/kubectl b/docker/kubectl
similarity index 100%
rename from server-product/docker/kubectl
rename to docker/kubectl
diff --git a/server-product/docker/run.sh b/docker/run.sh
similarity index 100%
rename from server-product/docker/run.sh
rename to docker/run.sh
diff --git a/server-product/k8s/base/cluster-role-bindings.yaml b/k8s/base/cluster-role-bindings.yaml
similarity index 100%
rename from server-product/k8s/base/cluster-role-bindings.yaml
rename to k8s/base/cluster-role-bindings.yaml
diff --git a/server-product/k8s/base/cluster-roles.yaml b/k8s/base/cluster-roles.yaml
similarity index 100%
rename from server-product/k8s/base/cluster-roles.yaml
rename to k8s/base/cluster-roles.yaml
diff --git a/server-product/k8s/base/deployments.yaml b/k8s/base/deployments.yaml
similarity index 100%
rename from server-product/k8s/base/deployments.yaml
rename to k8s/base/deployments.yaml
diff --git a/server-product/k8s/base/kustomization.yaml b/k8s/base/kustomization.yaml
similarity index 100%
rename from server-product/k8s/base/kustomization.yaml
rename to k8s/base/kustomization.yaml
diff --git a/server-product/k8s/base/namespaces.yaml b/k8s/base/namespaces.yaml
similarity index 100%
rename from server-product/k8s/base/namespaces.yaml
rename to k8s/base/namespaces.yaml
diff --git a/server-product/k8s/base/persistent-volume-claims.yaml b/k8s/base/persistent-volume-claims.yaml
similarity index 100%
rename from server-product/k8s/base/persistent-volume-claims.yaml
rename to k8s/base/persistent-volume-claims.yaml
diff --git a/server-product/k8s/base/service-accounts.yaml b/k8s/base/service-accounts.yaml
similarity index 100%
rename from server-product/k8s/base/service-accounts.yaml
rename to k8s/base/service-accounts.yaml
diff --git a/server-product/k8s/base/services.yaml b/k8s/base/services.yaml
similarity index 100%
rename from server-product/k8s/base/services.yaml
rename to k8s/base/services.yaml
diff --git a/server-product/k8s/maintenance/deployments.yaml b/k8s/maintenance/deployments.yaml
similarity index 100%
rename from server-product/k8s/maintenance/deployments.yaml
rename to k8s/maintenance/deployments.yaml
diff --git a/server-product/k8s/maintenance/kustomization.yaml b/k8s/maintenance/kustomization.yaml
similarity index 100%
rename from server-product/k8s/maintenance/kustomization.yaml
rename to k8s/maintenance/kustomization.yaml
diff --git a/server-product/k8s/mini/README.md b/k8s/mini/README.md
similarity index 100%
rename from server-product/k8s/mini/README.md
rename to k8s/mini/README.md
diff --git a/server-product/k8s/mini/disk-settings.yaml b/k8s/mini/disk-settings.yaml
similarity index 100%
rename from server-product/k8s/mini/disk-settings.yaml
rename to k8s/mini/disk-settings.yaml
diff --git a/server-product/k8s/mini/kustomization.yaml b/k8s/mini/kustomization.yaml
similarity index 100%
rename from server-product/k8s/mini/kustomization.yaml
rename to k8s/mini/kustomization.yaml
diff --git a/server-product/k8s/production/disk-settings.yaml b/k8s/production/disk-settings.yaml
similarity index 100%
rename from server-product/k8s/production/disk-settings.yaml
rename to k8s/production/disk-settings.yaml
diff --git a/server-product/k8s/production/kustomization.yaml b/k8s/production/kustomization.yaml
similarity index 88%
rename from server-product/k8s/production/kustomization.yaml
rename to k8s/production/kustomization.yaml
index e859dc8d1e..2f09f28afc 100644
--- a/server-product/k8s/production/kustomization.yaml
+++ b/k8s/production/kustomization.yaml
@@ -5,6 +5,5 @@ commonLabels:
app: onedev
patchesStrategicMerge:
- node-selectors.yaml
-- cpu-settings.yaml
- memory-settings.yaml
- disk-settings.yaml
diff --git a/server-product/k8s/production/memory-settings.yaml b/k8s/production/memory-settings.yaml
similarity index 100%
rename from server-product/k8s/production/memory-settings.yaml
rename to k8s/production/memory-settings.yaml
diff --git a/server-product/k8s/production/node-selectors.yaml b/k8s/production/node-selectors.yaml
similarity index 100%
rename from server-product/k8s/production/node-selectors.yaml
rename to k8s/production/node-selectors.yaml
diff --git a/server-product/k8s/ssl/README.md b/k8s/ssl/README.md
similarity index 100%
rename from server-product/k8s/ssl/README.md
rename to k8s/ssl/README.md
diff --git a/server-product/k8s/ssl/deployments.yaml b/k8s/ssl/deployments.yaml
similarity index 100%
rename from server-product/k8s/ssl/deployments.yaml
rename to k8s/ssl/deployments.yaml
diff --git a/server-product/k8s/ssl/kustomization.yaml b/k8s/ssl/kustomization.yaml
similarity index 100%
rename from server-product/k8s/ssl/kustomization.yaml
rename to k8s/ssl/kustomization.yaml
diff --git a/server-product/k8s/ssl/services.yaml b/k8s/ssl/services.yaml
similarity index 100%
rename from server-product/k8s/ssl/services.yaml
rename to k8s/ssl/services.yaml
diff --git a/server-product/k8s/trust-certs/README.md b/k8s/trust-certs/README.md
similarity index 100%
rename from server-product/k8s/trust-certs/README.md
rename to k8s/trust-certs/README.md
diff --git a/server-product/k8s/trust-certs/deployments.yaml b/k8s/trust-certs/deployments.yaml
similarity index 100%
rename from server-product/k8s/trust-certs/deployments.yaml
rename to k8s/trust-certs/deployments.yaml
diff --git a/server-product/k8s/trust-certs/kustomization.yaml b/k8s/trust-certs/kustomization.yaml
similarity index 100%
rename from server-product/k8s/trust-certs/kustomization.yaml
rename to k8s/trust-certs/kustomization.yaml
diff --git a/server-product/docker/build.sh b/server-product/docker/build.sh
deleted file mode 100755
index b50b68bef6..0000000000
--- a/server-product/docker/build.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-rm -rf build onedev-*
-unzip ../target/onedev-*.zip
-mv onedev-* build
-cp ../target/sandbox/site/lib/mysql* ../target/sandbox/site/lib/postgresql* build/site/lib
-docker build -t 1dev/server:latest .
-docker push 1dev/server:latest
-rm -rf build
diff --git a/server-product/k8s/production/cpu-settings.yaml b/server-product/k8s/production/cpu-settings.yaml
deleted file mode 100644
index 0818094c53..0000000000
--- a/server-product/k8s/production/cpu-settings.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: onedev
-spec:
- template:
- spec:
- containers:
- - name: onedev
- resources:
- requests:
- cpu: "2"
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: mysql
-spec:
- template:
- spec:
- containers:
- - name: mysql
- resources:
- requests:
- cpu: "1"