testing port numbers.

UtrechtUniversity · Jun 24, 2024 · ea68a2a · ea68a2a
1 parent 4f0873a
commit ea68a2a
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 26 deletions.
diff --git a/openshift/sample/1_mariadb-secret.yaml → openshift/config/01_mariadb-secret.yaml b/openshift/sample/1_mariadb-secret.yaml → openshift/config/01_mariadb-secret.yaml
@@ -7,5 +7,5 @@ type: Opaque
 data:
   # Use the following command to generate a random password:
   # echo -n 'ChangeThisSuperSecretPassword' | base64
-  mariadb-root-password: c2VjcmV0
-  mariadb-password: c2VjcmV0
+  mariadb-root-password: <mariadb-root-password>
+  mariadb-password: <mariadb-password>
diff --git a/openshift/sample/2_mariadb-cm.yaml → openshift/config/02_mariadb-cm.yaml b/openshift/sample/2_mariadb-cm.yaml → openshift/config/02_mariadb-cm.yaml
@@ -4,5 +4,5 @@ kind: ConfigMap
 metadata:
   name: mariadb-config
 data:
-  mariadb-database: development
-  mariadb-user: development
+  mariadb-database: sample-database
+  mariadb-user: sample-database-user
diff --git a/openshift/sample/3_mariadb-statefulset.yaml → openshift/config/03_mariadb-statefulset.yaml b/openshift/sample/3_mariadb-statefulset.yaml → openshift/config/03_mariadb-statefulset.yaml
diff --git a/openshift/sample/4_mariadb-svc.yaml → openshift/config/04_mariadb-svc.yaml b/openshift/sample/4_mariadb-svc.yaml → openshift/config/04_mariadb-svc.yaml
diff --git a/openshift/config/05_sample-app-cm.yaml b/openshift/config/05_sample-app-cm.yaml
@@ -0,0 +1,10 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: sample-config
+data:
+  database-type: mysql
+  database-host: mariadb-sample
+  database-port-number: '3306'
+  database-name: sample-database
diff --git a/openshift/sample/6_sample-app.yaml → openshift/config/06_sample-app.yaml b/openshift/sample/6_sample-app.yaml → openshift/config/06_sample-app.yaml
@@ -41,11 +41,6 @@ spec:
                 configMapKeyRef:
                   name: sample-config
                   key: database-name
-#            - name: LARAVEL_STORAGE_PATH
-#              valueFrom:
-#                configMapKeyRef:
-#                  name: sample-config
-#                  key: laravel-storage
             - name: LARAVEL_DATABASE_USER
               valueFrom:
                 configMapKeyRef:

diff --git a/openshift/sample/7_sample-svc.yaml → openshift/config/07_sample-svc.yaml b/openshift/sample/7_sample-svc.yaml → openshift/config/07_sample-svc.yaml
diff --git a/openshift/sample/8_nginx.yaml → openshift/config/08_nginx.yaml b/openshift/sample/8_nginx.yaml → openshift/config/08_nginx.yaml
diff --git a/openshift/sample/9_nginx-svc.yaml → openshift/config/09_nginx-svc.yaml b/openshift/sample/9_nginx-svc.yaml → openshift/config/09_nginx-svc.yaml
diff --git a/openshift/sample/ZZ_sample-ingress.yaml → openshift/config/10_sample-ingress.yaml b/openshift/sample/ZZ_sample-ingress.yaml → openshift/config/10_sample-ingress.yaml
diff --git a/openshift/sample/5_sample-app-cm.yaml b/openshift/sample/5_sample-app-cm.yaml
diff --git a/openshift/scripts/sample-app.sh b/openshift/scripts/sample-app.sh
@@ -9,7 +9,7 @@
 
 # Function to create the list of resource yamls
 create_app() {
-    search_dir=../sample
+    search_dir=../config
     for entry in "$search_dir"/*
     do
       echo "$entry"
@@ -19,11 +19,11 @@ create_app() {
 
 # Function to create the list of resource yamls
 delete_app() {
-    search_dir=../sample
+    search_dir=../config
     for entry in "$search_dir"/*
     do
       echo "$entry"
-      oc delete -f $entry
+      oc delete -f "$entry"
     done
 }