Skip to content

replacing mssql with multi-arch mysql #595

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 1 commit into from
Mar 15, 2022
Merged

replacing mssql with multi-arch mysql #595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 17 additions & 17 deletions tests/e2e/backup_restore_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,16 @@ var _ = Describe("AWS backup restore tests", func() {
Eventually(IsDCReady(ocClient, "parks-app", "restify"), timeoutMultiplier*time.Minute*10, time.Second*10).Should(BeTrue())
return nil
})
mssqlReady := VerificationFunction(func(ocClient client.Client, namespace string) error {
mysqlReady := VerificationFunction(func(ocClient client.Client, namespace string) error {
// This test confirms that SCC restore logic in our plugin is working
Eventually(IsDCReady(ocClient, "mssql-persistent", "mssql-deployment"), timeoutMultiplier*time.Minute*10, time.Second*10).Should(BeTrue())
Eventually(IsDeploymentReady(ocClient, "mssql-persistent", "mssql-app-deployment"), timeoutMultiplier*time.Minute*10, time.Second*10).Should(BeTrue())
exists, err := DoesSCCExist(ocClient, "mssql-persistent-scc")
//Eventually(IsDCReady(ocClient, "mssql-persistent", "mysql"), timeoutMultiplier*time.Minute*10, time.Second*10).Should(BeTrue())
Eventually(IsDeploymentReady(ocClient, "mysql-persistent", "mysql"), timeoutMultiplier*time.Minute*10, time.Second*10).Should(BeTrue())
exists, err := DoesSCCExist(ocClient, "mysql-persistent-scc")
if err != nil {
return err
}
if !exists {
return errors.New("did not find MSSQL scc")
return errors.New("did not find MYSQL scc")
}
return nil
})
Expand Down Expand Up @@ -168,13 +168,13 @@ var _ = Describe("AWS backup restore tests", func() {
}

},
Entry("MSSQL application CSI", Label("aws"), BackupRestoreCase{
ApplicationTemplate: "./sample-applications/mssql-persistent/mssql-persistent-csi-template.yaml",
ApplicationNamespace: "mssql-persistent",
Name: "mssql-e2e",
Entry("MySQL application CSI", Label("aws"), BackupRestoreCase{
ApplicationTemplate: "./sample-applications/mysql-persistent/mysql-persistent-csi-template.yaml",
ApplicationNamespace: "mysql-persistent",
Name: "mysql-e2e",
BackupRestoreType: CSI,
PreBackupVerify: mssqlReady,
PostRestoreVerify: mssqlReady,
PreBackupVerify: mysqlReady,
PostRestoreVerify: mysqlReady,
}, nil),
Entry("Parks application <4.8.0", BackupRestoreCase{
ApplicationTemplate: "./sample-applications/parks-app/manifest.yaml",
Expand All @@ -185,13 +185,13 @@ var _ = Describe("AWS backup restore tests", func() {
PostRestoreVerify: parksAppReady,
MaxK8SVersion: &K8sVersionOcp47,
}, nil),
Entry("MSSQL application", BackupRestoreCase{
ApplicationTemplate: "./sample-applications/mssql-persistent/mssql-persistent-template.yaml",
ApplicationNamespace: "mssql-persistent",
Name: "mssql-e2e",
Entry("MySQL application", BackupRestoreCase{
ApplicationTemplate: "./sample-applications/mysql-persistent/mysql-persistent-template.yaml",
ApplicationNamespace: "mysql-persistent",
Name: "mysql-e2e",
BackupRestoreType: RESTIC,
PreBackupVerify: mssqlReady,
PostRestoreVerify: mssqlReady,
PreBackupVerify: mysqlReady,
PostRestoreVerify: mysqlReady,
}, nil),
Entry("Parks application >=4.8.0", BackupRestoreCase{
ApplicationTemplate: "./sample-applications/parks-app/manifest4.8.yaml",
Expand Down
1 change: 1 addition & 0 deletions tests/e2e/sample-applications/mssql-persistent/mssql-persistent-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ items:
resources:
requests:
storage: 10Gi
storageClassName: gp2
- kind: SecurityContextConstraints
apiVersion: security.openshift.io/v1
metadata:
Expand Down
137 changes: 137 additions & 0 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
@@ -0,0 +1,137 @@
apiVersion: v1
kind: List
items:
- kind: Namespace
apiVersion: v1
metadata:
name: mysql-persistent
labels:
app: mysql
- apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: mysql
namespace: mysql-persistent
labels:
app: mysql
spec:
accessModes:
- ReadWriteOnce
storageClassName: gp2-csi
resources:
requests:
storage: 2Gi
- apiVersion: v1
kind: ServiceAccount
metadata:
name: mysql-persistent-sa
namespace: mysql-persistent
labels:
component: mysql-persistent
- kind: SecurityContextConstraints
apiVersion: security.openshift.io/v1
metadata:
name: mysql-persistent-scc
allowPrivilegeEscalation: true
allowPrivilegedContainer: true
runAsUser:
type: RunAsAny
seLinuxContext:
type: RunAsAny
fsGroup:
type: RunAsAny
supplementalGroups:
type: RunAsAny
volumes:
- '*'
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}
name: mysql
namespace: mysql-persistent
labels:
app: mysql
spec:
ports:
- name: mysql
port: 3306
selector:
name: mysql
- apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
template.alpha.openshift.io/wait-for-ready: 'true'
name: mysql
namespace: mysql-persistent
labels:
e2e-app: "true"
spec:
selector:
matchLabels:
app: mysql
strategy:
type: Recreate
template:
metadata:
labels:
e2e-app: "true"
app: mysql
spec:
serviceAccountName: mysql-persistent-sa
containers:
- image: registry.redhat.io/rhel8/mysql-80: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
ports:
- containerPort: 3306
name: mysql
resources:
limits:
memory: 512Mi
volumeMounts:
- name: mysql-data
mountPath: /var/lib/mysql
volumes:
- name: mysql-data
persistentVolumeClaim:
claimName: mysql
137 changes: 137 additions & 0 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
@@ -0,0 +1,137 @@
apiVersion: v1
kind: List
items:
- kind: Namespace
apiVersion: v1
metadata:
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:
name: mysql
namespace: mysql-persistent
labels:
app: mysql
spec:
accessModes:
- ReadWriteOnce
storageClassName: gp2
resources:
requests:
storage: 2Gi
- kind: SecurityContextConstraints
apiVersion: security.openshift.io/v1
metadata:
name: mysql-persistent-scc
allowPrivilegeEscalation: true
allowPrivilegedContainer: true
runAsUser:
type: RunAsAny
seLinuxContext:
type: RunAsAny
fsGroup:
type: RunAsAny
supplementalGroups:
type: RunAsAny
volumes:
- '*'
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}
name: mysql
namespace: mysql-persistent
labels:
app: mysql
spec:
ports:
- name: mysql
port: 3306
selector:
name: mysql
- apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
template.alpha.openshift.io/wait-for-ready: 'true'
name: mysql
namespace: mysql-persistent
labels:
e2e-app: "true"
spec:
selector:
matchLabels:
app: mysql
strategy:
type: Recreate
template:
metadata:
labels:
e2e-app: "true"
app: mysql
spec:
serviceAccountName: mysql-persistent-sa
containers:
- image: registry.redhat.io/rhel8/mysql-80: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
ports:
- containerPort: 3306
name: mysql
resources:
limits:
memory: 512Mi
volumeMounts:
- name: mysql-data
mountPath: /var/lib/mysql
volumes:
- name: mysql-data
persistentVolumeClaim:
claimName: mysql