Skip to content

Commit 3f079c4

Browse files
Mikalai Radchukopenshift-merge-bot[bot]
Mikalai Radchuk
authored andcommitted
UPSTREAM: <carry>: Disable Validating Admission Policy APIs downstream
Signed-off-by: Mikalai Radchuk <[email protected]>
1 parent 6ae54a9 commit 3f079c4

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

openshift/generate-manifests.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,12 @@ for container_name in "${!IMAGE_MAPPINGS[@]}"; do
5858
$YQ -i 'select(.kind == "Namespace").metadata.annotations += {"workload.openshift.io/allowed": "management"}' "$TMP_KUSTOMIZE_OUTPUT"
5959
done
6060

61+
# Exclude ValidatingAdmissionPolicy and ValidatingAdmissionPolicyBinding
62+
# APIs from downstream build as these API are currently not enabled by default.
63+
# In the OCP 4.17 (K8s 1.30) they will be become available
64+
# and we will be able to remove this to enforce admission policies
65+
$YQ -i 'del(select((.kind|downcase) == "validatingadmissionpolicy" or (.kind|downcase) == "validatingadmissionpolicybinding"))' "$TMP_KUSTOMIZE_OUTPUT"
66+
6167
# Use yq to split the single yaml file into 1 per document.
6268
# Naming convention: $index-$kind-$namespace-$name. If $namespace is empty, just use the empty string.
6369
(
@@ -101,4 +107,3 @@ cp "$TMP_MANIFEST_DIR"/* "$MANIFEST_DIR"/
101107
fi
102108
done
103109
)
104-

0 commit comments

Comments
 (0)