chore: cleanup kustomize config

- suspend too many WARNING lines from "make bundle" - remove sample config for components and monitoring Signed-off-by: Wen Zhou <wenzhou@redhat.com>
opendatahub-io · Jan 14, 2025 · 5e2c750 · 5e2c750
1 parent 8865ea6
commit 5e2c750
Show file tree

Hide file tree

Showing 14 changed files with 4 additions and 89 deletions.
diff --git a/Makefile b/Makefile
@@ -292,11 +292,12 @@ $(CRD_REF_DOCS): $(LOCALBIN)
 	)
 
 BUNDLE_DIR ?= "bundle"
+WARNINGMSG = "provided API should have an example annotation"
 .PHONY: bundle
 bundle: prepare operator-sdk ## Generate bundle manifests and metadata, then validate generated files.
 	$(OPERATOR_SDK) generate kustomize manifests -q
-	$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS)
-	$(OPERATOR_SDK) bundle validate ./$(BUNDLE_DIR)
+	$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS) 2>&1 | grep -v $(WARNINGMSG)
+	$(OPERATOR_SDK) bundle validate ./$(BUNDLE_DIR) 2>&1 | grep -v $(WARNINGMSG)
 	mv bundle.Dockerfile Dockerfiles/
 	rm -f bundle/manifests/opendatahub-operator-webhook-service_v1_service.yaml
 

diff --git a/config/samples/components_v1_codeflare.yaml b/config/samples/components_v1_codeflare.yaml
diff --git a/config/samples/components_v1_dashboard.yaml b/config/samples/components_v1_dashboard.yaml
diff --git a/config/samples/components_v1_datasciencepipelines.yaml b/config/samples/components_v1_datasciencepipelines.yaml
diff --git a/config/samples/components_v1_kserve.yaml b/config/samples/components_v1_kserve.yaml
diff --git a/config/samples/components_v1_kueue.yaml b/config/samples/components_v1_kueue.yaml
diff --git a/config/samples/components_v1_modelmeshserving.yaml b/config/samples/components_v1_modelmeshserving.yaml
diff --git a/config/samples/components_v1_modelregistry.yaml b/config/samples/components_v1_modelregistry.yaml
diff --git a/config/samples/components_v1_ray.yaml b/config/samples/components_v1_ray.yaml
diff --git a/config/samples/components_v1_trainingoperator.yaml b/config/samples/components_v1_trainingoperator.yaml
diff --git a/config/samples/components_v1_trustyai.yaml b/config/samples/components_v1_trustyai.yaml
diff --git a/config/samples/components_v1_workbenches.yaml b/config/samples/components_v1_workbenches.yaml
diff --git a/config/samples/kustomization.yaml b/config/samples/kustomization.yaml
@@ -5,18 +5,4 @@ kind: Kustomization
 resources:
 - datasciencecluster_v1_datasciencecluster.yaml
 - dscinitialization_v1_dscinitialization.yaml
-#- components_v1_dashboard.yaml
-#- components_v1_workbenches.yaml
-#- components_v1_modelmeshserving.yaml
-#- components_v1_datasciencepipelines.yaml
-#- components_v1_kserve.yaml
-#- components_v1_kueue.yaml
-#- components_v1_codeflare.yaml
-#- components_v1_ray.yaml
-#- components_v1_trustyai.yaml
-#- components_v1_modelregistry.yaml
-#- components_v1_trainingoperator.yaml
-#- services_v1_dscmonitoring.yaml
-- services_v1_monitoring.yaml
-- services_v1alpha1_auth.yaml
-#+kubebuilder:scaffold:manifestskustomizesamples
+- services_v1alpha1_auth.yaml
diff --git a/config/samples/services_v1_monitoring.yaml b/config/samples/services_v1_monitoring.yaml