Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
19 changes: 1 addition & 18 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,7 @@ RBAC_LIST = rbac.authorization.k8s.io_v1_clusterrole_platform-operators-manager-
rbac.authorization.k8s.io_v1_clusterrolebinding_platform-operators-manager-rolebinding.yaml \
rbac.authorization.k8s.io_v1_clusterrolebinding_platform-operators-proxy-rolebinding.yaml \
rbac.authorization.k8s.io_v1_role_platform-operators-leader-election-role.yaml \
rbac.authorization.k8s.io_v1_rolebinding_platform-operators-leader-election-rolebinding.yaml \
rbac.authorization.k8s.io_v1_clusterrole_platform-operators-rukpak-bundle-reader.yaml \
rbac.authorization.k8s.io_v1_clusterrole_platform-operators-rukpak-bundle-uploader.yaml \
rbac.authorization.k8s.io_v1_clusterrole_platform-operators-rukpak-core-admin.yaml \
rbac.authorization.k8s.io_v1_clusterrolebinding_platform-operators-rukpak-core-admin.yaml
rbac.authorization.k8s.io_v1_rolebinding_platform-operators-leader-election-rolebinding.yaml

# Generate manifests e.g. CRD, RBAC etc.
.PHONY: manifests
Expand All @@ -78,19 +74,6 @@ manifests: generate yq kustomize
@# Move the vendored PlatformOperator CRD from o/api to the manifests folder
cp $(ROOT_DIR)/vendor/github.com/openshift/api/platform/v1alpha1/platformoperators.crd.yaml manifests/0000_50_cluster-platform-operator-manager_00-platformoperator.crd.yaml

@# 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_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_50_cluster-platform-operator-manager_00-namespace.yaml
$(MV_TMP_DIR)/v1_serviceaccount_platform-operators-controller-manager.yaml manifests/0000_50_cluster-platform-operator-manager_01-serviceaccount.yaml
Expand Down
6 changes: 0 additions & 6 deletions config/clusteroperator/aggregated_clusteroperator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,3 @@ status:
- group: platform.openshift.io
name: ""
resource: platformoperators
- group: core.rukpak.io
name: ""
resource: bundles
- group: core.rukpak.io
name: ""
resource: bundledeployments
1 change: 0 additions & 1 deletion config/default/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ images:
bases:
- ../rbac
- ../manager
- ../rukpak
- ../clusteroperator
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
# crd/kustomization.yaml
Expand Down
363 changes: 0 additions & 363 deletions config/rukpak/apis/crds/core.rukpak.io_bundledeployments.yaml

This file was deleted.

470 changes: 0 additions & 470 deletions config/rukpak/apis/crds/core.rukpak.io_bundles.yaml

This file was deleted.

17 changes: 0 additions & 17 deletions config/rukpak/apis/crds/kustomization.yml

This file was deleted.

33 changes: 0 additions & 33 deletions config/rukpak/apis/crds/patches/bundle_validation.yaml

This file was deleted.

This file was deleted.

3 changes: 0 additions & 3 deletions config/rukpak/apis/kustomization.yml

This file was deleted.

27 changes: 0 additions & 27 deletions config/rukpak/apis/webhooks/kustomization.yml

This file was deleted.

18 changes: 0 additions & 18 deletions config/rukpak/apis/webhooks/kustomizeconfig.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions config/rukpak/apis/webhooks/patches/cainjection.yaml

This file was deleted.

18 changes: 0 additions & 18 deletions config/rukpak/apis/webhooks/patches/high-availability.yaml

This file was deleted.

48 changes: 0 additions & 48 deletions config/rukpak/apis/webhooks/resources/deployment.yaml

This file was deleted.

14 changes: 0 additions & 14 deletions config/rukpak/apis/webhooks/resources/service.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions config/rukpak/apis/webhooks/resources/serviceaccount.yaml

This file was deleted.

26 changes: 0 additions & 26 deletions config/rukpak/apis/webhooks/resources/webhook.yaml

This file was deleted.

This file was deleted.

28 changes: 0 additions & 28 deletions config/rukpak/core/kustomization.yaml

This file was deleted.

This file was deleted.

This file was deleted.

Loading