Merge remote-tracking branch 'origin/master'

This commit is contained in:
majintao
2024-12-03 15:44:51 +08:00
2 changed files with 32 additions and 13 deletions
Vendored
+6 -6
View File
@@ -2,7 +2,7 @@
pipeline {
agent any
parameters {
choice(name: 'PROJECT_NAME', choices: ['chafangtong', 'fangjia', 'fangjiapds', 'fangjiastatic', 'geluke'], description: '请选择发布的项目')
choice(name: 'PROJECT_NAME', choices: ['chafangtong', 'fangjia', 'fangjiapds', 'fangjiastatic', 'geluke', 'fangjiaopen'], description: '请选择发布的项目')
}
tools {
jdk 'JDK8'
@@ -17,7 +17,7 @@ pipeline {
stage('Maven Build') {
steps {
script {
def projects = ['fangjiabkoff', 'chafangtong', 'fangjia', 'fangjiapds', 'fangjiastatic', 'geluke']
def projects = ['fangjiabkoff', 'chafangtong', 'fangjia', 'fangjiapds', 'fangjiastatic', 'geluke', 'fangjiaopen']
for (def project : projects) {
if (params.PROJECT_NAME == project) {
dir("deliverables/${project}") {
@@ -33,8 +33,8 @@ pipeline {
stage('Docker Build') {
steps {
script {
def projects = ['fangjiabkoff', 'chafangtong', 'fangjia', 'fangjiapds', 'fangjiastatic', 'geluke']
def imagesName = ['fangjiabkoff': 'fangjia-bkoff', 'chafangtong': 'chafangtong', 'fangjia': 'fangjia-coresite', 'fangjiapds': 'fangjia-pds', 'fangjiastatic': 'fangjia-static', 'geluke':"geluke"]
def projects = ['fangjiabkoff', 'chafangtong', 'fangjia', 'fangjiapds', 'fangjiastatic', 'geluke', 'fangjiaopen']
def imagesName = ['fangjiabkoff': 'fangjia-bkoff', 'chafangtong': 'chafangtong', 'fangjia': 'fangjia-coresite', 'fangjiapds': 'fangjia-pds', 'fangjiastatic': 'fangjia-static', 'geluke':"geluke", 'fangjiaopen': 'fangjia-open']
for (def project : projects) {
if (params.PROJECT_NAME == project) {
dir("projects/${imagesName[project]}") {
@@ -53,8 +53,8 @@ pipeline {
stage('K8S Deploy') {
steps {
script {
def projects = ['fangjiabkoff', 'chafangtong', 'fangjia', 'fangjiapds', 'fangjiastatic', 'geluke']
def k8s_config_map = ['fangjiabkoff': 'fangjia-bkoff', 'chafangtong': 'chafangtong', 'fangjia': 'fangjia-coresite', 'fangjiapds': 'fangjia-pds', 'fangjiastatic': 'fangjia-static', 'geluke':"geluke"]
def projects = ['fangjiabkoff', 'chafangtong', 'fangjia', 'fangjiapds', 'fangjiastatic', 'geluke', 'fangjiaopen']
def k8s_config_map = ['fangjiabkoff': 'fangjia-bkoff', 'chafangtong': 'chafangtong', 'fangjia': 'fangjia-coresite', 'fangjiapds': 'fangjia-pds', 'fangjiastatic': 'fangjia-static', 'geluke':"geluke", 'fangjiaopen': 'fangjia-open']
for (def project : projects) {
if (params.PROJECT_NAME == project) {
dir("deliverables/k8s") {
+26 -7
View File
@@ -1,4 +1,4 @@
:apiVersion: apps/v1
apiVersion: apps/v1
kind: Deployment
metadata:
name: fangjia-open
@@ -37,20 +37,39 @@ spec:
- containerPort: 8080
name: web
protocol: TCP
# readinessProbe:
# httpGet:
# path: /k8s/readiness
# port: web
# initialDelaySeconds: 5
# periodSeconds: 10
# livenessProbe:
# httpGet:
# path: /k8s/liveness
# port: web
# initialDelaySeconds: 10
# periodSeconds: 5
volumeMounts:
- name: host-time
mountPath: /etc/localtime
- name: nfs
- name: goojiaconfig
mountPath: /home/goojia/goojiaconfig
volumes:
- name: host-time
hostPath:
path: /etc/localtime
- name: nfs
nfs:
path: /home/nfs_data/goojiaconfig
server: 192.168.0.18
- name: goojiaconfig
cephfs:
monitors:
- 192.168.0.208:6789
- 192.168.0.209:6789
- 192.168.0.210:6789
user: admin
path: /k8s/goojiaconfig
secretRef:
name: ceph-secret
readOnly: false
---
apiVersion: v1
@@ -69,4 +88,4 @@ spec:
ports:
- port: 8080
targetPort: 8080
nodePort: 38089
nodePort: 31088