Task/csi 3417 add full generation for roles editing

Makefile

@@ -32,9 +32,9 @@ help: ## Display this help.
 
 ##@ Development
 
-manifests: controller-gen kustomize## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
+manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
 	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=ibm-block-csi-operator webhook paths="./..." output:crd:artifacts:config=config/crd/bases
-	$(KUSTOMIZE) build config/crd/ -o config/crd/bases/csi.ibm.com_ibmblockcsis.yaml
+	hack/add-lables-to-yamls.sh
 
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
@@ -80,7 +80,7 @@ test: check-generated-manifests update
 	ginkgo -r -v -skipPackage tests
 
 .PHONY: update
-update: kustomize
+update:
 	hack/update-all.sh
 
 .PHONY: check-generated-manifests

build/ci/Dockerfile.unittest

@@ -25,6 +25,12 @@ RUN go get github.com/onsi/ginkgo/[email protected] \
     && make kustomize \
     && make controller-gen
 
+ARG YQ_VERSION=v4.13.5
+ARG BINARY=yq_linux_386
+RUN YQ_BINARY=$(if [ "$(uname -m)" = "x86_64" ]; then echo "yq_linux_amd64"; else echo "yq_linux_$(uname -m)" ; fi) \
+    && wget https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/${YQ_BINARY} -O /usr/bin/yq \ 
+    && chmod +x /usr/bin/yq
+
 COPY . .
 
 CMD ["make", "test"]

config/crd/kustomization.yaml

@@ -1,6 +1,3 @@
 resources:
 - bases/csi.ibm.com_ibmblockcsis.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
-
-patchesStrategicMerge:
-- patches/labels_patch.yaml

config/rbac/kustomization.yaml

@@ -2,7 +2,3 @@ resources:
 - service_account.yaml
 - role.yaml
 - role_binding.yaml
-
-
-patchesStrategicMerge:
-- role_labels_patch.yaml