Skip to content

Commit 14695b1

Browse files
pattyhairpattyhair
authored
Merge pull request #43 from chpock/kkushnir-examples-10.2
Update CBCD examples for 10.2 release
2 parents c072394 + 6cd42b0 commit 14695b1

File tree

2 files changed

+75
-87
lines changed

2 files changed

+75
-87
lines changed

‎cloudbees-cd/kubernetes/cloudbees-cd-demo.yaml‎

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
demoMode: true
1+
clusteredMode: false
22

33
##---------------------------------------------
44
## Flow storage configuration section
@@ -9,7 +9,7 @@ storage:
99
serverPlugins:
1010
accessMode: ReadWriteOnce
1111
# Storage class for plugins directory. Currently it has to be shared across server and web replicas.
12-
# Server and web are co-located using hard affinity rule for demoMode. StorageClass is null here to ensure the same behavior across all cloud providers
12+
# Server and web are co-located using hard affinity rule for non clusteredMode. StorageClass is null here to ensure the same behavior across all cloud providers
1313
# (it forces storage class to fall back to "default" disk based ReadWriteOnce platform specific storage class)
1414
storageClass: null
1515
storage: 5Gi
@@ -27,40 +27,24 @@ server:
2727
requests:
2828
cpu: 0.5
2929

30-
# No zookeeper for demo mode
31-
zookeeper:
32-
enabled: false
33-
34-
# clusteredMode has to be false to be able to use mariadb
35-
clusteredMode: false
36-
3730
# Install mariadb chart for demo mode
3831
# and create a database and user for Flow to use.
3932
# Note that the database user name and password
40-
# specified in the `mariadb.db.user` and `mariadb.rootUser.password` value must
33+
# specified in the `initdbScripts` section must
4134
# match the values in the `database` section below.
4235

4336
mariadb:
44-
enabled: true
45-
fullnameOverride: mariadb
46-
replication:
47-
enabled: false
48-
securityContext:
49-
enabled: true
50-
volumePermissions:
51-
enabled: true
37+
enabled: true
5238
db:
5339
user: "flow"
54-
rootUser:
55-
password: "flow_pass"
5640

5741
database:
5842
dbName: "demo"
5943
dbUser: "flow"
60-
dbPassword: "flow_pass"
6144
dbType: "mariadb"
6245
dbPort: 3306
6346
clusterEndpoint: "mariadb"
47+
# externalEndpoint: ""
6448

6549
##---------------------------------------------
6650
## Flow server admin credentials section
@@ -78,5 +62,5 @@ flowCredentials:
7862
##
7963
## IMPORTANT: This is clearly not meant for production use and is only meant for demo environments
8064
## where security may not be a concern. Use of `existingSecret` is preferred.
81-
adminPassword: changeme
65+
adminPassword:
8266

‎cloudbees-cd/kubernetes/cloudbees-cd-prod.yaml‎

