From aabebca6cb216c641f430d9f63e7c64033963316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E6=94=80?= Date: Tue, 22 Nov 2016 10:33:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9yaml=E6=96=87=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E5=85=B6=E5=8F=AF=E4=BB=A5=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E4=BA=8Ehlg=E6=B5=8B=E8=AF=95=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-k8s/k8s_config/sirius-rc-hlg.yaml | 16 +++++++++------- docker-k8s/k8s_config/sirius-svc-hlg.yaml | 15 +++++++++++++++ .../{sirius-svc.yaml => sirius-svc-lugu.yaml} | 0 3 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 docker-k8s/k8s_config/sirius-svc-hlg.yaml rename docker-k8s/k8s_config/{sirius-svc.yaml => sirius-svc-lugu.yaml} (100%) diff --git a/docker-k8s/k8s_config/sirius-rc-hlg.yaml b/docker-k8s/k8s_config/sirius-rc-hlg.yaml index b5fe22e..6ade452 100644 --- a/docker-k8s/k8s_config/sirius-rc-hlg.yaml +++ b/docker-k8s/k8s_config/sirius-rc-hlg.yaml @@ -12,7 +12,7 @@ spec: spec: containers: - name: sirius1 - image: docker.baifendian.com/sjx/sirius:25 + image: docker.baifendian.com/lupan/sirius_lugu:0.4.6.1 ports: - containerPort: 10086 env: @@ -25,13 +25,13 @@ spec: - name: DATABASES_DEFAULT_NAME value: aries - name: DATABASES_DEFAULT_HOST - value: "172.24.100.40" + value: "172.24.3.64" - name: DATABASES_DEFAULT_PORT value: "3306" - name: DATABASES_DEFAULT_USER - value: sirius + value: root - name: DATABASES_DEFAULT_PASSWORD - value: sirius + value: baifendian - name: DATABASES_BDMS_ENGINE value: "django.db.backends.mysql" - name: DATABASES_BDMS_NAME @@ -100,6 +100,10 @@ spec: value: "2" - name: WEBHDFS_RETRY_DELAY value: "3" + - name: CLIENTHDFS_HADOOP_HOME + value: "/opt/hadoop" + - name: CLIENTHDFS_NAMENODE_PATH + value: "192.168.44.11:8020" - name: CODIS_REST_URL value: "http://192.168.49.127:8888" - name: CODIS_OPENTSDB_URL @@ -194,13 +198,11 @@ spec: - mountPath: /opt/Sirius/download name: siriusdownload imagePullSecrets: - - name: docker-registry-sys + - name: bfd-docker-registry volumes: - emptyDir: {} name: siriuslog - emptyDir: {} name: siriusdownload - imagePullSecrets: - - name: docker-registry-sys #nodeSelector: # kubernetes.io/hostname: 172.24.2.208 diff --git a/docker-k8s/k8s_config/sirius-svc-hlg.yaml b/docker-k8s/k8s_config/sirius-svc-hlg.yaml new file mode 100644 index 0000000..7f65e81 --- /dev/null +++ b/docker-k8s/k8s_config/sirius-svc-hlg.yaml @@ -0,0 +1,15 @@ +kind: Service +apiVersion: v1 +metadata: + name: sirius +spec: + selector: + name: sirius1 + ports: + - name: http + protocol: TCP + port: 8888 + targetPort: 10086 + externalIPs: + - 192.168.48.21 + - 192.168.48.22 diff --git a/docker-k8s/k8s_config/sirius-svc.yaml b/docker-k8s/k8s_config/sirius-svc-lugu.yaml similarity index 100% rename from docker-k8s/k8s_config/sirius-svc.yaml rename to docker-k8s/k8s_config/sirius-svc-lugu.yaml From ef8acd2845e540334cc16bd58b83432352c2e4e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E6=94=80?= Date: Tue, 22 Nov 2016 18:36:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4yaml=EF=BC=8C=E4=BD=BF?= =?UTF-8?q?=E5=85=B6=E6=AF=8F=E6=AC=A1=E9=83=BD=E6=8B=89=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=EF=BC=8C=E8=80=8C=E4=B8=8D=E6=98=AF=E4=BD=BF=E7=94=A8=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E7=9A=84=E6=9C=AC=E5=9C=B0=E9=95=9C=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-k8s/k8s_config/sirius-rc-hlg.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-k8s/k8s_config/sirius-rc-hlg.yaml b/docker-k8s/k8s_config/sirius-rc-hlg.yaml index 6ade452..59518fd 100644 --- a/docker-k8s/k8s_config/sirius-rc-hlg.yaml +++ b/docker-k8s/k8s_config/sirius-rc-hlg.yaml @@ -12,7 +12,8 @@ spec: spec: containers: - name: sirius1 - image: docker.baifendian.com/lupan/sirius_lugu:0.4.6.1 + image: docker.baifendian.com/lupan/sirius_lugu:0.4.6.2_noldap + imagePullPolicy: Always ports: - containerPort: 10086 env: