From 839f93dc6485574987be3c011cfdd53f6a41a9b1 Mon Sep 17 00:00:00 2001 From: Chris Ricci Date: Mon, 1 May 2017 12:13:29 -0400 Subject: [PATCH 01/18] first push --- Jenkinsfile-canary | 32 ++++++++++++++++++++++++++++ Jenkinsfile-production | 32 ++++++++++++++++++++++++++++ k8s/canary/python-api.yaml | 28 ++++++++++++++++++++++++ k8s/production/python-api.yaml | 28 ++++++++++++++++++++++++ k8s/production/samplewebapp.yaml.old | 32 ++++++++++++++++++++++++++++ k8s/services/python-api-svc.yaml | 12 +++++++++++ 6 files changed, 164 insertions(+) create mode 100644 Jenkinsfile-canary create mode 100644 Jenkinsfile-production create mode 100644 k8s/canary/python-api.yaml create mode 100644 k8s/production/python-api.yaml create mode 100644 k8s/production/samplewebapp.yaml.old create mode 100644 k8s/services/python-api-svc.yaml diff --git a/Jenkinsfile-canary b/Jenkinsfile-canary new file mode 100644 index 0000000..c903252 --- /dev/null +++ b/Jenkinsfile-canary @@ -0,0 +1,32 @@ +node { + def project = 'chris_ricci' + def appName = 'python_api' + def feSvcName = "${appName}" + def namespace = 'production' + def imageTag = "quay.io/${project}/${appName}:canary.v${env.BUILD_NUMBER}" + checkout scm + + stage 'Printenv' + sh("printenv") + + stage 'Login to Quay.io' + sh("docker login -u=\"${env.quay_username}\" -p=\"${env.quay_password}\" quay.io") + + stage 'Build image' + sh("docker build -t ${imageTag} .") + +// stage 'Run Go tests ' +// sh("docker run ${imageTag} go test") + + stage 'Push image to registry' + sh("docker push ${imageTag}") + + stage "Deploy Application" + // Roll out to canary environment + // Change deployed image in canary to the one we just built + sh("sed -i.bak 's#quay.io/${project}/${appName}:.*\$#${imageTag}#' ./k8s/canary/*.yaml") + sh("kubectl --namespace=${namespace} apply -f k8s/services/") + sh("kubectl --namespace=${namespace} apply -f k8s/canary/") + //sh("echo http://`kubectl --namespace=${namespace} get service/${feSvcName} --output=json | jq -r '.status.loadBalancer.ingress[0].ip'` > ${feSvcName}") + //break +} diff --git a/Jenkinsfile-production b/Jenkinsfile-production new file mode 100644 index 0000000..dfbc2b8 --- /dev/null +++ b/Jenkinsfile-production @@ -0,0 +1,32 @@ +node { + def project = 'chris_ricci' + def appName = 'python_api' + def feSvcName = "${appName}" + def namespace = 'production' + def imageTag = "quay.io/${project}/${appName}:production.v${env.BUILD_NUMBER}" + checkout scm + + stage 'Printenv' + sh("printenv") + + stage 'Login to Quay.io' + sh("docker login -u=\"${env.quay_username}\" -p=\"${env.quay_password}\" quay.io") + + stage 'Build image' + sh("docker build -t ${imageTag} .") + +// stage 'Run Go tests ' +// sh("docker run ${imageTag} go test") + + stage 'Push image to registry' + sh("docker push ${imageTag}") + + stage "Deploy Application" + // Roll out to canary environment + // Change deployed image in production to the one we just built + sh("sed -i.bak 's#quay.io/${project}/${appName}:.*\$#${imageTag}#' ./k8s/production/*.yaml") + sh("kubectl --namespace=${namespace} apply -f k8s/services/") + sh("kubectl --namespace=${namespace} apply -f k8s/production/") + //sh("echo http://`kubectl --namespace=${namespace} get service/${feSvcName} --output=json | jq -r '.status.loadBalancer.ingress[0].ip'` > ${feSvcName}") + //break +} diff --git a/k8s/canary/python-api.yaml b/k8s/canary/python-api.yaml new file mode 100644 index 0000000..ea7c7f2 --- /dev/null +++ b/k8s/canary/python-api.yaml @@ -0,0 +1,28 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + labels: + app: python-api + env: canary + name: python-api-canary +spec: + replicas: 1 + template: + metadata: + labels: + app: python-api + env: canary + spec: + containers: + - image: quay.io/chris_ricci/python_api:v1 + imagePullPolicy: IfNotPresent + name: python-api + ports: + - containerPort: 80 + protocol: TCP + resources: {} + terminationMessagePath: /dev/termination-log + dnsPolicy: ClusterFirst + restartPolicy: Always + securityContext: {} + terminationGracePeriodSeconds: 30 diff --git a/k8s/production/python-api.yaml b/k8s/production/python-api.yaml new file mode 100644 index 0000000..2ba78e5 --- /dev/null +++ b/k8s/production/python-api.yaml @@ -0,0 +1,28 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + labels: + app: python-api + env: production + name: python-api-production +spec: + replicas: 4 + template: + metadata: + labels: + app: python-api + env: production + spec: + containers: + - image: quay.io/chris_ricci/python_api:v1 + imagePullPolicy: IfNotPresent + name: python-api + ports: + - containerPort: 80 + protocol: TCP + resources: {} + terminationMessagePath: /dev/termination-log + dnsPolicy: ClusterFirst + restartPolicy: Always + securityContext: {} + terminationGracePeriodSeconds: 30 diff --git a/k8s/production/samplewebapp.yaml.old b/k8s/production/samplewebapp.yaml.old new file mode 100644 index 0000000..2466a56 --- /dev/null +++ b/k8s/production/samplewebapp.yaml.old @@ -0,0 +1,32 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + labels: + app: simplewebapp + env: production + name: simplewebapp +spec: + replicas: 3 + selector: + matchLabels: + app: simplewebapp + env: production + strategy: + rollingUpdate: + maxSurge: 1 + maxUnavailable: 1 + type: RollingUpdate + spec: + containers: + - image: quay.io/chris_ricci/simplewebapp:v21 + imagePullPolicy: IfNotPresent + name: simplewebapp + ports: + - containerPort: 80 + protocol: TCP + resources: {} + terminationMessagePath: /dev/termination-log + dnsPolicy: ClusterFirst + restartPolicy: Always + securityContext: {} + terminationGracePeriodSeconds: 30 diff --git a/k8s/services/python-api-svc.yaml b/k8s/services/python-api-svc.yaml new file mode 100644 index 0000000..6b65775 --- /dev/null +++ b/k8s/services/python-api-svc.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: Service +metadata: + name: python-api +spec: + ports: + - port: 80 + protocol: TCP + targetPort: 80 + selector: + app: python-api + type: LoadBalancer From 3d450a21f4ac242a6c138ef2d2e7a3ae276e4edf Mon Sep 17 00:00:00 2001 From: Chris Ricci Date: Mon, 1 May 2017 13:49:34 -0400 Subject: [PATCH 02/18] fixing port configuration --- k8s/canary/python-api.yaml | 2 +- k8s/production/python-api.yaml | 2 +- k8s/services/python-api-svc.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/k8s/canary/python-api.yaml b/k8s/canary/python-api.yaml index ea7c7f2..09158f7 100644 --- a/k8s/canary/python-api.yaml +++ b/k8s/canary/python-api.yaml @@ -18,7 +18,7 @@ spec: imagePullPolicy: IfNotPresent name: python-api ports: - - containerPort: 80 + - containerPort: 5000 protocol: TCP resources: {} terminationMessagePath: /dev/termination-log diff --git a/k8s/production/python-api.yaml b/k8s/production/python-api.yaml index 2ba78e5..cb074a5 100644 --- a/k8s/production/python-api.yaml +++ b/k8s/production/python-api.yaml @@ -18,7 +18,7 @@ spec: imagePullPolicy: IfNotPresent name: python-api ports: - - containerPort: 80 + - containerPort: 5000 protocol: TCP resources: {} terminationMessagePath: /dev/termination-log diff --git a/k8s/services/python-api-svc.yaml b/k8s/services/python-api-svc.yaml index 6b65775..be34e67 100644 --- a/k8s/services/python-api-svc.yaml +++ b/k8s/services/python-api-svc.yaml @@ -6,7 +6,7 @@ spec: ports: - port: 80 protocol: TCP - targetPort: 80 + targetPort: 5000 selector: app: python-api type: LoadBalancer From 8844c07841ae631ec5c4bc1315c47a809bfe4cb8 Mon Sep 17 00:00:00 2001 From: Chris Ricci Date: Mon, 1 May 2017 14:09:05 -0400 Subject: [PATCH 03/18] adding canary --- app/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views.py b/app/views.py index 5603900..94ee774 100644 --- a/app/views.py +++ b/app/views.py @@ -5,4 +5,4 @@ @app.route('/index') def index(): timestamp = str(datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')) - return timestamp + " Hello, World!\n" + return timestamp + " Hello, World! - CANARY!!!!\n" From a32e9d2bced7a200d6fb7caef31f38c3a0e8c136 Mon Sep 17 00:00:00 2001 From: Chris Ricci Date: Mon, 1 May 2017 14:37:31 -0400 Subject: [PATCH 04/18] updating stage descriptor --- Jenkinsfile-canary | 2 +- Jenkinsfile-production | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile-canary b/Jenkinsfile-canary index c903252..e74c17a 100644 --- a/Jenkinsfile-canary +++ b/Jenkinsfile-canary @@ -18,7 +18,7 @@ node { // stage 'Run Go tests ' // sh("docker run ${imageTag} go test") - stage 'Push image to registry' + stage 'Push image to Quay.io registry' sh("docker push ${imageTag}") stage "Deploy Application" diff --git a/Jenkinsfile-production b/Jenkinsfile-production index dfbc2b8..f864a8d 100644 --- a/Jenkinsfile-production +++ b/Jenkinsfile-production @@ -18,7 +18,7 @@ node { // stage 'Run Go tests ' // sh("docker run ${imageTag} go test") - stage 'Push image to registry' + stage 'Push image to Quay.io registry' sh("docker push ${imageTag}") stage "Deploy Application" From 6f27fcf06e172255e7380e57e8c82c9959136b40 Mon Sep 17 00:00:00 2001 From: Chris Ricci Date: Mon, 1 May 2017 14:55:20 -0400 Subject: [PATCH 05/18] removing canary --- app/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views.py b/app/views.py index 94ee774..5603900 100644 --- a/app/views.py +++ b/app/views.py @@ -5,4 +5,4 @@ @app.route('/index') def index(): timestamp = str(datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')) - return timestamp + " Hello, World! - CANARY!!!!\n" + return timestamp + " Hello, World!\n" From 2fb393151ab2ee86ceaf3aca3b525169beeb0538 Mon Sep 17 00:00:00 2001 From: Chris Ricci Date: Mon, 1 May 2017 15:20:15 -0400 Subject: [PATCH 06/18] adding canary --- app/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views.py b/app/views.py index 5603900..6dfa904 100644 --- a/app/views.py +++ b/app/views.py @@ -5,4 +5,4 @@ @app.route('/index') def index(): timestamp = str(datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')) - return timestamp + " Hello, World!\n" + return timestamp + " Hello, World! - CANARY!!\n" From 53aef87c6acb53b0966ce23a80bb3f9ab8fac2c5 Mon Sep 17 00:00:00 2001 From: Chris Ricci Date: Fri, 5 May 2017 14:47:57 -0400 Subject: [PATCH 07/18] removing canary --- app/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views.py b/app/views.py index 6dfa904..5603900 100644 --- a/app/views.py +++ b/app/views.py @@ -5,4 +5,4 @@ @app.route('/index') def index(): timestamp = str(datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')) - return timestamp + " Hello, World! - CANARY!!\n" + return timestamp + " Hello, World!\n" From 78788c796fb1c483e280d2bcba60b2a3c541d35e Mon Sep 17 00:00:00 2001 From: Chris Ricci Date: Fri, 5 May 2017 16:09:11 -0400 Subject: [PATCH 08/18] Adding Canary --- app/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views.py b/app/views.py index 5603900..94ee774 100644 --- a/app/views.py +++ b/app/views.py @@ -5,4 +5,4 @@ @app.route('/index') def index(): timestamp = str(datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')) - return timestamp + " Hello, World!\n" + return timestamp + " Hello, World! - CANARY!!!!\n" From 6c9e70b6a470b8e2736814116e9042f703c6bff7 Mon Sep 17 00:00:00 2001 From: Chris Ricci Date: Tue, 9 May 2017 11:49:12 -0400 Subject: [PATCH 09/18] removing the canary --- app/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views.py b/app/views.py index 94ee774..5603900 100644 --- a/app/views.py +++ b/app/views.py @@ -5,4 +5,4 @@ @app.route('/index') def index(): timestamp = str(datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')) - return timestamp + " Hello, World! - CANARY!!!!\n" + return timestamp + " Hello, World!\n" From bf174de115f5f9b148dfd2b9152b27495eed584e Mon Sep 17 00:00:00 2001 From: Chris Ricci Date: Tue, 9 May 2017 12:17:44 -0400 Subject: [PATCH 10/18] updating for multi branch build --- Jenkinsfile | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..007c3c2 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,44 @@ +node { + def project = 'chris_ricci' + def appName = 'python_api' + def feSvcName = "${appName}" + def namespace = 'production' + def imageTag = "quay.io/${project}/${appName}:${env.BRANCH_NAME}.v${env.BUILD_NUMBER}" + checkout scm + + stage 'Printenv' + sh("printenv") + + stage 'Login to Quay.io' + sh("docker login -u=\"${env.quay_username}\" -p=\"${env.quay_password}\" quay.io") + + stage 'Build image' + sh("docker build -t ${imageTag} .") + +// stage 'Run Go tests ' +// sh("docker run ${imageTag} go test") + + stage 'Push image to Quay.io registry' + sh("docker push ${imageTag}") + + stage "Deploy Application" + switch (env.BRANCH_NAME) { + case "canary": + // Roll out to canary environment + // Change deployed image in canary to the one we just built + sh("sed -i.bak 's#quay.io/${project}/${appName}:.*\$#${imageTag}#' ./k8s/canary/*.yaml") + sh("kubectl --namespace=${namespace} apply -f k8s/services/") + sh("kubectl --namespace=${namespace} apply -f k8s/canary/") + break + + case "production": + // Roll out to production environment + // Change deployed image in canary to the one we just built + sh("sed -i.bak 's#quay.io/${project}/${appName}:.*\$#${imageTag}#' ./k8s/production/*.yaml") + sh("kubectl --namespace=${namespace} apply -f k8s/services/") + sh("kubectl --namespace=${namespace} apply -f k8s/canary/") + break + + default: + break +} From 3b751e0442d233b3aa69334cb1d3fbe08c58e758 Mon Sep 17 00:00:00 2001 From: Chris Ricci Date: Tue, 9 May 2017 12:21:12 -0400 Subject: [PATCH 11/18] Fixing Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 007c3c2..e60f86c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,4 +41,5 @@ node { default: break + } } From d6ea7d944cb706498b6a6a436efafe06de6edaca Mon Sep 17 00:00:00 2001 From: Chris Ricci Date: Tue, 9 May 2017 12:24:40 -0400 Subject: [PATCH 12/18] Adding Canary --- app/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views.py b/app/views.py index 5603900..c624f40 100644 --- a/app/views.py +++ b/app/views.py @@ -5,4 +5,4 @@ @app.route('/index') def index(): timestamp = str(datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')) - return timestamp + " Hello, World!\n" + return timestamp + " Hello, World! - CANARY!!!\n" From 025e8c6366fbbeb20ec206ca306a71e76ef01894 Mon Sep 17 00:00:00 2001 From: Chris Ricci Date: Tue, 9 May 2017 12:43:07 -0400 Subject: [PATCH 13/18] fixed jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e60f86c..1461bd0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,7 +36,7 @@ node { // Change deployed image in canary to the one we just built sh("sed -i.bak 's#quay.io/${project}/${appName}:.*\$#${imageTag}#' ./k8s/production/*.yaml") sh("kubectl --namespace=${namespace} apply -f k8s/services/") - sh("kubectl --namespace=${namespace} apply -f k8s/canary/") + sh("kubectl --namespace=${namespace} apply -f k8s/production/") break default: From 84213b10bc7239e520d65f175623372833d84d4e Mon Sep 17 00:00:00 2001 From: Chris Ricci Date: Tue, 9 May 2017 12:51:09 -0400 Subject: [PATCH 14/18] removing canary --- app/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views.py b/app/views.py index c624f40..5603900 100644 --- a/app/views.py +++ b/app/views.py @@ -5,4 +5,4 @@ @app.route('/index') def index(): timestamp = str(datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')) - return timestamp + " Hello, World! - CANARY!!!\n" + return timestamp + " Hello, World!\n" From 102751c0327a32ad6ef5f7f1993a649b15113233 Mon Sep 17 00:00:00 2001 From: Scott Sumner Date: Tue, 6 Jun 2017 11:32:07 -0600 Subject: [PATCH 15/18] Update changes for demo setup --- Jenkinsfile | 10 +++++----- k8s/canary/python-api.yaml | 6 +++--- k8s/production/python-api.yaml | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1461bd0..931511d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ node { - def project = 'chris_ricci' + def project = 'snsumner75' def appName = 'python_api' def feSvcName = "${appName}" def namespace = 'production' @@ -8,10 +8,10 @@ node { stage 'Printenv' sh("printenv") - + stage 'Login to Quay.io' sh("docker login -u=\"${env.quay_username}\" -p=\"${env.quay_password}\" quay.io") - + stage 'Build image' sh("docker build -t ${imageTag} .") @@ -23,7 +23,7 @@ node { stage "Deploy Application" switch (env.BRANCH_NAME) { - case "canary": + case "canary": // Roll out to canary environment // Change deployed image in canary to the one we just built sh("sed -i.bak 's#quay.io/${project}/${appName}:.*\$#${imageTag}#' ./k8s/canary/*.yaml") @@ -40,6 +40,6 @@ node { break default: - break + break } } diff --git a/k8s/canary/python-api.yaml b/k8s/canary/python-api.yaml index 09158f7..137a941 100644 --- a/k8s/canary/python-api.yaml +++ b/k8s/canary/python-api.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: labels: - app: python-api + app: python-api env: canary name: python-api-canary spec: @@ -14,11 +14,11 @@ spec: env: canary spec: containers: - - image: quay.io/chris_ricci/python_api:v1 + - image: quay.io/snsumner75/python_api:v1 imagePullPolicy: IfNotPresent name: python-api ports: - - containerPort: 5000 + - containerPort: 5000 protocol: TCP resources: {} terminationMessagePath: /dev/termination-log diff --git a/k8s/production/python-api.yaml b/k8s/production/python-api.yaml index cb074a5..07b2483 100644 --- a/k8s/production/python-api.yaml +++ b/k8s/production/python-api.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: labels: - app: python-api + app: python-api env: production name: python-api-production spec: @@ -14,11 +14,11 @@ spec: env: production spec: containers: - - image: quay.io/chris_ricci/python_api:v1 + - image: quay.io/snsumner75/python_api:v1 imagePullPolicy: IfNotPresent name: python-api ports: - - containerPort: 5000 + - containerPort: 5000 protocol: TCP resources: {} terminationMessagePath: /dev/termination-log From 68abd9fe9580b635f2378854ab8ec157519a16bb Mon Sep 17 00:00:00 2001 From: Scott Sumner Date: Tue, 6 Jun 2017 11:35:38 -0600 Subject: [PATCH 16/18] Update changes for demo setup --- Jenkinsfile | 10 +++++----- k8s/canary/python-api.yaml | 6 +++--- k8s/production/python-api.yaml | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1461bd0..931511d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ node { - def project = 'chris_ricci' + def project = 'snsumner75' def appName = 'python_api' def feSvcName = "${appName}" def namespace = 'production' @@ -8,10 +8,10 @@ node { stage 'Printenv' sh("printenv") - + stage 'Login to Quay.io' sh("docker login -u=\"${env.quay_username}\" -p=\"${env.quay_password}\" quay.io") - + stage 'Build image' sh("docker build -t ${imageTag} .") @@ -23,7 +23,7 @@ node { stage "Deploy Application" switch (env.BRANCH_NAME) { - case "canary": + case "canary": // Roll out to canary environment // Change deployed image in canary to the one we just built sh("sed -i.bak 's#quay.io/${project}/${appName}:.*\$#${imageTag}#' ./k8s/canary/*.yaml") @@ -40,6 +40,6 @@ node { break default: - break + break } } diff --git a/k8s/canary/python-api.yaml b/k8s/canary/python-api.yaml index 09158f7..137a941 100644 --- a/k8s/canary/python-api.yaml +++ b/k8s/canary/python-api.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: labels: - app: python-api + app: python-api env: canary name: python-api-canary spec: @@ -14,11 +14,11 @@ spec: env: canary spec: containers: - - image: quay.io/chris_ricci/python_api:v1 + - image: quay.io/snsumner75/python_api:v1 imagePullPolicy: IfNotPresent name: python-api ports: - - containerPort: 5000 + - containerPort: 5000 protocol: TCP resources: {} terminationMessagePath: /dev/termination-log diff --git a/k8s/production/python-api.yaml b/k8s/production/python-api.yaml index cb074a5..07b2483 100644 --- a/k8s/production/python-api.yaml +++ b/k8s/production/python-api.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: labels: - app: python-api + app: python-api env: production name: python-api-production spec: @@ -14,11 +14,11 @@ spec: env: production spec: containers: - - image: quay.io/chris_ricci/python_api:v1 + - image: quay.io/snsumner75/python_api:v1 imagePullPolicy: IfNotPresent name: python-api ports: - - containerPort: 5000 + - containerPort: 5000 protocol: TCP resources: {} terminationMessagePath: /dev/termination-log From e22bd72efbedcd7fd7a3af06dec8182592b6852c Mon Sep 17 00:00:00 2001 From: core Date: Tue, 6 Jun 2017 14:51:26 -0400 Subject: [PATCH 17/18] Adding Canary --- app/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views.py b/app/views.py index 5603900..c624f40 100644 --- a/app/views.py +++ b/app/views.py @@ -5,4 +5,4 @@ @app.route('/index') def index(): timestamp = str(datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')) - return timestamp + " Hello, World!\n" + return timestamp + " Hello, World! - CANARY!!!\n" From c2d8f7a140ad88163c5297a51bcbd2f3f1d2a7f4 Mon Sep 17 00:00:00 2001 From: core Date: Tue, 6 Jun 2017 15:05:40 -0400 Subject: [PATCH 18/18] Reset Demo --- app/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views.py b/app/views.py index c624f40..6063b5c 100644 --- a/app/views.py +++ b/app/views.py @@ -5,4 +5,4 @@ @app.route('/index') def index(): timestamp = str(datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')) - return timestamp + " Hello, World! - CANARY!!!\n" + return timestamp + " Hello, World! - Version 1.0\n"