Lines changed: 69 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,69 @@
1-
##---------------------------------------------
2-
## Database configuration section
3-
##---------------------------------------------
4-
database:
5-
## 1. The database to use for CloudBees Flow installation.
6-
## The following database types are supported with Flow in a production environment:
7-
## mysql, oracle, or sqlserver
8-
##
9-
## The database type must be specified.
10-
dbType:
11-
12-
## 2. The name of the database to use with CloudBees Flow installation.
13-
##
14-
## The database name must be specified.
15-
dbName:
16-
17-
## 3. Name of the secret containing the database user credentials.
18-
## The data field must contain base64 encoded values for keys 'DB_USER' and 'DB_PASSWORD'.
19-
## E.g., kubectl create secret generic flow-db-secret --from-literal=DB_USER=flow_user --from-literal=DB_PASSWORD='S!*d$z5Dsb'
20-
##
21-
## Set the name of the secret that contains the database user credentials.
22-
existingSecret: flow-db-secret
23-
24-
## 4.(a) Database hostname if the database instance is running outside the cluster
25-
##
26-
## Either the database hostname (externalEndpoint) or the database service name (clusterEndpoint) must be specified.
27-
##
28-
## Uncomment the following line to set the database hostname.
29-
# externalEndpoint: flowdb.example.com
30-
31-
## 4.(b) Database service name if the database instance is running within the cluster. Use the service DNS name if
32-
## the database service is running in a different namespace in the cluster, e.g., my-sql-db-mysql.default.svc.cluster.local
33-
##
34-
## Either the database hostname (externalEndpoint) or the database service name (clusterEndpoint) must be specified.
35-
##
36-
## Uncomment the following line to set the database service name.
37-
# clusterEndpoint: flow-db-mysql
38-
39-
## 5. The database port to use.
40-
##
41-
## The database port must be specified.
42-
dbPort:
43-
44-
##---------------------------------------------
45-
## Flow storage configuration section
46-
##---------------------------------------------
47-
storage:
48-
volumes:
49-
serverPlugins:
50-
## A ReadWriteMany storage class used for plugins directory.
51-
## It is shared across all the Flow server and the web server
52-
## replicas.
53-
storageClass: your-readwritemany-storage-class
54-
55-
##---------------------------------------------
56-
## Flow server admin credentials section
57-
##---------------------------------------------
58-
59-
flowCredentials:
60-
## Name of the secret containing the admin user password to use.
61-
## The data field must contain base64 encoded value for key 'CBF_SERVER_ADMIN_PASSWORD'.
62-
## E.g., kubectl create secret generic your-flow-admin-secret --from-literal=CBF_SERVER_ADMIN_PASSWORD='rrx!*d$z75Dsb'
63-
##
64-
## Set the name of the secret that contains the admin user password.
65-
existingSecret: your-flow-admin-secret
1+
##---------------------------------------------
2+
## Database configuration section
3+
##---------------------------------------------
4+
database:
5+
## 1. The database to use for CloudBees Flow installation.
6+
## The following database types are supported with Flow in a production environment:
7+
## mysql, oracle, or sqlserver
8+
##
9+
## The database type must be specified.
10+
dbType:
11+
12+
## 2. The name of the database to use with CloudBees Flow installation.
13+
##
14+
## The database name must be specified.
15+
dbName:
16+
17+
## 3. Name of the secret containing the database user credentials.
18+
## The data field must contain base64 encoded values for keys 'DB_USER' and 'DB_PASSWORD'.
19+
## E.g., kubectl create secret generic flow-db-secret --from-literal=DB_USER=flow_user --from-literal=DB_PASSWORD='S!*d$z5Dsb'
20+
##
21+
## Set the name of the secret that contains the database user credentials.
22+
existingSecret: flow-db-secret
23+
24+
## 4.(a) Database hostname if the database instance is running outside the cluster
25+
##
26+
## Either the database hostname (externalEndpoint) or the database service name (clusterEndpoint) must be specified.
27+
##
28+
## Uncomment the following line to set the database hostname.
29+
# externalEndpoint: flowdb.example.com
30+
31+
## 4.(b) Database service name if the database instance is running within the cluster. Use the service DNS name if
32+
## the database service is running in a different namespace in the cluster, e.g., my-sql-db-mysql.default.svc.cluster.local
33+
##
34+
## Either the database hostname (externalEndpoint) or the database service name (clusterEndpoint) must be specified.
35+
##
36+
## Uncomment the following line to set the database service name.
37+
# clusterEndpoint: flow-db-mysql
38+
39+
## 5. The database port to use.
40+
##
41+
## The database port must be specified.
42+
dbPort:
43+
44+
# External Mysql Connector URL to download during cloudbees flow installation
45+
mysqlConnector:
46+
externalUrl:
47+
48+
##---------------------------------------------
49+
## Flow storage configuration section
50+
##---------------------------------------------
51+
storage:
52+
volumes:
53+
serverPlugins:
54+
## A ReadWriteMany storage class used for plugins directory.
55+
## It is shared across all the Flow server and the web server
56+
## replicas.
57+
storageClass: your-readwritemany-storage-class
58+
59+
##---------------------------------------------
60+
## Flow server admin credentials section
61+
##---------------------------------------------
62+
63+
flowCredentials:
64+
## Name of the secret containing the admin user password to use.
65+
## The data field must contain base64 encoded value for key 'CBF_SERVER_ADMIN_PASSWORD'.
66+
## E.g., kubectl create secret generic your-flow-admin-secret --from-literal=CBF_SERVER_ADMIN_PASSWORD='rrx!*d$z75Dsb'
67+
##
68+
## Set the name of the secret that contains the admin user password.
69+
existingSecret: your-flow-admin-secret

0 commit comments

Comments
 (0)