The Unified and Autonomous Development Platform
Use existing disk instead of dynamically creating disk for k8s deployment
Robin Shencfeea1b2baa5
diff --git a/pom.xml b/pom.xmlindex 872eafeaa5..5f587cbc17 100644--- a/pom.xml+++ b/pom.xml@@ -7,7 +7,7 @@<version>1.0.3</version></parent><artifactId>server</artifactId>- <version>3.0.2</version>+ <version>3.0.3</version><packaging>pom</packaging><build><finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>diff --git a/server-core/pom.xml b/server-core/pom.xmlindex 0bca126493..c27b1a7280 100644--- a/server-core/pom.xml+++ b/server-core/pom.xml@@ -7,7 +7,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>3.0.2</version>+ <version>3.0.3</version></parent><build><plugins>diff --git a/server-core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DatabaseMigrator.javaindex 6e5471be80..1a9182e9e4 100644--- a/server-core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java+++ b/server-core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java@@ -1035,4 +1035,7 @@ public class DatabaseMigrator {}}+ private void migrate25(File dataDir, Stack<Integer> versions) {+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/Role.java b/server-core/src/main/java/io/onedev/server/model/Role.javanew file mode 100644index 0000000000..e3e59c6525--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/Role.java@@ -0,0 +1,54 @@+package io.onedev.server.model;++import javax.persistence.Column;+import javax.persistence.Entity;+import javax.persistence.Index;+import javax.persistence.Table;++import org.hibernate.annotations.Cache;+import org.hibernate.annotations.CacheConcurrencyStrategy;++/**+ * @author robin+ *+ */+@Entity+@Table(indexes={@Index(columnList="name")})+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+public class Role extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ @Column(nullable=false, unique=true)+ private String name;++ @Column(nullable=false)+ private boolean viewIssues;++ private boolean viewCode;++ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ }++ public boolean isViewIssues() {+ return viewIssues;+ }++ public void setViewIssues(boolean viewIssues) {+ this.viewIssues = viewIssues;+ }++ public boolean isViewCode() {+ return viewCode;+ }++ public void setViewCode(boolean viewCode) {+ this.viewCode = viewCode;+ }++}diff --git a/server-plugin/pom.xml b/server-plugin/pom.xmlindex 1c4642a288..1e6597e041 100644--- a/server-plugin/pom.xml+++ b/server-plugin/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>3.0.2</version>+ <version>3.0.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-archetype/pom.xml b/server-plugin/server-plugin-archetype/pom.xmlindex 9ea00613db..0dd7d8dfbd 100644--- a/server-plugin/server-plugin-archetype/pom.xml+++ b/server-plugin/server-plugin-archetype/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>3.0.2</version>+ <version>3.0.3</version></parent><build><resources>diff --git a/server-plugin/server-plugin-cispec-gradle/pom.xml b/server-plugin/server-plugin-cispec-gradle/pom.xmlindex 66823d1226..1a71d1ce66 100644--- a/server-plugin/server-plugin-cispec-gradle/pom.xml+++ b/server-plugin/server-plugin-cispec-gradle/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>3.0.2</version>+ <version>3.0.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-cispec-maven/pom.xml b/server-plugin/server-plugin-cispec-maven/pom.xmlindex 11c1a21d9b..9287620d95 100644--- a/server-plugin/server-plugin-cispec-maven/pom.xml+++ b/server-plugin/server-plugin-cispec-maven/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>3.0.2</version>+ <version>3.0.3</version></parent><properties><moduleClass>io.onedev.server.plugin.cispec.maven.MavenModule</moduleClass>diff --git a/server-plugin/server-plugin-cispec-node/pom.xml b/server-plugin/server-plugin-cispec-node/pom.xmlindex 7dff091ca3..e2976afa5c 100644--- a/server-plugin/server-plugin-cispec-node/pom.xml+++ b/server-plugin/server-plugin-cispec-node/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>3.0.2</version>+ <version>3.0.3</version></parent><properties><moduleClass>io.onedev.server.plugin.cispec.node.NodePluginModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-docker/pom.xml b/server-plugin/server-plugin-executor-docker/pom.xmlindex f7b88790e6..1cb7cabe9e 100644--- a/server-plugin/server-plugin-executor-docker/pom.xml+++ b/server-plugin/server-plugin-executor-docker/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>3.0.2</version>+ <version>3.0.3</version></parent><properties><moduleClass>io.onedev.server.plugin.docker.DockerModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-kubernetes/pom.xml b/server-plugin/server-plugin-executor-kubernetes/pom.xmlindex c9b3e71be9..eba4ec96c6 100644--- a/server-plugin/server-plugin-executor-kubernetes/pom.xml+++ b/server-plugin/server-plugin-executor-kubernetes/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>3.0.2</version>+ <version>3.0.3</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.kubernetes.KubernetesModule</moduleClass>diff --git a/server-plugin/server-plugin-report-html/pom.xml b/server-plugin/server-plugin-report-html/pom.xmlindex 7d6f7dd480..5ff4e5eeed 100644--- a/server-plugin/server-plugin-report-html/pom.xml+++ b/server-plugin/server-plugin-report-html/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>3.0.2</version>+ <version>3.0.3</version></parent><properties><moduleClass>io.onedev.server.plugin.report.html.HtmlReportModule</moduleClass>diff --git a/server-product/build/k8s/base/deployments.yaml b/server-product/build/k8s/base/deployments.yamlindex 549a37bf36..296e52ea1d 100644--- a/server-product/build/k8s/base/deployments.yaml+++ b/server-product/build/k8s/base/deployments.yaml@@ -32,7 +32,7 @@ spec:- name: hibernate_connection_urlvalue: jdbc:mysql://mysql:3306/onedev?serverTimezone=UTC&allowPublicKeyRetrieval=true&useSSL=false- name: hibernate_connection_username- value: onedev+ value: root- name: hibernate_connection_passwordvalueFrom:secretKeyRef:@@ -68,13 +68,9 @@ spec:args:- "--ignore-db-dir=lost+found"env:- - name: MYSQL_RANDOM_ROOT_PASSWORD- value: "yes"- name: MYSQL_DATABASEvalue: onedev- - name: MYSQL_USER- value: onedev- - name: MYSQL_PASSWORD+ - name: MYSQL_ROOT_PASSWORDvalueFrom:secretKeyRef:name: mysql@@ -90,7 +86,7 @@ spec:- bash- "-c"- |- mysql -uonedev -p$MYSQL_PASSWORD -e 'SELECT 1'+ mysql -uroot -p$MYSQL_ROOT_PASSWORD -e 'SELECT 1'initialDelaySeconds: 5periodSeconds: 2timeoutSeconds: 1diff --git a/server-product/build/k8s/base/kustomization.yaml b/server-product/build/k8s/base/kustomization.yamlindex 4f58af92f2..c98216a118 100644--- a/server-product/build/k8s/base/kustomization.yaml+++ b/server-product/build/k8s/base/kustomization.yaml@@ -12,4 +12,3 @@ resources:- cluster-role-bindings.yaml- services.yaml- deployments.yaml-- persistent-volume-claims.yamldiff --git a/server-product/build/k8s/base/persistent-volume-claims.yaml b/server-product/build/k8s/base/persistent-volume-claims.yamldeleted file mode 100644index e92fe30aed..0000000000--- a/server-product/build/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/build/k8s/mini/disk-settings.yaml b/server-product/build/k8s/mini/disk-settings.yamlindex b396214af4..c9d2163343 100644--- a/server-product/build/k8s/mini/disk-settings.yaml+++ b/server-product/build/k8s/mini/disk-settings.yaml@@ -9,8 +9,9 @@ spec:- name: onedevvolumes:- name: onedev- persistentVolumeClaim:- claimName: onedev+ hostPath:+ path: /opt/onedev+ type: DirectoryOrCreate---apiVersion: apps/v1kind: Deployment@@ -23,23 +24,6 @@ spec:- name: mysqlvolumes:- name: mysql- persistentVolumeClaim:- claimName: mysql-----apiVersion: v1-kind: PersistentVolumeClaim-metadata:- name: onedev-spec:- resources:- requests:- storage: 1Gi-----apiVersion: v1-kind: PersistentVolumeClaim-metadata:- name: mysql-spec:- resources:- requests:- storage: 500Mi+ hostPath:+ path: /opt/onedev-database+ type: DirectoryOrCreatediff --git a/server-product/build/k8s/production/deployments.yaml b/server-product/build/k8s/production/deployments.yamldeleted file mode 100644index 84b2e9cd8c..0000000000--- a/server-product/build/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: mysqldiff --git a/server-product/build/k8s/production/disk-settings.yaml b/server-product/build/k8s/production/disk-settings.yamlindex 850f0bfca5..512da431e4 100644--- a/server-product/build/k8s/production/disk-settings.yaml+++ b/server-product/build/k8s/production/disk-settings.yaml@@ -9,8 +9,9 @@ spec:- name: onedevvolumes:- name: onedev- persistentVolumeClaim:- claimName: onedev+ gcePersistentDisk:+ pdName: onedev+ fsType: ext4---apiVersion: apps/v1kind: Deployment@@ -23,23 +24,6 @@ spec:- name: mysqlvolumes:- name: mysql- persistentVolumeClaim:- claimName: mysql-----apiVersion: v1-kind: PersistentVolumeClaim-metadata:- name: onedev-spec:- resources:- requests:- storage: 100Gi-----apiVersion: v1-kind: PersistentVolumeClaim-metadata:- name: mysql-spec:- resources:- requests:- storage: 10Gi+ gcePersistentDisk:+ pdName: onedev-database+ fsType: ext4diff --git a/server-product/pom.xml b/server-product/pom.xmlindex 58c4ef5a3f..a40c881cbf 100644--- a/server-product/pom.xml+++ b/server-product/pom.xml@@ -7,7 +7,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>3.0.2</version>+ <version>3.0.3</version></parent><dependencies><dependency>