Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sample project #13

Open
wants to merge 139 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
139 commits
Select commit Hold shift + click to select a range
21fe245
Added Bookstore
Jul 27, 2018
d2bba8a
Rectified the Jenkinsfile.unix
Jul 27, 2018
d52d5ce
Added Bookstore TestSuite Project
Jul 27, 2018
ea6affb
Removed FibonachiTest
Jul 27, 2018
15d7d98
got rid of spurious comment
Jul 27, 2018
13d2ca0
moved package to correct place
Jul 27, 2018
40be6ad
use ci-is image
Aug 17, 2018
23ff9e5
add image pull secret
Aug 18, 2018
8471194
wait for is to be ready before starting build
Aug 20, 2018
1c14391
include paths
Aug 20, 2018
9944576
make pull IS image always (will remove when stable)
Aug 20, 2018
89c741c
changed version of ci-is
Aug 21, 2018
3268f0e
changed version of ci-is
Aug 21, 2018
85fe7bf
change tag of image
Aug 21, 2018
bf0fcde
add stage Image
Aug 21, 2018
e90fd49
add stage Image
Aug 21, 2018
e5df5a3
build docker image
Aug 21, 2018
62995bc
build docker image
Aug 21, 2018
15f1d91
build docker image
Aug 21, 2018
4fe6798
build docker image
Aug 21, 2018
c055238
fix chown
Aug 21, 2018
24fadf9
forgot checksums
Aug 21, 2018
293e54f
added login
Aug 21, 2018
13bfe6b
converted project into deploy project
Aug 21, 2018
a32a2ca
first commit of deploy code
Aug 23, 2018
7068b6e
delete then install
Aug 23, 2018
bd40f8f
name for install
Ianmward Sep 2, 2018
93eccec
no delete
Ianmward Sep 2, 2018
4d4964c
wrong comment char
Ianmward Sep 2, 2018
176e0d0
v2
Ianmward Sep 2, 2018
25ddaa0
v3 with REST Descriptor
Sep 3, 2018
f74e6a1
added curl to create APi in API Gatweway
Sep 4, 2018
1ec82ce
move credentials to Kubernetes secret apigateway-cred
Sep 4, 2018
954e5a7
change quotes
Sep 4, 2018
2422889
rebuild helm image with curl
Sep 4, 2018
e74c435
add image pull secrets
Sep 4, 2018
b989b12
update helm image
Sep 4, 2018
58a234f
helm upgrade not update
Sep 4, 2018
abeb1a8
https and use runtime
Sep 4, 2018
f1a8755
10.2 has different api path
Sep 4, 2018
d1a92f6
capture API_ID
Sep 4, 2018
82ef5e9
capture API_ID
Sep 4, 2018
6cb9c62
capture API_ID
Sep 4, 2018
2f1c7f5
capture API_ID
Sep 4, 2018
5b4585f
test
Sep 4, 2018
da8ef64
test
Sep 4, 2018
58431b0
test
Sep 4, 2018
619e04f
test
Sep 4, 2018
5c15e1e
test
Sep 4, 2018
a5847a5
test
Sep 4, 2018
f0e46f5
test
Sep 4, 2018
58b3ea6
test
Sep 4, 2018
7bc9a3e
test
Sep 4, 2018
3e60f4e
test
Sep 4, 2018
ea13d4a
test
Sep 4, 2018
7771340
test
Sep 4, 2018
34d829e
test
Sep 4, 2018
53d7f4c
test
Sep 4, 2018
2c3301f
test
Sep 4, 2018
5ec0136
deploy bookstore API
Sep 4, 2018
48bf09c
update tag for new release
Ianmward Oct 2, 2018
888f116
Update Jenkinsfile
Ianmward Sep 21, 2019
6fb21b1
Update values.yaml
Ianmward Sep 21, 2019
452d6cb
Update Jenkinsfile
Ianmward Sep 21, 2019
4aec8f1
Update Jenkinsfile
Ianmward Sep 21, 2019
d302c72
Update Jenkinsfile
Ianmward Sep 21, 2019
d048fa0
update
Ianmward Sep 22, 2019
72bae06
Update bookstore.swagger
Ianmward Sep 22, 2019
e0153c5
Merge branch 'master' of github.com:Ianmward/wmd-bookstore
Ianmward Sep 22, 2019
6b8eda6
Update Jenkinsfile
Ianmward Sep 23, 2019
cac2cfc
updated image tag and helm timeout
Ianmward Nov 11, 2019
5e3d247
fixed merge conflict
Ianmward Nov 11, 2019
ad9a0f0
update image tag
Ianmward Nov 12, 2019
6f63f93
change lieveliness and readiness probes:
Ianmward Nov 12, 2019
777bf78
force install
Ianmward Nov 12, 2019
ae7f80e
use new msr base
Ianmward Nov 12, 2019
0256c1c
updated image tag
Ianmward Feb 17, 2020
f683baa
api now http
Ianmward Feb 17, 2020
6119207
Ian
Ianmward Feb 17, 2020
5e63be3
more data
Ianmward Feb 17, 2020
ea1fff1
back
Ianmward Feb 17, 2020
d2d87b2
added new test case
Ianmward Feb 17, 2020
3d44b3b
updated build
Ianmward Feb 18, 2020
1b4ed2f
fix api gateway url
Ianmward Feb 18, 2020
0748c83
use development namespace
Ianmward Feb 19, 2020
eaf383c
namespace
Ianmward Feb 19, 2020
7cee691
try quotes
Ianmward Feb 19, 2020
8a03b7c
Merge ; commit 'eaf383c5477dc9243f3c4b008c187743db15e93e'
Ianmward Feb 19, 2020
cf8f2b0
development
Ianmward Feb 20, 2020
0685cc8
Merge branch 'master' of github.com:Ianmward/wmd-bookstore
Ianmward Feb 20, 2020
3160583
tag with space
Ianmward Feb 20, 2020
c9a2146
helm bvers
Ianmward Feb 20, 2020
90b7d8f
v 2.10.2
Ianmward Feb 20, 2020
35537c3
3.1.0
Ianmward Feb 20, 2020
222a36d
change in timeout format
Ianmward Feb 20, 2020
f415932
new helm image
Ianmward Feb 20, 2020
926844a
Eric
Ianmward Feb 21, 2020
cde1b22
built with 10.5 ci-is builder
Ianmward Mar 9, 2020
12c1d85
new version based on msr with cloudstreams and jdbc adapter
Ianmward Mar 10, 2020
27cdf06
update for demo
Ianmward Nov 22, 2020
7e89747
updare version of helm image
Ianmward Nov 22, 2020
668db1d
wrong image tag
Ianmward Nov 22, 2020
8d5d5a9
use default namespace
Ianmward Nov 22, 2020
a424704
Specify serviceAccount for pod
Ianmward Nov 23, 2020
22c666a
use k8s-helm serviceAccount
Ianmward Nov 23, 2020
84211b7
update version of manifest type Deployment
Ianmward Nov 23, 2020
487c64c
use updated helm image
Ianmward Nov 23, 2020
e65e4ba
try recreate instead of force on helm upgrade
Ianmward Nov 23, 2020
58bb84b
no wait
Ianmward Nov 23, 2020
100b8e1
use helm 3.1.3
Ianmward Nov 23, 2020
ec6b979
add curl
Ianmward Nov 23, 2020
3aad538
use local api-gateway service to deploy swagger
Ianmward Nov 23, 2020
9f147c1
try https
Ianmward Nov 23, 2020
b28ea62
default namespace
Ianmward Nov 23, 2020
720fe0b
new version without SimpleDateFormat
Ianmward Nov 23, 2020
021fb31
added msr label
Ianmward Nov 23, 2020
b75333f
update to version 1e87822
Ianmward Nov 24, 2020
d559707
Set up CI with Azure Pipelines
Ianmward Mar 25, 2021
dbec665
Update azure-pipelines.yml for Azure Pipelines
Ianmward Mar 25, 2021
dd29b50
Update azure-pipelines.yml for Azure Pipelines
Ianmward Mar 25, 2021
2ec4fd9
added prometheus annotations
Ianmward Mar 25, 2021
000217a
Update Jenkinsfile
Nov 15, 2021
8cbf6b6
Update image tag
Nov 15, 2021
2cf1c32
fix typo
Nov 15, 2021
ada91d9
Updates
Nov 15, 2021
96f5785
Update Jenkinsfile
Ianmward Nov 16, 2021
85d40d7
Update Jenkinsfile
Ianmward Nov 16, 2021
9565598
Update Jenkinsfile
Ianmward Nov 17, 2021
29cf934
Update Jenkinsfile
Ianmward Nov 17, 2021
40ce26f
Add configmap for application.properties
Ianmward Nov 17, 2021
837b203
Merge branch 'master' of github.com:Ianmward/wmd-bookstore
Ianmward Nov 17, 2021
185d7cb
fixed
Ianmward Nov 17, 2021
4c24d80
duplicate volumeMounts
Ianmward Nov 17, 2021
a8a66c3
fixed config map
Ianmward Nov 17, 2021
cd70ba2
add common jdbc pool details
Ianmward Nov 18, 2021
d5f4dba
Update Jenkinsfile
Ianmward Nov 18, 2021
79c3814
Update Jenkinsfile
Ianmward Nov 18, 2021
c43bba1
Update Jenkinsfile
Ianmward Nov 18, 2021
d625469
Update deployment.yaml
Ianmward Nov 18, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>wmd-bookstore</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
37 changes: 37 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
podTemplate(
label: 'mypod',
inheritFrom: 'default',
serviceAccount: 'k8s-helm',
containers: [
containerTemplate(
name: 'helm',
image: 'ianmward/k8s-helm:80ff3d2',
ttyEnabled: true,
command: 'cat'
)
],
envVars: [
secretEnvVar(key: 'API_GATEWAY_USR', secretName: 'apigateway-cred', secretKey: 'username'),
secretEnvVar(key: 'API_GATEWAY_PSW', secretName: 'apigateway-cred', secretKey: 'password'),
],
imagePullSecrets: [ 'regcred' ]
) {
node('mypod') {
def commitId
stage ('Extract') {
checkout scm
commitId = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
}
stage ('Deploy') {
container ('helm') {
def registry = "harbor.eks.au-poc.com/library"
def repository = "${registry}/bookstore"
def tag = "795bd64"
sh "helm list"
sh "helm upgrade --install --force --timeout=10m0s --set image.repository=${repository},image.tag=${tag} -n development softwareag-bookstore softwareag-bookstore"
def API_ID = sh ( script: "curl -u Administrator:manage -X POST 'https://api-gateway.eks.au-poc.com/rest/apigateway/apis' -H 'accept: application/json' -H 'Content-Type: multipart/form-data' -F '[email protected]' -F 'apiName=Bookstore' -F 'apiDescription=Bookstore API' -F 'apiVersion=V3' -F 'type=swagger' | jq -r '.apiResponse.api.id'",returnStdout:true).trim()
sh "curl -u ${API_GATEWAY_USR}:${API_GATEWAY_PSW} -X PUT 'https://api-gateway.eks.au-poc.com/rest/apigateway/apis/'${API_ID}'/activate' -H 'accept: application/json' -H 'Content-Type: multipart/form-data'"
}
}
}
}
42 changes: 0 additions & 42 deletions Jenkinsfile.unix

This file was deleted.

42 changes: 0 additions & 42 deletions Jenkinsfile.win

This file was deleted.

201 changes: 0 additions & 201 deletions LICENSE

This file was deleted.

18 changes: 0 additions & 18 deletions README.md

This file was deleted.

7 changes: 7 additions & 0 deletions additional-scrape-configs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
apiVersion: v1
data:
prometheus.yml: LSBqb2JfbmFtZTogJ2Jvb2tzdG9yZScKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6IFsnc29mdHdhcmVhZy1ib29rc3RvcmU6NTU1NSddCi0gam9iX25hbWU6ICdtaWNyb2dhdGV3YXknCiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOiBbJ3NvZnR3YXJlYWctbWljcm9nYXRld2F5OjQ0ODUnXQo=
kind: Secret
metadata:
creationTimestamp: null
name: additional-scrape-configs
Loading