kbs: Simplify deployment overlays

The current "s390x" overlay support is currently very SE specific,
whereas deploying on non-SE s390x with the sample KBS is still
an important scenario for our testing without specialised hardware.

This scenario deployment matches the x86_64 deployment scenario,
so let's go back to having a standard deployment, with a special
case for ibm-se rather to reduce duplication.

Co-authored-by: Hyounggyu Choi <[email protected]>
Signed-off-by: stevenhorsman <[email protected]>

kbs/config/kubernetes/custom_pccs/kustomization.yaml

@@ -3,7 +3,7 @@ kind: Kustomization
 namespace: coco-tenant
 
 resources:
-- ../nodeport/x86_64
+- ../nodeport/
 
 patches:
 - path: set_custom_pccs.yaml

kbs/config/kubernetes/deploy-kbs.sh

@@ -6,12 +6,11 @@ set -euo pipefail
 DEPLOYMENT_DIR="${DEPLOYMENT_DIR:-overlays}"
 
 k8s_cnf_dir="$(dirname ${BASH_SOURCE[0]})"
-ARCH=$(uname -m)
 
 # Fail the script if the key.bin file does not exist.
-key_file="${k8s_cnf_dir}/overlays/${ARCH}/key.bin"
+key_file="${k8s_cnf_dir}/overlays/key.bin"
 [[ -f "${key_file}" ]] || {
-    echo "key.bin not found at ${k8s_cnf_dir}/overlays/${ARCH}/"
+    echo "key.bin not found at ${k8s_cnf_dir}/overlays/"
     exit 1
 }
 
@@ -22,18 +21,15 @@ kbs_cert="${k8s_cnf_dir}/base/kbs.pem"
     openssl pkey -in "${k8s_cnf_dir}/base/kbs.key" -pubout -out "${kbs_cert}"
 }
 
-if [ "${ARCH}" == "s390x" ]; then
-    if [ -n "${IBM_SE_CREDS_DIR:-}" ]; then
+if [ "$(uname -m)" == "s390x" ] && [ -n "${IBM_SE_CREDS_DIR:-}" ]; then
+    # We are using the ibm-se overlay
+    DEPLOYMENT_DIR="${DEPLOYMENT_DIR}/ibm-se"
     export NODE_NAME=$(kubectl get nodes -o jsonpath='{.items[0].metadata.name}')
-    envsubst <"${k8s_cnf_dir}/overlays/s390x/pv.yaml" | kubectl apply -f -
-    else
-        echo "IBM_SE_CREDS_DIR is empty" >&2
-        exit 1
-    fi
+    envsubst <"${k8s_cnf_dir}/${DEPLOYMENT_DIR}/pv.yaml" | kubectl apply -f -
 fi
 
 if [[ "${DEPLOYMENT_DIR}" == "nodeport" || "${DEPLOYMENT_DIR}" == "overlays" ]]; then
-    kubectl apply -k "${k8s_cnf_dir}/${DEPLOYMENT_DIR}/${ARCH}"
+    kubectl apply -k "${k8s_cnf_dir}/${DEPLOYMENT_DIR}"
 else
     kubectl apply -k "${k8s_cnf_dir}/${DEPLOYMENT_DIR}"
 fi

kbs/config/kubernetes/ita/kustomization.yaml

@@ -7,7 +7,7 @@ images:
   newTag: ita-as-v0.10.1
 
 resources:
-- ../nodeport/x86_64
+- ../nodeport/
 
 configMapGenerator:
 - name: kbs-config

kbs/config/kubernetes/nodeport/x86_64/kustomization.yaml → kbs/config/kubernetes/nodeport/ibm-se/kustomization.yaml

@@ -3,7 +3,7 @@ kind: Kustomization
 namespace: coco-tenant
 
 resources:
-- ../../overlays/x86_64
+- ../../overlays/ibm-se
 
 patches:
 - path: patch.yaml

kbs/config/kubernetes/nodeport/s390x/kustomization.yaml → kbs/config/kubernetes/nodeport/kustomization.yaml

@@ -3,7 +3,7 @@ kind: Kustomization
 namespace: coco-tenant
 
 resources:
-- ../../overlays/s390x
+- ../overlays/
 
 patches:
 - path: patch.yaml

kbs/config/kubernetes/overlays/s390x/kustomization.yaml → kbs/config/kubernetes/overlays/ibm-se/kustomization.yaml

@@ -3,7 +3,7 @@ kind: Kustomization
 namespace: coco-tenant
 
 resources:
-- ../common
+- ../../base
 - pvc.yaml
 
 patches:

kbs/config/kubernetes/overlays/x86_64/kustomization.yaml → kbs/config/kubernetes/overlays/kustomization.yaml

@@ -3,7 +3,7 @@ kind: Kustomization
 namespace: coco-tenant
 
 resources:
-- ../common
+- ../base
 
 patches:
 - path: patch.yaml