Skip to content

Fix mysql/maria sample to have a sampleapp and data #612

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Apr 5, 2022
Merged

Fix mysql/maria sample to have a sampleapp and data #612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
451f32b
Fix mysql/maria sample to have a sampleapp and data
weshayutin Mar 24, 2022
290ee68
use todolist app vs. mediawiki
weshayutin Mar 31, 2022
c4d50f5
ensure mariadb uses mysql as the meta name
weshayutin Mar 31, 2022
faecd87
add e2e-app labels
weshayutin Mar 31, 2022
5367125
fix mariadb local storage path
weshayutin Apr 4, 2022
ba2c497
Merge branch 'openshift:master' into fix_mysql_data
weshayutin Apr 5, 2022
566aacf
remove mediawiki pv, it is not used
weshayutin Apr 5, 2022
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
133 changes: 87 additions & 46 deletions tests/e2e/sample-applications/mysql-persistent/mysql-persistent-csi-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ items:
name: mysql-persistent
labels:
app: mysql
- apiVersion: v1
kind: ServiceAccount
metadata:
name: mysql-persistent-sa
namespace: mysql-persistent
labels:
component: mysql-persistent
- apiVersion: v1
kind: PersistentVolumeClaim
metadata:
Expand All @@ -20,14 +27,7 @@ items:
storageClassName: gp2-csi
resources:
requests:
storage: 2Gi
- apiVersion: v1
kind: ServiceAccount
metadata:
name: mysql-persistent-sa
namespace: mysql-persistent
labels:
component: mysql-persistent
storage: 1Gi
- kind: SecurityContextConstraints
apiVersion: security.openshift.io/v1
metadata:
Expand All @@ -47,33 +47,23 @@ items:
users:
- system:admin
- system:serviceaccount:mysql-persistent:mysql-persistent-sa
- apiVersion: v1
kind: Secret
metadata:
name: mysql
namespace: mysql-persistent
labels:
app: mysql
stringData:
database-name: MYSQL_DATABASE
database-password: MYSQL_PASSWORD
database-root-password: MYSQL_ROOT_PASSWORD
database-user: MYSQL_USER
- apiVersion: v1
kind: Service
metadata:
annotations:
template.openshift.io/expose-uri: mysql://{.spec.clusterIP}:{.spec.ports[?(.name=="mysql")].port}
template.openshift.io/expose-uri: mariadb://{.spec.clusterIP}:{.spec.ports[?(.name=="mysql")].port}
name: mysql
namespace: mysql-persistent
labels:
app: mysql
service: mysql
spec:
ports:
- name: mysql
- protocol: TCP
name: mysql
port: 3306
selector:
name: mysql
app: mysql
- apiVersion: apps/v1
kind: Deployment
metadata:
Expand All @@ -97,31 +87,19 @@ items:
spec:
serviceAccountName: mysql-persistent-sa
containers:
- image: registry.redhat.io/rhel8/mysql-80:latest
name: mysql
- image: registry.redhat.io/rhel8/mariadb-105:latest
name: mysql
securityContext:
privileged: true
env:
- name: MYSQL_USER
valueFrom:
secretKeyRef:
key: database-user
name: mysql
- name: MYSQL_PASSWORD
valueFrom:
secretKeyRef:
key: database-password
name: mysql
- name: MYSQL_ROOT_PASSWORD
valueFrom:
secretKeyRef:
key: database-root-password
name: mysql
- name: MYSQL_DATABASE
valueFrom:
secretKeyRef:
key: database-name
name: mysql
- name: MYSQL_USER
value: changeme
- name: MYSQL_PASSWORD
value: changeme
- name: MYSQL_ROOT_PASSWORD
value: root
- name: MYSQL_DATABASE
value: todolist
ports:
- containerPort: 3306
name: mysql
Expand All @@ -134,4 +112,67 @@ items:
volumes:
- name: mysql-data
persistentVolumeClaim:
claimName: mysql
claimName: mysql
- apiVersion: v1
kind: Service
metadata:
name: todolist
namespace: mysql-persistent
labels:
app: todolist
service: todolist
e2e-app: "true"
spec:
ports:
- name: web
port: 8000
targetPort: 8000
selector:
app: todolist
service: todolist
- apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
name: todolist
namespace: mysql-persistent
labels:
app: todolist
service: todolist
e2e-app: "true"
spec:
replicas: 1
selector:
app: todolist
service: todolist
strategy:
type: Recreate
template:
metadata:
labels:
app: todolist
service: todolist
e2e-app: "true"
spec:
containers:
- name: todolist
image: quay.io/rhn_engineering_whayutin/todolist-mariadb-go:latest
env:
- name: foo
value: bar
ports:
- containerPort: 8000
protocol: TCP
initContainers:
- name: init-myservice
image: registry.access.redhat.com/ubi8/ubi:latest
command: ['sh', '-c', 'sleep 10; until getent hosts mysql; do echo waiting for mysql; sleep 5; done;']
- apiVersion: route.openshift.io/v1
kind: Route
metadata:
name: todolist-route
namespace: mysql-persistent
spec:
path: "/"
to:
kind: Service
name: todolist
119 changes: 80 additions & 39 deletions tests/e2e/sample-applications/mysql-persistent/mysql-persistent-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ items:
- ReadWriteOnce
resources:
requests:
storage: 2Gi
storage: 1Gi
- kind: SecurityContextConstraints
apiVersion: security.openshift.io/v1
metadata:
Expand All @@ -46,33 +46,23 @@ items:
users:
- system:admin
- system:serviceaccount:mysql-persistent:mysql-persistent-sa
- apiVersion: v1
kind: Secret
metadata:
name: mysql
namespace: mysql-persistent
labels:
app: mysql
stringData:
database-name: MYSQL_DATABASE
database-password: MYSQL_PASSWORD
database-root-password: MYSQL_ROOT_PASSWORD
database-user: MYSQL_USER
- apiVersion: v1
kind: Service
metadata:
annotations:
template.openshift.io/expose-uri: mysql://{.spec.clusterIP}:{.spec.ports[?(.name=="mysql")].port}
template.openshift.io/expose-uri: mariadb://{.spec.clusterIP}:{.spec.ports[?(.name=="mysql")].port}
name: mysql
namespace: mysql-persistent
labels:
app: mysql
service: mysql
spec:
ports:
- name: mysql
- protocol: TCP
name: mysql
port: 3306
selector:
name: mysql
app: mysql
- apiVersion: apps/v1
kind: Deployment
metadata:
Expand All @@ -96,31 +86,19 @@ items:
spec:
serviceAccountName: mysql-persistent-sa
containers:
- image: registry.redhat.io/rhel8/mysql-80:latest
name: mysql
- image: registry.redhat.io/rhel8/mariadb-105:latest
name: mysql
securityContext:
privileged: true
env:
- name: MYSQL_USER
valueFrom:
secretKeyRef:
key: database-user
name: mysql
- name: MYSQL_PASSWORD
valueFrom:
secretKeyRef:
key: database-password
name: mysql
- name: MYSQL_ROOT_PASSWORD
valueFrom:
secretKeyRef:
key: database-root-password
name: mysql
- name: MYSQL_DATABASE
valueFrom:
secretKeyRef:
key: database-name
name: mysql
- name: MYSQL_USER
value: changeme
- name: MYSQL_PASSWORD
value: changeme
- name: MYSQL_ROOT_PASSWORD
value: root
- name: MYSQL_DATABASE
value: todolist
ports:
- containerPort: 3306
name: mysql
Expand All @@ -133,4 +111,67 @@ items:
volumes:
- name: mysql-data
persistentVolumeClaim:
claimName: mysql
claimName: mysql
- apiVersion: v1
kind: Service
metadata:
name: todolist
namespace: mysql-persistent
labels:
app: todolist
service: todolist
e2e-app: "true"
spec:
ports:
- name: web
port: 8000
targetPort: 8000
selector:
app: todolist
service: todolist
- apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
name: todolist
namespace: mysql-persistent
labels:
app: todolist
service: todolist
e2e-app: "true"
spec:
replicas: 1
selector:
app: todolist
service: todolist
strategy:
type: Recreate
template:
metadata:
labels:
app: todolist
service: todolist
e2e-app: "true"
spec:
containers:
- name: todolist
image: quay.io/rhn_engineering_whayutin/todolist-mariadb-go:latest
env:
- name: foo
value: bar
ports:
- containerPort: 8000
protocol: TCP
initContainers:
- name: init-myservice
image: registry.access.redhat.com/ubi8/ubi:latest
command: ['sh', '-c', 'sleep 10; until getent hosts mysql; do echo waiting for mysql; sleep 5; done;']
- apiVersion: route.openshift.io/v1
kind: Route
metadata:
name: todolist-route
namespace: mysql-persistent
spec:
path: "/"
to:
kind: Service
name: todolist