From b9384a8eed6ae14cd739a769022a6100d305990d Mon Sep 17 00:00:00 2001 From: Jon Cope Date: Wed, 28 Aug 2024 17:09:31 -0500 Subject: [PATCH] 0000_03_config-operator_01_securitycontextconstraints.crd.yaml -> 0000_03_config-operator_01_securitycontextconstraints-Default.crd.yaml Signed-off-by: Jon Cope --- pkg/assets/crd.go | 2 +- scripts/auto-rebase/assets.yaml | 2 +- scripts/auto-rebase/rebase.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/assets/crd.go b/pkg/assets/crd.go index 55e5cd61db..d84a42038b 100644 --- a/pkg/assets/crd.go +++ b/pkg/assets/crd.go @@ -34,7 +34,7 @@ var ( apiExtensionsCodecs = serializer.NewCodecFactory(apiExtensionsScheme) crds = []string{ "crd/0000_03_config-operator_02_rangeallocations.crd.yaml", - "crd/0000_03_config-operator_01_securitycontextconstraints.crd.yaml", + "crd/0000_03_config-operator_01_securitycontextconstraints-Default.crd.yaml", "crd/route.crd.yaml", "crd/storage_version_migration.crd.yaml", "components/lvms/topolvm.io_logicalvolumes.yaml", diff --git a/scripts/auto-rebase/assets.yaml b/scripts/auto-rebase/assets.yaml index 429911430d..ac13b87526 100644 --- a/scripts/auto-rebase/assets.yaml +++ b/scripts/auto-rebase/assets.yaml @@ -195,7 +195,7 @@ assets: - dir: crd/ src: release-manifests/ files: - - file: 0000_03_config-operator_01_securitycontextconstraints.crd.yaml + - file: 0000_03_config-operator_01_securitycontextconstraints-Default.crd.yaml - file: 0000_03_config-operator_02_rangeallocations.crd.yaml - file: storage_version_migration.crd.yaml src: 0000_50_cluster-kube-storage-version-migrator-operator_01_storage_migration_crd.yaml diff --git a/scripts/auto-rebase/rebase.sh b/scripts/auto-rebase/rebase.sh index 2d4ddb29a3..a94cb42b90 100755 --- a/scripts/auto-rebase/rebase.sh +++ b/scripts/auto-rebase/rebase.sh @@ -638,7 +638,7 @@ EOF yq -i 'del(.extendedArguments.pv-recycler-pod-template-filepath-hostpath)' "${REPOROOT}"/assets/controllers/kube-controller-manager/defaultconfig.yaml yq -i 'del(.extendedArguments.pv-recycler-pod-template-filepath-nfs)' "${REPOROOT}"/assets/controllers/kube-controller-manager/defaultconfig.yaml yq -i 'del(.extendedArguments.flex-volume-plugin-dir)' "${REPOROOT}"/assets/controllers/kube-controller-manager/defaultconfig.yaml - yq -i '.spec.names.shortNames = ["scc"]' "${REPOROOT}"/assets/crd/0000_03_config-operator_01_securitycontextconstraints.crd.yaml + yq -i '.spec.names.shortNames = ["scc"]' "${REPOROOT}"/assets/crd/0000_03_config-operator_01_securitycontextconstraints-Default.crd.yaml #-- openshift-dns ------------------------------------- # Render operand manifest templates like the operator would