Skip to content

GitLab

  • Menu
    • Projects Groups Snippets
      Help
Projects Groups Snippets
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
  • D devops-argo
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 1
    • Merge requests 1
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Packages & Registries
    • Packages & Registries
    • Package Registry
    • Infrastructure Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • 曹中将
  • devops-argo
  • Merge requests
  • !80

Merged
Created 1 year ago by 曹中将@caozhongjiangOwner

update

  • Overview 0
  • Commits 1
  • Changes 36
  • 曹中将 @caozhongjiang approved this merge request 1 year ago

    approved this merge request

  • 曹中将 @caozhongjiang mentioned in commit 024c4fb7 1 year ago

    mentioned in commit 024c4fb7

  • 曹中将 @caozhongjiang merged 1 year ago

    merged

  • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
Please register or sign in to reply
Compare
  • main (base)

and
  • latest version
    70d50e61
    1 commit, 1 year ago

36 files
+ 834
- 0

    Preferences

    File browser
    Compare changes
w‎bd‎
data-sap‎-piaggio‎
ba‎se‎
deploym‎ent.yaml‎ +74 -0
kustomiza‎tion.yaml‎ +5 -0
servic‎e.yaml‎ +20 -0
d‎ev‎
deploym‎ent.yaml‎ +21 -0
kustomiza‎tion.yaml‎ +18 -0
kustomiza‎tion.yaml‎ +1 -0
member-plat‎form-service‎
ba‎se‎
deploym‎ent.yaml‎ +74 -0
kustomiza‎tion.yaml‎ +5 -0
servic‎e.yaml‎ +20 -0
d‎ev‎
deploym‎ent.yaml‎ +21 -0
kustomiza‎tion.yaml‎ +18 -0
kustomiza‎tion.yaml‎ +1 -0
ydh-product-‎service-cust‎
ba‎se‎
deploym‎ent.yaml‎ +74 -0
kustomiza‎tion.yaml‎ +5 -0
servic‎e.yaml‎ +20 -0
d‎ev‎
deploym‎ent.yaml‎ +21 -0
kustomiza‎tion.yaml‎ +18 -0
kustomiza‎tion.yaml‎ +1 -0
ydh-product-s‎ervice-screen‎
ba‎se‎
deploym‎ent.yaml‎ +74 -0
kustomiza‎tion.yaml‎ +5 -0
servic‎e.yaml‎ +20 -0
d‎ev‎
deploym‎ent.yaml‎ +21 -0
kustomiza‎tion.yaml‎ +18 -0
kustomiza‎tion.yaml‎ +1 -0
ydh-product-s‎ervice-seller‎
ba‎se‎
deploym‎ent.yaml‎ +74 -0
kustomiza‎tion.yaml‎ +5 -0
servic‎e.yaml‎ +20 -0
d‎ev‎
deploym‎ent.yaml‎ +21 -0
kustomiza‎tion.yaml‎ +18 -0
kustomiza‎tion.yaml‎ +1 -0
ydh-schedu‎ler-service‎
ba‎se‎
deploym‎ent.yaml‎ +74 -0
kustomiza‎tion.yaml‎ +5 -0
servic‎e.yaml‎ +20 -0
d‎ev‎
deploym‎ent.yaml‎ +21 -0
kustomiza‎tion.yaml‎ +18 -0
kustomiza‎tion.yaml‎ +1 -0
wbd/data-sap-piaggio/base/deployment.yaml 0 → 100644
+ 74
- 0
  • View file @ 70d50e61

  • Edit in single-file editor

  • Open in Web IDE

apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app: data-sap-piaggio
name: data-sap-piaggio
namespace: wbd
spec:
minReadySeconds: 60
progressDeadlineSeconds: 600
replicas: 0
revisionHistoryLimit: 5
selector:
matchLabels:
app: data-sap-piaggio
strategy:
rollingUpdate:
maxSurge: 25%
maxUnavailable: 25%
type: RollingUpdate
template:
metadata:
labels:
app: data-sap-piaggio
spec:
affinity:
nodeAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- preference: {}
weight: 100
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: kubernetes.io/hostname
operator: In
values:
- work1
containers:
- name: data-sap-piaggio
env:
- name: APP_NAME
value: data-sap-piaggio
- name: JAVA_HEAP_SIZE
value: 1500m
- name: APP_ENV
value: ""
- name: spring.profiles.active
value: ""
image: harbor-test.cartechfin.com/wbd/data-sap-piaggio:1
imagePullPolicy: IfNotPresent
ports:
- containerPort: 32200
name: tcp-32200
protocol: TCP
resources:
limits:
memory: 3Gi
requests:
memory: 1500Mi
volumeMounts:
- mountPath: /etc/localtime
name: volume-time
- mountPath: /var/logs
name: logs
restartPolicy: Always
volumes:
- name: volume-time
hostPath:
path: /etc/localtime
type: ''
- name: logs
hostPath:
path: /var/log/webapps/wbd-dev
type: DirectoryOrCreate
wbd/data-sap-piaggio/base/deployment.yaml 0 → 100644
+ 74
- 0
  • View file @ 70d50e61

  • Edit in single-file editor

  • Open in Web IDE

apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app: data-sap-piaggio
name: data-sap-piaggio
namespace: wbd
spec:
minReadySeconds: 60
progressDeadlineSeconds: 600
replicas: 0
revisionHistoryLimit: 5
selector:
matchLabels:
app: data-sap-piaggio
strategy:
rollingUpdate:
maxSurge: 25%
maxUnavailable: 25%
type: RollingUpdate
template:
metadata:
labels:
app: data-sap-piaggio
spec:
affinity:
nodeAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- preference: {}
weight: 100
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: kubernetes.io/hostname
operator: In
values:
- work1
containers:
- name: data-sap-piaggio
env:
- name: APP_NAME
value: data-sap-piaggio
- name: JAVA_HEAP_SIZE
value: 1500m
- name: APP_ENV
value: ""
- name: spring.profiles.active
value: ""
image: harbor-test.cartechfin.com/wbd/data-sap-piaggio:1
imagePullPolicy: IfNotPresent
ports:
- containerPort: 32200
name: tcp-32200
protocol: TCP
resources:
limits:
memory: 3Gi
requests:
memory: 1500Mi
volumeMounts:
- mountPath: /etc/localtime
name: volume-time
- mountPath: /var/logs
name: logs
restartPolicy: Always
volumes:
- name: volume-time
hostPath:
path: /etc/localtime
type: ''
- name: logs
hostPath:
path: /var/log/webapps/wbd-dev
type: DirectoryOrCreate
wbd/data-sap-piaggio/base/kustomization.yaml 0 → 100644
+ 5
- 0
  • View file @ 70d50e61

  • Edit in single-file editor

  • Open in Web IDE

apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- deployment.yaml
- service.yaml
wbd/data-sap-piaggio/base/service.yaml 0 → 100644
+ 20
- 0
  • View file @ 70d50e61

  • Edit in single-file editor

  • Open in Web IDE

apiVersion: v1
kind: Service
metadata:
annotations:
prometheus.io/http-probe: "true"
prometheus.io/scrape: "true"
labels:
app: data-sap-piaggio
name: data-sap-piaggio
namespace: wbd
spec:
ports:
- name: tcp-32200
port: 32200
protocol: TCP
targetPort: 32200
selector:
app: data-sap-piaggio
sessionAffinity: None
type: ClusterIP
wbd/data-sap-piaggio/dev/deployment.yaml 0 → 100644
+ 21
- 0
  • View file @ 70d50e61

  • Edit in single-file editor

  • Open in Web IDE

apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app: data-sap-piaggio
name: data-sap-piaggio
namespace: wbd
spec:
selector:
matchLabels:
app: data-sap-piaggio
template:
metadata:
labels:
app: data-sap-piaggio
spec:
containers:
- name: data-sap-piaggio
env:
- name: APP_ENV
value: "dev"
\ No newline at end of file
wbd/data-sap-piaggio/dev/kustomization.yaml 0 → 100644
+ 18
- 0
  • View file @ 70d50e61

  • Edit in single-file editor

  • Open in Web IDE

apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ../base
patchesStrategicMerge:
- deployment.yaml
namespace: wbd-dev
commonLabels:
variant: dev
replicas:
- count: 1
name: data-sap-piaggio
images:
- name: harbor-test.cartechfin.com/wbd/data-sap-piaggio
newTag: 1
wbd/data-sap-piaggio/kustomization.yaml 0 → 100644
+ 1
- 0
  • View file @ 70d50e61

  • Edit in single-file editor

  • Open in Web IDE

resources:
wbd/member-platform-service/base/deployment.yaml 0 → 100644
+ 74
- 0
  • View file @ 70d50e61

  • Edit in single-file editor

  • Open in Web IDE

apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app: member-platform-service
name: member-platform-service
namespace: wbd
spec:
minReadySeconds: 60
progressDeadlineSeconds: 600
replicas: 0
revisionHistoryLimit: 5
selector:
matchLabels:
app: member-platform-service
strategy:
rollingUpdate:
maxSurge: 25%
maxUnavailable: 25%
type: RollingUpdate
template:
metadata:
labels:
app: member-platform-service
spec:
affinity:
nodeAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- preference: {}
weight: 100
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: kubernetes.io/hostname
operator: In
values:
- work1
containers:
- name: member-platform-service
env:
- name: APP_NAME
value: member-platform-service
- name: JAVA_HEAP_SIZE
value: 1500m
- name: APP_ENV
value: ""
- name: spring.profiles.active
value: ""
image: harbor-test.cartechfin.com/wbd/member-platform-service:1
imagePullPolicy: IfNotPresent
ports:
- containerPort: 22801
name: tcp-22801
protocol: TCP
resources:
limits:
memory: 3Gi
requests:
memory: 1500Mi
volumeMounts:
- mountPath: /etc/localtime
name: volume-time
- mountPath: /var/logs
name: logs
restartPolicy: Always
volumes:
- name: volume-time
hostPath:
path: /etc/localtime
type: ''
- name: logs
hostPath:
path: /var/log/webapps/wbd-dev
type: DirectoryOrCreate
wbd/member-platform-service/base/kustomization.yaml 0 → 100644
+ 5
- 0
  • View file @ 70d50e61

  • Edit in single-file editor

  • Open in Web IDE

apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- deployment.yaml
- service.yaml
wbd/member-platform-service/base/service.yaml 0 → 100644
+ 20
- 0
  • View file @ 70d50e61

  • Edit in single-file editor

  • Open in Web IDE

apiVersion: v1
kind: Service
metadata:
annotations:
prometheus.io/http-probe: "true"
prometheus.io/scrape: "true"
labels:
app: member-platform-service
name: member-platform-service
namespace: wbd
spec:
ports:
- name: tcp-22801
port: 22801
protocol: TCP
targetPort: 22801
selector:
app: member-platform-service
sessionAffinity: None
type: ClusterIP
wbd/member-platform-service/dev/deployment.yaml 0 → 100644
+ 21
- 0
  • View file @ 70d50e61

  • Edit in single-file editor

  • Open in Web IDE

apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app: member-platform-service
name: member-platform-service
namespace: wbd
spec:
selector:
matchLabels:
app: member-platform-service
template:
metadata:
labels:
app: member-platform-service
spec:
containers:
- name: member-platform-service
env:
- name: APP_ENV
value: "dev"
\ No newline at end of file
wbd/member-platform-service/dev/kustomization.yaml 0 → 100644
+ 18
- 0
  • View file @ 70d50e61

  • Edit in single-file editor

  • Open in Web IDE

apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ../base
patchesStrategicMerge:
- deployment.yaml
namespace: wbd-dev
commonLabels:
variant: dev
replicas:
- count: 1
name: member-platform-service
images:
- name: harbor-test.cartechfin.com/wbd/member-platform-service
newTag: 1
wbd/member-platform-service/kustomization.yaml 0 → 100644
+ 1
- 0
  • View file @ 70d50e61

  • Edit in single-file editor

  • Open in Web IDE

resources:
0 Assignees
Assign to
0 Reviewers
Request review from
Milestone
No milestone
None
None
Time tracking
No estimate or time spent
Labels
0
None
0
None
    Assign labels
  • Manage project labels

Lock merge request
Unlocked
1
1 participant
曹中将
Reference: caozhongjiang/devops-argo!80
Source branch: feature/czh

Menu

Projects Groups Snippets
Help