The Unified and Autonomous Development Platform
improved k8s and docker scripts
Robin Shen7e2369bcf06d
diff --git a/server-product/docker/Dockerfile b/docker/Dockerfilesimilarity index 100%rename from server-product/docker/Dockerfilerename to docker/Dockerfilediff --git a/docker/build.sh b/docker/build.shnew file mode 100755index 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 builddiff --git a/server-product/docker/entrypoint.sh b/docker/entrypoint.shsimilarity index 100%rename from server-product/docker/entrypoint.shrename to docker/entrypoint.shdiff --git a/server-product/docker/idle.sh b/docker/idle.shsimilarity index 100%rename from server-product/docker/idle.shrename to docker/idle.shdiff --git a/server-product/docker/kubectl b/docker/kubectlsimilarity index 100%rename from server-product/docker/kubectlrename to docker/kubectldiff --git a/server-product/docker/run.sh b/docker/run.shsimilarity index 100%rename from server-product/docker/run.shrename to docker/run.shdiff --git a/server-product/k8s/base/cluster-role-bindings.yaml b/k8s/base/cluster-role-bindings.yamlsimilarity index 100%rename from server-product/k8s/base/cluster-role-bindings.yamlrename to k8s/base/cluster-role-bindings.yamldiff --git a/server-product/k8s/base/cluster-roles.yaml b/k8s/base/cluster-roles.yamlsimilarity index 100%rename from server-product/k8s/base/cluster-roles.yamlrename to k8s/base/cluster-roles.yamldiff --git a/server-product/k8s/base/deployments.yaml b/k8s/base/deployments.yamlsimilarity index 100%rename from server-product/k8s/base/deployments.yamlrename to k8s/base/deployments.yamldiff --git a/server-product/k8s/base/kustomization.yaml b/k8s/base/kustomization.yamlsimilarity index 100%rename from server-product/k8s/base/kustomization.yamlrename to k8s/base/kustomization.yamldiff --git a/server-product/k8s/base/namespaces.yaml b/k8s/base/namespaces.yamlsimilarity index 100%rename from server-product/k8s/base/namespaces.yamlrename to k8s/base/namespaces.yamldiff --git a/server-product/k8s/base/persistent-volume-claims.yaml b/k8s/base/persistent-volume-claims.yamlsimilarity index 100%rename from server-product/k8s/base/persistent-volume-claims.yamlrename to k8s/base/persistent-volume-claims.yamldiff --git a/server-product/k8s/base/service-accounts.yaml b/k8s/base/service-accounts.yamlsimilarity index 100%rename from server-product/k8s/base/service-accounts.yamlrename to k8s/base/service-accounts.yamldiff --git a/server-product/k8s/base/services.yaml b/k8s/base/services.yamlsimilarity index 100%rename from server-product/k8s/base/services.yamlrename to k8s/base/services.yamldiff --git a/server-product/k8s/maintenance/deployments.yaml b/k8s/maintenance/deployments.yamlsimilarity index 100%rename from server-product/k8s/maintenance/deployments.yamlrename to k8s/maintenance/deployments.yamldiff --git a/server-product/k8s/maintenance/kustomization.yaml b/k8s/maintenance/kustomization.yamlsimilarity index 100%rename from server-product/k8s/maintenance/kustomization.yamlrename to k8s/maintenance/kustomization.yamldiff --git a/server-product/k8s/mini/README.md b/k8s/mini/README.mdsimilarity index 100%rename from server-product/k8s/mini/README.mdrename to k8s/mini/README.mddiff --git a/server-product/k8s/mini/disk-settings.yaml b/k8s/mini/disk-settings.yamlsimilarity index 100%rename from server-product/k8s/mini/disk-settings.yamlrename to k8s/mini/disk-settings.yamldiff --git a/server-product/k8s/mini/kustomization.yaml b/k8s/mini/kustomization.yamlsimilarity index 100%rename from server-product/k8s/mini/kustomization.yamlrename to k8s/mini/kustomization.yamldiff --git a/server-product/k8s/production/disk-settings.yaml b/k8s/production/disk-settings.yamlsimilarity index 100%rename from server-product/k8s/production/disk-settings.yamlrename to k8s/production/disk-settings.yamldiff --git a/server-product/k8s/production/kustomization.yaml b/k8s/production/kustomization.yamlsimilarity index 88%rename from server-product/k8s/production/kustomization.yamlrename to k8s/production/kustomization.yamlindex e859dc8d1e..2f09f28afc 100644--- a/server-product/k8s/production/kustomization.yaml+++ b/k8s/production/kustomization.yaml@@ -5,6 +5,5 @@ commonLabels:app: onedevpatchesStrategicMerge:- node-selectors.yaml-- cpu-settings.yaml- memory-settings.yaml- disk-settings.yamldiff --git a/server-product/k8s/production/memory-settings.yaml b/k8s/production/memory-settings.yamlsimilarity index 100%rename from server-product/k8s/production/memory-settings.yamlrename to k8s/production/memory-settings.yamldiff --git a/server-product/k8s/production/node-selectors.yaml b/k8s/production/node-selectors.yamlsimilarity index 100%rename from server-product/k8s/production/node-selectors.yamlrename to k8s/production/node-selectors.yamldiff --git a/server-product/k8s/ssl/README.md b/k8s/ssl/README.mdsimilarity index 100%rename from server-product/k8s/ssl/README.mdrename to k8s/ssl/README.mddiff --git a/server-product/k8s/ssl/deployments.yaml b/k8s/ssl/deployments.yamlsimilarity index 100%rename from server-product/k8s/ssl/deployments.yamlrename to k8s/ssl/deployments.yamldiff --git a/server-product/k8s/ssl/kustomization.yaml b/k8s/ssl/kustomization.yamlsimilarity index 100%rename from server-product/k8s/ssl/kustomization.yamlrename to k8s/ssl/kustomization.yamldiff --git a/server-product/k8s/ssl/services.yaml b/k8s/ssl/services.yamlsimilarity index 100%rename from server-product/k8s/ssl/services.yamlrename to k8s/ssl/services.yamldiff --git a/server-product/k8s/trust-certs/README.md b/k8s/trust-certs/README.mdsimilarity index 100%rename from server-product/k8s/trust-certs/README.mdrename to k8s/trust-certs/README.mddiff --git a/server-product/k8s/trust-certs/deployments.yaml b/k8s/trust-certs/deployments.yamlsimilarity index 100%rename from server-product/k8s/trust-certs/deployments.yamlrename to k8s/trust-certs/deployments.yamldiff --git a/server-product/k8s/trust-certs/kustomization.yaml b/k8s/trust-certs/kustomization.yamlsimilarity index 100%rename from server-product/k8s/trust-certs/kustomization.yamlrename to k8s/trust-certs/kustomization.yamldiff --git a/server-product/docker/build.sh b/server-product/docker/build.shdeleted file mode 100755index 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 builddiff --git a/server-product/k8s/production/cpu-settings.yaml b/server-product/k8s/production/cpu-settings.yamldeleted file mode 100644index 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"