The Unified and Autonomous Development Platform
Remove k8s kustomization deployment as it is too limited.
Robin Shen593aa5e95e31
diff --git a/server-product/helm/templates/ingress.yaml b/server-product/helm/templates/ingress.yamlindex 90b3ecb171..3ad847b4fd 100644--- a/server-product/helm/templates/ingress.yaml+++ b/server-product/helm/templates/ingress.yaml@@ -23,7 +23,7 @@ spec:pathType: Prefixbackend:service:- name: {{ include "onedev.fullname" . }}-http+ name: {{ include "onedev.fullname" . }}port:number: 80{{- end }}diff --git a/server-product/helm/templates/service.yaml b/server-product/helm/templates/service.yamlindex eb038a5076..28df21ab7d 100644--- a/server-product/helm/templates/service.yaml+++ b/server-product/helm/templates/service.yaml@@ -1,40 +1,3 @@-{{- if .Values.ingress.host -}}-apiVersion: v1-kind: Service-metadata:- name: {{ include "onedev.fullname" . }}-http- labels:- {{- include "onedev.labels" . | nindent 4 }}- tier: onedev- protocol: http-spec:- ports:- - name: http- port: 80- targetPort: 6610- protocol: TCP- selector:- {{- include "onedev.selectorLabels" . | nindent 4 }}- tier: onedev-----apiVersion: v1-kind: Service-metadata:- name: {{ include "onedev.fullname" . }}-ssh- labels:- {{- include "onedev.labels" . | nindent 4 }}- tier: onedev- protocol: ssh-spec:- ports:- - name: ssh- port: 22- targetPort: 6611- protocol: TCP- selector:- {{- include "onedev.selectorLabels" . | nindent 4 }}- tier: onedev-{{- else }}apiVersion: v1kind: Servicemetadata:@@ -43,7 +6,9 @@ metadata:{{- include "onedev.labels" . | nindent 4 }}tier: onedevspec:+ {{- if not .Values.ingress.host }}type: LoadBalancer+ {{- end }}ports:- name: httpport: 80@@ -56,7 +21,6 @@ spec:selector:{{- include "onedev.selectorLabels" . | nindent 4 }}tier: onedev-{{- end }}---apiVersion: v1kind: Servicediff --git a/server-product/k8s/base/README b/server-product/k8s/base/READMEdeleted file mode 100644index 7474107c4b..0000000000--- a/server-product/k8s/base/README+++ /dev/null@@ -1 +0,0 @@-This folder contains base resource definitions which will be inherited by other folders\ No newline at end of filediff --git a/server-product/k8s/base/cluster-role-bindings.yaml b/server-product/k8s/base/cluster-role-bindings.yamldeleted file mode 100644index bfac591837..0000000000--- a/server-product/k8s/base/cluster-role-bindings.yaml+++ /dev/null@@ -1,11 +0,0 @@-kind: ClusterRoleBinding-apiVersion: rbac.authorization.k8s.io/v1-metadata:- name: onedev-subjects:-- kind: ServiceAccount- name: onedev-roleRef:- kind: ClusterRole- name: onedev- apiGroup: rbac.authorization.k8s.iodiff --git a/server-product/k8s/base/cluster-roles.yaml b/server-product/k8s/base/cluster-roles.yamldeleted file mode 100644index 60a84b6ee0..0000000000--- a/server-product/k8s/base/cluster-roles.yaml+++ /dev/null@@ -1,20 +0,0 @@-kind: ClusterRole-apiVersion: rbac.authorization.k8s.io/v1-metadata:- name: onedev-rules:-- apiGroups: [""]- resources: ["namespaces"]- verbs: ["get", "list", "create", "delete"] #require this permission to run builds in isolated namespaces-- apiGroups: ["rbac.authorization.k8s.io"]- resources: ["clusterrolebindings"]- verbs: ["get", "list", "create", "delete"] #require this permission to bind cluster roles to service account of running builds-- apiGroups: [""]- resources: ["nodes"]- verbs: ["get", "list", "patch"] #require this permission to label nodes with build cache properties to increase cache hit rate-- apiGroups: [""]- resources: ["services", "pods", "pods/log", "pods/exec", "secrets", "configmaps", "events"]- verbs: ["get", "list", "watch", "create", "patch", "delete"] #require this permission to run builds as pods-- apiGroups: ["apps"]- resources: ["deployments"]- verbs: ["get", "list", "create", "patch", "delete"] #require this permission to run builds as pods\ No newline at end of filediff --git a/server-product/k8s/base/deployments.yaml b/server-product/k8s/base/deployments.yamldeleted file mode 100644index 4aa46cd645..0000000000--- a/server-product/k8s/base/deployments.yaml+++ /dev/null@@ -1,103 +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- - containerPort: 6611- 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: root- - name: hibernate_connection_password- valueFrom:- secretKeyRef:- name: mysql- key: password- - name: hibernate_hikari_maximumPoolSize- value: "25"- 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_DATABASE- value: onedev- - name: MYSQL_ROOT_PASSWORD- valueFrom:- secretKeyRef:- name: mysql- key: password- ports:- - containerPort: 3306- volumeMounts:- - name: mysql- mountPath: /var/lib/mysql- readinessProbe:- exec:- command:- - bash- - "-c"- - |- mysql -uroot -p$MYSQL_ROOT_PASSWORD -e 'SELECT 1'- initialDelaySeconds: 5- periodSeconds: 2- timeoutSeconds: 1- volumes:- - name: mysql- persistentVolumeClaim:- claimName: mysql\ No newline at end of filediff --git a/server-product/k8s/base/kustomization.yaml b/server-product/k8s/base/kustomization.yamldeleted file mode 100644index 4f58af92f2..0000000000--- a/server-product/k8s/base/kustomization.yaml+++ /dev/null@@ -1,15 +0,0 @@-namespace: onedev-commonLabels:- app: onedev-secretGenerator:-- name: mysql- literals:- - password=changeit-resources:-- namespaces.yaml-- service-accounts.yaml-- cluster-roles.yaml-- cluster-role-bindings.yaml-- services.yaml-- deployments.yaml-- persistent-volume-claims.yamldiff --git a/server-product/k8s/base/namespaces.yaml b/server-product/k8s/base/namespaces.yamldeleted file mode 100644index 375e40c424..0000000000--- a/server-product/k8s/base/namespaces.yaml+++ /dev/null@@ -1,4 +0,0 @@-apiVersion: v1-kind: Namespace-metadata:- name: onedev\ No newline at end of filediff --git a/server-product/k8s/base/persistent-volume-claims.yaml b/server-product/k8s/base/persistent-volume-claims.yamldeleted file mode 100644index e92fe30aed..0000000000--- a/server-product/k8s/base/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:- - ReadWriteOncediff --git a/server-product/k8s/base/service-accounts.yaml b/server-product/k8s/base/service-accounts.yamldeleted file mode 100644index 94919ff538..0000000000--- a/server-product/k8s/base/service-accounts.yaml+++ /dev/null@@ -1,4 +0,0 @@-apiVersion: v1-kind: ServiceAccount-metadata:- name: onedevdiff --git a/server-product/k8s/base/services.yaml b/server-product/k8s/base/services.yamldeleted file mode 100644index c511be4678..0000000000--- a/server-product/k8s/base/services.yaml+++ /dev/null@@ -1,31 +0,0 @@-apiVersion: v1-kind: Service-metadata:- name: onedev- labels:- tier: server-spec:- type: LoadBalancer- ports:- - name: http- port: 80- targetPort: 6610- protocol: TCP- - name: ssh- port: 22- targetPort: 6611- protocol: TCP- selector:- tier: server-----apiVersion: v1-kind: Service-metadata:- name: mysql- labels:- tier: database-spec:- ports:- - port: 3306- selector:- tier: databasediff --git a/server-product/k8s/build.sh b/server-product/k8s/build.shdeleted file mode 100755index 69f0dbe37a..0000000000--- a/server-product/k8s/build.sh+++ /dev/null@@ -1,19 +0,0 @@-#!/bin/bash--set -e--cd ../target--buildVersion=`ls onedev-*.zip|sed -e 's/onedev-\(.*\).zip/\1/'`--rm -rf k8s-resources-cp -r ../k8s k8s-resources-rm k8s-resources/build.sh--if [[ "$OSTYPE" == "darwin"* ]]; then- find k8s-resources -name "*.yaml" | xargs sed -i '' "s/\${buildVersion}/${buildVersion}/g"-else- find k8s-resources -name "*.yaml" | xargs sed -i -e "s/\${buildVersion}/${buildVersion}/g"-fi--zip -r k8s-resources.zip k8s-resourcesdiff --git a/server-product/k8s/maintenance/README b/server-product/k8s/maintenance/READMEdeleted file mode 100644index 36d3efc1f4..0000000000--- a/server-product/k8s/maintenance/README+++ /dev/null@@ -1,2 +0,0 @@-Applying this folder will put OneDev into maintenance mode:-https://code.onedev.io/projects/onedev-manual/blob/master/pages/maintenance-mode.md\ No newline at end of filediff --git a/server-product/k8s/maintenance/deployments.yaml b/server-product/k8s/maintenance/deployments.yamldeleted file mode 100644index f57d0c0bf4..0000000000--- a/server-product/k8s/maintenance/deployments.yaml+++ /dev/null@@ -1,12 +0,0 @@-apiVersion: apps/v1-kind: Deployment-metadata:- name: onedev-spec:- template:- metadata:- name: onedev- spec:- containers:- - name: onedev- command: ["/root/bin/idle.sh"]diff --git a/server-product/k8s/maintenance/kustomization.yaml b/server-product/k8s/maintenance/kustomization.yamldeleted file mode 100644index fd43ee329c..0000000000--- a/server-product/k8s/maintenance/kustomization.yaml+++ /dev/null@@ -1,5 +0,0 @@-namespace: onedev-bases:-- ../production-patchesStrategicMerge:-- deployments.yamldiff --git a/server-product/k8s/production/disk-settings.yaml b/server-product/k8s/production/disk-settings.yamldeleted file mode 100644index 45279f638f..0000000000--- a/server-product/k8s/production/disk-settings.yaml+++ /dev/null@@ -1,17 +0,0 @@-apiVersion: v1-kind: PersistentVolumeClaim-metadata:- name: onedev-spec:- resources:- requests:- storage: 100Gi-----apiVersion: v1-kind: PersistentVolumeClaim-metadata:- name: mysql-spec:- resources:- requests:- storage: 20Gi\ No newline at end of filediff --git a/server-product/k8s/production/kustomization.yaml b/server-product/k8s/production/kustomization.yamldeleted file mode 100644index 02fd41752f..0000000000--- a/server-product/k8s/production/kustomization.yaml+++ /dev/null@@ -1,11 +0,0 @@-namespace: onedev-bases:-- ../base-commonLabels:- app: onedev-images:-- name: 1dev/server- newTag: ${buildVersion}-patchesStrategicMerge:-- node-selectors.yaml-- disk-settings.yamldiff --git a/server-product/k8s/production/node-selectors.yaml b/server-product/k8s/production/node-selectors.yamldeleted file mode 100644index 9e828e0a78..0000000000--- a/server-product/k8s/production/node-selectors.yaml+++ /dev/null@@ -1,19 +0,0 @@-apiVersion: apps/v1-kind: Deployment-metadata:- name: onedev-spec:- template:- spec:- nodeSelector:- kubernetes.io/os: linux-----apiVersion: apps/v1-kind: Deployment-metadata:- name: mysql-spec:- template:- spec:- nodeSelector:- kubernetes.io/os: linux