diff --git a/hack/render-sync.sh b/hack/render-sync.sh index ce54c7a70c..7b1afac08f 100755 --- a/hack/render-sync.sh +++ b/hack/render-sync.sh @@ -1,16 +1,35 @@ #!/usr/bin/env bash - WORKDIR=$(dirname "$(realpath "$0")")/.. -ARTIFACT_DIR=$(mktemp -d) - -cd "${WORKDIR}" || { echo "failed to change dir to ${WORKDIR}"; exit; } -_output/cluster-node-tuning-operator render \ ---asset-input-dir "${WORKDIR}"/test/e2e/performanceprofile/cluster-setup/manual-cluster/performance,"${WORKDIR}"/test/e2e/performanceprofile/cluster-setup/base/performance \ ---asset-output-dir "${ARTIFACT_DIR}" - -cp "${ARTIFACT_DIR}"/* "${WORKDIR}"/test/e2e/performanceprofile/testdata/render-expected-output/default -for f in "${WORKDIR}"/test/e2e/performanceprofile/testdata/render-expected-output/default/* -do - sed -i "s/uid:.*/uid: \"\"/" "${f}" -done -rm -r "${ARTIFACT_DIR}" + +function join_by { local IFS="$1"; shift; echo "$*"; } + +function rendersync() { + INPUT_DIRS=() + while (( $# > 1 )); do + INPUT_DIRS+=("${WORKDIR}/test/e2e/performanceprofile/cluster-setup/$1") + shift + done + INPUT_DIRS=$(join_by , ${INPUT_DIRS[@]}) + + OUTPUT_DIR=$1 + + echo "== Rendering ${INPUT_DIRS} into ${OUTPUT_DIR}" + + ARTIFACT_DIR=$(mktemp -d) + + cd "${WORKDIR}" || { echo "failed to change dir to ${WORKDIR}"; exit; } + _output/cluster-node-tuning-operator render \ + --asset-input-dir "${INPUT_DIRS}" \ + --asset-output-dir "${ARTIFACT_DIR}" + + cp "${ARTIFACT_DIR}"/* "${WORKDIR}"/test/e2e/performanceprofile/testdata/render-expected-output/${OUTPUT_DIR} + for f in "${WORKDIR}"/test/e2e/performanceprofile/testdata/render-expected-output/${OUTPUT_DIR}/* + do + sed -i "s/uid:.*/uid: \"\"/" "${f}" + done + rm -r "${ARTIFACT_DIR}" +} + +rendersync manual-cluster/performance base/performance default +rendersync bootstrap-cluster/performance pinned-cluster/default bootstrap/no-mcp +rendersync bootstrap-cluster/performance pinned-cluster/default bootstrap-cluster/extra-mcp bootstrap/extra-mcp \ No newline at end of file diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_kubeletconfig.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_kubeletconfig.yaml index 7c14d539b0..475b968f8a 100644 --- a/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_kubeletconfig.yaml +++ b/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_kubeletconfig.yaml @@ -2,9 +2,9 @@ apiVersion: machineconfiguration.openshift.io/v1 kind: KubeletConfig metadata: creationTimestamp: null - name: performance-manual labels: - performance.openshift.io/weak-owner-reference-name: "manual" + performance.openshift.io/weak-owner-reference-name: manual + name: performance-manual spec: kubeletConfig: apiVersion: kubelet.config.k8s.io/v1beta1 diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_machineconfig.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_machineconfig.yaml index fe7c3fc151..cb1f7a773b 100644 --- a/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_machineconfig.yaml +++ b/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_machineconfig.yaml @@ -4,7 +4,7 @@ metadata: creationTimestamp: null labels: machineconfiguration.openshift.io/role: worker-cnf - performance.openshift.io/weak-owner-reference-name: "manual" + performance.openshift.io/weak-owner-reference-name: manual name: 50-performance-manual spec: baseOSExtensionsContainerImage: "" diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_node.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_node.yaml index b9e43519f3..d87c0a8ddb 100644 --- a/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_node.yaml +++ b/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_node.yaml @@ -2,9 +2,9 @@ apiVersion: config.openshift.io/v1 kind: Node metadata: creationTimestamp: null - name: cluster labels: - performance.openshift.io/weak-owner-reference-name: "manual" + performance.openshift.io/weak-owner-reference-name: manual + name: cluster spec: cgroupMode: v1 status: {} diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_runtimeclass.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_runtimeclass.yaml index 04afe0c73e..3dc9de2935 100644 --- a/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_runtimeclass.yaml +++ b/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_runtimeclass.yaml @@ -3,9 +3,9 @@ handler: high-performance kind: RuntimeClass metadata: creationTimestamp: null - name: performance-manual labels: - performance.openshift.io/weak-owner-reference-name: "manual" + performance.openshift.io/weak-owner-reference-name: manual + name: performance-manual scheduling: nodeSelector: node-role.kubernetes.io/worker-cnf: "" diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_tuned.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_tuned.yaml index bb355971f6..ec39bf0742 100644 --- a/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_tuned.yaml +++ b/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_tuned.yaml @@ -2,10 +2,10 @@ apiVersion: tuned.openshift.io/v1 kind: Tuned metadata: creationTimestamp: null + labels: + performance.openshift.io/weak-owner-reference-name: manual name: openshift-node-performance-manual namespace: openshift-cluster-node-tuning-operator - labels: - performance.openshift.io/weak-owner-reference-name: "manual" spec: profile: - data: "[main]\nsummary=Openshift node optimized for deterministic performance