From c98cbe1d7b9cc947ec46c1358930c1d18c2ad6cc Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期一, 01 二月 2021 19:28:09 +0800
Subject: [PATCH] Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ
---
springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml | 3 +--
springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-partybuilding.yaml | 2 ++
springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-user.yaml | 2 ++
springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-community.yaml | 2 ++
springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-timejob.yaml | 2 ++
5 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml b/springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
index b0d7d93..3f442cd 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -23,7 +23,6 @@
</component>
<component name="ChangeListManager">
<list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
- <change beforePath="$PROJECT_DIR$/deploy-file/service-api.yaml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/deploy-file/service-community.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/deploy-file/service-community.yaml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/deploy-file/service-partybuilding.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/deploy-file/service-partybuilding.yaml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/deploy-file/service-timejob.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/deploy-file/service-timejob.yaml" afterDir="false" />
@@ -415,7 +414,7 @@
<workItem from="1611834131869" duration="1431000" />
<workItem from="1611883117467" duration="13328000" />
<workItem from="1611913457874" duration="966000" />
- <workItem from="1612141547518" duration="24505000" />
+ <workItem from="1612141547518" duration="24825000" />
</task>
<servers />
</component>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-community.yaml b/springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-community.yaml
index f81ec71..d2d7763 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-community.yaml
+++ b/springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-community.yaml
@@ -26,6 +26,8 @@
value: config-server
ports:
- containerPort: 8291
+ imagePullSecrets:
+ - name: hhf
---
diff --git a/springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-partybuilding.yaml b/springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-partybuilding.yaml
index c5a049c..1f9e7ce 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-partybuilding.yaml
+++ b/springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-partybuilding.yaml
@@ -26,6 +26,8 @@
value: config-server
ports:
- containerPort: 8291
+ imagePullSecrets:
+ - name: hhf
---
diff --git a/springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-timejob.yaml b/springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-timejob.yaml
index 7f96d12..d5ed970 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-timejob.yaml
+++ b/springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-timejob.yaml
@@ -26,6 +26,8 @@
value: config-server
ports:
- containerPort: 8189
+ imagePullSecrets:
+ - name: hhf
---
diff --git a/springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-user.yaml b/springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-user.yaml
index ffcb6f3..a48ea91 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-user.yaml
+++ b/springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-user.yaml
@@ -26,6 +26,8 @@
value: config-server
ports:
- containerPort: 8196
+ imagePullSecrets:
+ - name: hhf
---
--
Gitblit v1.7.1