remove local config & zipkin & spring stream

kaybinwong · Jul 25, 2018 · a9840b4 · a9840b4
1 parent bbef167
commit a9840b4
Show file tree

Hide file tree

Showing 16 changed files with 65 additions and 365 deletions.
diff --git a/helm/cmds-test-values.yaml b/helm/cmds-test-values.yaml
diff --git a/helm/config-test-values.yaml b/helm/config-test-values.yaml
diff --git a/helm/gateway-test-values.yaml b/helm/gateway-test-values.yaml
diff --git a/helm/passport-test-values.yaml b/helm/passport-test-values.yaml
diff --git a/helm/registry-test-values.yaml b/helm/registry-test-values.yaml
diff --git a/helm/zipkin-test-values.yaml b/helm/zipkin-test-values.yaml
diff --git a/mircoservices/cmds-service/pom.xml b/mircoservices/cmds-service/pom.xml
@@ -24,9 +24,7 @@
 		<java.version>1.8</java.version>
 		<spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
 		<!-- docker registry -->
-		<docker.registry>your-private-registry</docker.registry>
-		<!-- insecurity, test only -->
-		<docker.host>http://192.168.64.75:2375</docker.host>
+		<docker.registry>registry.cn-hangzhou.aliyuncs.com/kayb</docker.registry>
 		<!-- none utc time-->
 		<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
 	</properties>
@@ -86,6 +84,7 @@
 		<!-- feign/ribbon end -->
 
 		<!-- tracer start -->
+		<!--
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-sleuth-zipkin</artifactId>
@@ -94,11 +93,11 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-sleuth</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-bus-kafka</artifactId>
 		</dependency>
+		-->
 		<!-- tracer end -->
 
 		<dependency>
@@ -156,7 +155,7 @@
 						<imageTag>latest</imageTag>
 					</imageTags>
 					<dockerDirectory>${project.basedir}/docker</dockerDirectory>
-					<dockerHost>${docker.host}</dockerHost>
+
 				</configuration>
 			</plugin>
 		</plugins>

diff --git a/mircoservices/config-repo/zipkin-service-dev.yaml b/mircoservices/config-repo/zipkin-service-dev.yaml
@@ -16,14 +16,14 @@ spring:
 server:
   port: 9411
 
-zipkin:
-  storage:
-    elasticsearch:
-      cluster: elasticsearch
-      index-replicas: 1
-      passwoord: 123456
-      hosts: localhost:9200
-      index: zipkin
-      index-shards: 1
-      username: elastic
-    type: elasticsearch
+#zipkin:
+#  storage:
+#    elasticsearch:
+#      cluster: elasticsearch
+#      index-replicas: 1
+#      passwoord: 123456
+#      hosts: localhost:9200
+#      index: zipkin
+#      index-shards: 1
+#      username: elastic
+#    type: elasticsearch
diff --git a/mircoservices/config-repo/zipkin-service-test.yaml b/mircoservices/config-repo/zipkin-service-test.yaml
@@ -16,14 +16,14 @@ spring:
 server:
   port: 9411
 
-zipkin:
-  storage:
-    elasticsearch:
-      cluster: elasticsearch
-      index-replicas: 1
-      passwoord: 123456
-      hosts: 192.168.64.168:9200
-      index: zipkin
-      index-shards: 1
-      username: elastic
-    type: elasticsearch
+#zipkin:
+#  storage:
+#    elasticsearch:
+#      cluster: elasticsearch
+#      index-replicas: 1
+#      passwoord: 123456
+#      hosts: 192.168.64.168:9200
+#      index: zipkin
+#      index-shards: 1
+#      username: elastic
+#    type: elasticsearch