diff --git a/Makefile b/Makefile index eeb5d66a..4b3204e8 100644 --- a/Makefile +++ b/Makefile @@ -75,30 +75,30 @@ manifests: generate kustomize rm manifests/* || true @# Move all of the rukpak manifests into the manifests folder - $(MV_TMP_DIR)/apiextensions.k8s.io_v1_customresourcedefinition_bundledeployments.core.rukpak.io.yaml manifests/0000_60_cluster-platform-operator-manager_00-rukpak-bundledeployments.crd.yaml - $(MV_TMP_DIR)/apiextensions.k8s.io_v1_customresourcedefinition_bundles.core.rukpak.io.yaml manifests/0000_60_cluster-platform-operator-manager_00-rukpak-bundles.crd.yaml - $(MV_TMP_DIR)/v1_configmap_platform-operators-rukpak-core-tls.yaml manifests/0000_60_cluster-platform-operator-manager_01-core-ca.cm.yaml - $(MV_TMP_DIR)/v1_configmap_platform-operators-rukpak-webhook-tls.yaml manifests/0000_60_cluster-platform-operator-manager_01-webhook-ca.cm.yaml - $(MV_TMP_DIR)/v1_serviceaccount_platform-operators-rukpak-core-admin.yaml manifests/0000_60_cluster-platform-operator-manager_01-rukpak-core-admin.sa.yaml - $(MV_TMP_DIR)/v1_serviceaccount_platform-operators-rukpak-webhooks-admin.yaml manifests/0000_60_cluster-platform-operator-manager_01-rukpak-webhooks-admin.sa.yaml - $(MV_TMP_DIR)/v1_service_platform-operators-rukpak-core.yaml manifests/0000_60_cluster-platform-operator-manager_02-rukpak-core.service.yaml - $(MV_TMP_DIR)/v1_service_platform-operators-rukpak-webhook-service.yaml manifests/0000_60_cluster-platform-operator-manager_02-rukpak-webhook.service.yaml - $(MV_TMP_DIR)/apps_v1_deployment_platform-operators-rukpak-webhooks.yaml manifests/0000_60_cluster-platform-operator-manager_04-rukpak-webhooks.deployment.yaml - $(MV_TMP_DIR)/apps_v1_deployment_platform-operators-rukpak-core.yaml manifests/0000_60_cluster-platform-operator-manager_04-rukpak-core.deployment.yaml - $(MV_TMP_DIR)/admissionregistration.k8s.io_v1_validatingwebhookconfiguration_platform-operators-rukpak-validating-webhook-configuration.yaml manifests/0000_60_cluster-platform-operator-manager_05-rukpak.validating-webhook-configuration.yaml + $(MV_TMP_DIR)/apiextensions.k8s.io_v1_customresourcedefinition_bundledeployments.core.rukpak.io.yaml manifests/0000_50_cluster-platform-operator-manager_00-rukpak-bundledeployments.crd.yaml + $(MV_TMP_DIR)/apiextensions.k8s.io_v1_customresourcedefinition_bundles.core.rukpak.io.yaml manifests/0000_50_cluster-platform-operator-manager_00-rukpak-bundles.crd.yaml + $(MV_TMP_DIR)/v1_configmap_platform-operators-rukpak-core-tls.yaml manifests/0000_50_cluster-platform-operator-manager_01-core-ca.cm.yaml + $(MV_TMP_DIR)/v1_configmap_platform-operators-rukpak-webhook-tls.yaml manifests/0000_50_cluster-platform-operator-manager_01-webhook-ca.cm.yaml + $(MV_TMP_DIR)/v1_serviceaccount_platform-operators-rukpak-core-admin.yaml manifests/0000_50_cluster-platform-operator-manager_01-rukpak-core-admin.sa.yaml + $(MV_TMP_DIR)/v1_serviceaccount_platform-operators-rukpak-webhooks-admin.yaml manifests/0000_50_cluster-platform-operator-manager_01-rukpak-webhooks-admin.sa.yaml + $(MV_TMP_DIR)/v1_service_platform-operators-rukpak-core.yaml manifests/0000_50_cluster-platform-operator-manager_02-rukpak-core.service.yaml + $(MV_TMP_DIR)/v1_service_platform-operators-rukpak-webhook-service.yaml manifests/0000_50_cluster-platform-operator-manager_02-rukpak-webhook.service.yaml + $(MV_TMP_DIR)/apps_v1_deployment_platform-operators-rukpak-webhooks.yaml manifests/0000_50_cluster-platform-operator-manager_04-rukpak-webhooks.deployment.yaml + $(MV_TMP_DIR)/apps_v1_deployment_platform-operators-rukpak-core.yaml manifests/0000_50_cluster-platform-operator-manager_04-rukpak-core.deployment.yaml + $(MV_TMP_DIR)/admissionregistration.k8s.io_v1_validatingwebhookconfiguration_platform-operators-rukpak-validating-webhook-configuration.yaml manifests/0000_50_cluster-platform-operator-manager_05-rukpak.validating-webhook-configuration.yaml @# Move all of the platform operators manifests into the manifests folder - $(MV_TMP_DIR)/v1_namespace_openshift-platform-operators.yaml manifests/0000_60_cluster-platform-operator-manager_00-namespace.yaml - $(MV_TMP_DIR)/apiextensions.k8s.io_v1_customresourcedefinition_platformoperators.platform.openshift.io.yaml manifests/0000_60_cluster-platform-operator-manager_00-platformoperator.crd.yaml - $(MV_TMP_DIR)/v1_serviceaccount_platform-operators-controller-manager.yaml manifests/0000_60_cluster-platform-operator-manager_01-serviceaccount.yaml - $(MV_TMP_DIR)/v1_service_platform-operators-controller-manager-metrics-service.yaml manifests/0000_60_cluster-platform-operator-manager_02-metricsservice.yaml - $(MV_TMP_DIR)/apps_v1_deployment_platform-operators-controller-manager.yaml manifests/0000_60_cluster-platform-operator-manager_06-deployment.yaml + $(MV_TMP_DIR)/v1_namespace_openshift-platform-operators.yaml manifests/0000_50_cluster-platform-operator-manager_00-namespace.yaml + $(MV_TMP_DIR)/apiextensions.k8s.io_v1_customresourcedefinition_platformoperators.platform.openshift.io.yaml manifests/0000_50_cluster-platform-operator-manager_00-platformoperator.crd.yaml + $(MV_TMP_DIR)/v1_serviceaccount_platform-operators-controller-manager.yaml manifests/0000_50_cluster-platform-operator-manager_01-serviceaccount.yaml + $(MV_TMP_DIR)/v1_service_platform-operators-controller-manager-metrics-service.yaml manifests/0000_50_cluster-platform-operator-manager_02-metricsservice.yaml + $(MV_TMP_DIR)/apps_v1_deployment_platform-operators-controller-manager.yaml manifests/0000_50_cluster-platform-operator-manager_06-deployment.yaml @# cluster-platform-operator-manager rbacs - rm -f manifests/0000_60_cluster-platform-operator-manager_03_rbac.yaml + rm -f manifests/0000_50_cluster-platform-operator-manager_03_rbac.yaml for rbac in $(RBAC_LIST); do \ - cat $(TMP_DIR)/$${rbac} >> manifests/0000_60_cluster-platform-operator-manager_03_rbac.yaml ;\ - echo '---' >> manifests/0000_60_cluster-platform-operator-manager_03_rbac.yaml ;\ + cat $(TMP_DIR)/$${rbac} >> manifests/0000_50_cluster-platform-operator-manager_03_rbac.yaml ;\ + echo '---' >> manifests/0000_50_cluster-platform-operator-manager_03_rbac.yaml ;\ done .PHONY: lint diff --git a/manifests/0000_60_cluster-platform-operator-manager_00-namespace.yaml b/manifests/0000_50_cluster-platform-operator-manager_00-namespace.yaml similarity index 100% rename from manifests/0000_60_cluster-platform-operator-manager_00-namespace.yaml rename to manifests/0000_50_cluster-platform-operator-manager_00-namespace.yaml diff --git a/manifests/0000_60_cluster-platform-operator-manager_00-platformoperator.crd.yaml b/manifests/0000_50_cluster-platform-operator-manager_00-platformoperator.crd.yaml similarity index 100% rename from manifests/0000_60_cluster-platform-operator-manager_00-platformoperator.crd.yaml rename to manifests/0000_50_cluster-platform-operator-manager_00-platformoperator.crd.yaml diff --git a/manifests/0000_60_cluster-platform-operator-manager_00-rukpak-bundledeployments.crd.yaml b/manifests/0000_50_cluster-platform-operator-manager_00-rukpak-bundledeployments.crd.yaml similarity index 100% rename from manifests/0000_60_cluster-platform-operator-manager_00-rukpak-bundledeployments.crd.yaml rename to manifests/0000_50_cluster-platform-operator-manager_00-rukpak-bundledeployments.crd.yaml diff --git a/manifests/0000_60_cluster-platform-operator-manager_00-rukpak-bundles.crd.yaml b/manifests/0000_50_cluster-platform-operator-manager_00-rukpak-bundles.crd.yaml similarity index 100% rename from manifests/0000_60_cluster-platform-operator-manager_00-rukpak-bundles.crd.yaml rename to manifests/0000_50_cluster-platform-operator-manager_00-rukpak-bundles.crd.yaml diff --git a/manifests/0000_60_cluster-platform-operator-manager_01-core-ca.cm.yaml b/manifests/0000_50_cluster-platform-operator-manager_01-core-ca.cm.yaml similarity index 100% rename from manifests/0000_60_cluster-platform-operator-manager_01-core-ca.cm.yaml rename to manifests/0000_50_cluster-platform-operator-manager_01-core-ca.cm.yaml diff --git a/manifests/0000_60_cluster-platform-operator-manager_01-rukpak-core-admin.sa.yaml b/manifests/0000_50_cluster-platform-operator-manager_01-rukpak-core-admin.sa.yaml similarity index 100% rename from manifests/0000_60_cluster-platform-operator-manager_01-rukpak-core-admin.sa.yaml rename to manifests/0000_50_cluster-platform-operator-manager_01-rukpak-core-admin.sa.yaml diff --git a/manifests/0000_60_cluster-platform-operator-manager_01-rukpak-webhooks-admin.sa.yaml b/manifests/0000_50_cluster-platform-operator-manager_01-rukpak-webhooks-admin.sa.yaml similarity index 100% rename from manifests/0000_60_cluster-platform-operator-manager_01-rukpak-webhooks-admin.sa.yaml rename to manifests/0000_50_cluster-platform-operator-manager_01-rukpak-webhooks-admin.sa.yaml diff --git a/manifests/0000_60_cluster-platform-operator-manager_01-serviceaccount.yaml b/manifests/0000_50_cluster-platform-operator-manager_01-serviceaccount.yaml similarity index 100% rename from manifests/0000_60_cluster-platform-operator-manager_01-serviceaccount.yaml rename to manifests/0000_50_cluster-platform-operator-manager_01-serviceaccount.yaml diff --git a/manifests/0000_60_cluster-platform-operator-manager_01-webhook-ca.cm.yaml b/manifests/0000_50_cluster-platform-operator-manager_01-webhook-ca.cm.yaml similarity index 100% rename from manifests/0000_60_cluster-platform-operator-manager_01-webhook-ca.cm.yaml rename to manifests/0000_50_cluster-platform-operator-manager_01-webhook-ca.cm.yaml diff --git a/manifests/0000_60_cluster-platform-operator-manager_02-metricsservice.yaml b/manifests/0000_50_cluster-platform-operator-manager_02-metricsservice.yaml similarity index 100% rename from manifests/0000_60_cluster-platform-operator-manager_02-metricsservice.yaml rename to manifests/0000_50_cluster-platform-operator-manager_02-metricsservice.yaml diff --git a/manifests/0000_60_cluster-platform-operator-manager_02-rukpak-core.service.yaml b/manifests/0000_50_cluster-platform-operator-manager_02-rukpak-core.service.yaml similarity index 100% rename from manifests/0000_60_cluster-platform-operator-manager_02-rukpak-core.service.yaml rename to manifests/0000_50_cluster-platform-operator-manager_02-rukpak-core.service.yaml diff --git a/manifests/0000_60_cluster-platform-operator-manager_02-rukpak-webhook.service.yaml b/manifests/0000_50_cluster-platform-operator-manager_02-rukpak-webhook.service.yaml similarity index 100% rename from manifests/0000_60_cluster-platform-operator-manager_02-rukpak-webhook.service.yaml rename to manifests/0000_50_cluster-platform-operator-manager_02-rukpak-webhook.service.yaml diff --git a/manifests/0000_60_cluster-platform-operator-manager_03_rbac.yaml b/manifests/0000_50_cluster-platform-operator-manager_03_rbac.yaml similarity index 100% rename from manifests/0000_60_cluster-platform-operator-manager_03_rbac.yaml rename to manifests/0000_50_cluster-platform-operator-manager_03_rbac.yaml diff --git a/manifests/0000_60_cluster-platform-operator-manager_04-rukpak-core.deployment.yaml b/manifests/0000_50_cluster-platform-operator-manager_04-rukpak-core.deployment.yaml similarity index 100% rename from manifests/0000_60_cluster-platform-operator-manager_04-rukpak-core.deployment.yaml rename to manifests/0000_50_cluster-platform-operator-manager_04-rukpak-core.deployment.yaml diff --git a/manifests/0000_60_cluster-platform-operator-manager_04-rukpak-webhooks.deployment.yaml b/manifests/0000_50_cluster-platform-operator-manager_04-rukpak-webhooks.deployment.yaml similarity index 100% rename from manifests/0000_60_cluster-platform-operator-manager_04-rukpak-webhooks.deployment.yaml rename to manifests/0000_50_cluster-platform-operator-manager_04-rukpak-webhooks.deployment.yaml diff --git a/manifests/0000_60_cluster-platform-operator-manager_05-rukpak.validating-webhook-configuration.yaml b/manifests/0000_50_cluster-platform-operator-manager_05-rukpak.validating-webhook-configuration.yaml similarity index 100% rename from manifests/0000_60_cluster-platform-operator-manager_05-rukpak.validating-webhook-configuration.yaml rename to manifests/0000_50_cluster-platform-operator-manager_05-rukpak.validating-webhook-configuration.yaml diff --git a/manifests/0000_60_cluster-platform-operator-manager_06-deployment.yaml b/manifests/0000_50_cluster-platform-operator-manager_06-deployment.yaml similarity index 100% rename from manifests/0000_60_cluster-platform-operator-manager_06-deployment.yaml rename to manifests/0000_50_cluster-platform-operator-manager_06-deployment.yaml