[15.02.20] Finalised yamls

This commit is contained in:
andyjk15 2020-02-15 21:21:47 +00:00
parent 9f7bc929e7
commit 27607c793a
5 changed files with 28 additions and 34 deletions

View File

@ -53,13 +53,12 @@ spec:
secretKeyRef: secretKeyRef:
name: jdbc name: jdbc
key: jdbc.password key: jdbc.password
imagePullPolicy: Always
imagePullPolicy: Always resources:
resources: requests:
requests: cpu: 0.25
cpu: 0.25 memory: 128Mi
memory: 128Mi limits:
limits: cpu: 0.5
cpu: 0.5 memory: 256Mi
memory: 256Mi
restartPolicy: Always restartPolicy: Always

View File

@ -0,0 +1,17 @@
apiVersion: v1
objects:
- kind: Service
apiVersion: v1
metadata:
labels:
name: LABEL
name: db-RESOURCE_NAME
spec:
selector:
app: db-RESOURCE_NAME
ports:
- port: 9090
protocol: TCP
targetPort: 9090
sessionAffinity: None
type: ClusterIP

View File

@ -37,17 +37,6 @@ def applyResource(String environment, String resourcePath, Map<String, Object> p
sh "${command}" sh "${command}"
} }
def updateBuildResources(String environment) {
Map<String, Object> buildConfigParameters = [
RESOURCE_NAME : env.APPLICATION_NAME,
APP_LABEL : env.APPLICATION_LABEL,
DOCKER_REGISTRY: env.DOCKER_REGISTRY,
IMAGE_VERSION : env.APPLICATION_VERSION
]
applyResource(environment, 'configuration/templates/build-config.yaml', buildConfigParameters)
}
def deploy( Integer replicas ) { def deploy( Integer replicas ) {
// rollout latest // rollout latest
// get rollout status // get rollout status
@ -85,11 +74,12 @@ try {
sh "sed -i 's/REPOSITORY/${env.DOCKER_REPOSITORY}/g' configuration/kubernetes/deploy-config.yaml" sh "sed -i 's/REPOSITORY/${env.DOCKER_REPOSITORY}/g' configuration/kubernetes/deploy-config.yaml"
sh "sed -i 's/IMAGE/${env.APPLICATION_NAME}:${env.APPLICATION_VERSION}/g' configuration/kubernetes/deploy-config.yaml" sh "sed -i 's/IMAGE/${env.APPLICATION_NAME}:${env.APPLICATION_VERSION}/g' configuration/kubernetes/deploy-config.yaml"
sh "sed -i 's/RESOURCE_NAME/${env.APPLICATION_NAME}/g' configuration/kubernetes/deploy-config.yaml" sh "sed -i 's/RESOURCE_NAME/${env.APPLICATION_NAME}/g' configuration/kubernetes/deploy-config.yaml"
sh "sed -i 's/LABEL/${env.APPLICATION_LABEL}/g' configuration/kubernetes/deploy-config.yaml" sh "sed -i 's/LABEL/${env.APPLICATION_LABEL}/g' configuration/kubernetes/deploy-config.yaml"
sh "cat configuration/kubernetes/deploy-config.yaml" sh "sed -it s/RESOURCE_NAME/${env.APPLICATION_NAME}/g' configuration/kubernetes/servive.yaml"
sh "sed -it s/LABEL/${env.APPLICATION_LABEL}/g' configuration/kubernetes/servive.yaml"
sh "cat configuration/kubernetes/service.yaml"
// Update build config for kubernetes // Update build config for kubernetes
// Update Service yaml for kubernetes // Update Service yaml for kubernetes
// Update route yaml for kubernetes // Update route yaml for kubernetes

View File

@ -1,2 +0,0 @@
#!/usr/bin/env groovy

View File

@ -1,10 +0,0 @@
#server.port=9090
#spring.jpa.database=POSTGRESQL
#spring.datasource.platform=postgres
#spring.datasource.url=jdbc:postgresql://localhost:5432/postgres
#spring.datasource.username=postgres
#spring.datasource.password=*****
#spring.jpa.show-sql=true
#spring.jpa.generate-ddl=true
#spring.jpa.hibernate.ddl-auto=create-drop
#spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true