Skip to content

HOSTEDCP-1767: feat: install prerequisite CRDs for AROHCP #4646

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
devguyio wants to merge 1 commit into from
Closed

HOSTEDCP-1767: feat: install prerequisite CRDs for AROHCP #4646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 36 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,13 @@ ifeq ("/","${HOME}")
HOME=/tmp
endif

# Prometheus CRDs
PROM_CRDS = "https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/refs/heads/main/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml" \
"https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/refs/heads/main/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml" \
"https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/refs/heads/main/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml"

OS_ROUTE_CRD = "https://raw.githubusercontent.com/openshift/api/3e5de946111c67cb1f2b09ff7da569012d15931d/route/v1/zz_generated.crd-manifests/routes-Default.crd.yaml"

all: build e2e tests

pre-commit: all verify test
Expand Down Expand Up @@ -96,7 +103,7 @@ product-cli:
# Run this when updating any of the types in the api package to regenerate the
# deepcopy code and CRD manifest files.
.PHONY: api
api: hypershift-api cluster-api cluster-api-provider-aws cluster-api-provider-ibmcloud cluster-api-provider-kubevirt cluster-api-provider-agent cluster-api-provider-azure cluster-api-provider-openstack api-docs
api: hypershift-api cluster-api cluster-api-provider-aws cluster-api-provider-ibmcloud cluster-api-provider-kubevirt cluster-api-provider-agent cluster-api-provider-azure cluster-api-provider-openstack api-docs download-prometheus-crds download-route-crd

.PHONY: hypershift-api
hypershift-api: $(CONTROLLER_GEN)
Expand All @@ -117,7 +124,7 @@ cluster-api-provider-aws: $(CONTROLLER_GEN)
$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./vendor/sigs.k8s.io/cluster-api-provider-aws/v2/api/..." output:crd:artifacts:config=cmd/install/assets/cluster-api-provider-aws
$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./vendor/sigs.k8s.io/cluster-api-provider-aws/v2/exp/api/..." output:crd:artifacts:config=cmd/install/assets/cluster-api-provider-aws
$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./vendor/sigs.k8s.io/cluster-api/exp/addons/api/..." output:crd:artifacts:config=cmd/install/assets/cluster-api
# remove ROSA CRDs
# remove ROSA CRDs
rm -rf cmd/install/assets/cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_rosa*.yaml
# remove EKS CRDs
rm -rf cmd/install/assets/cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsmanaged*.yaml
Expand Down Expand Up @@ -289,3 +296,30 @@ hypershift-install-aws-dev:
.PHONY: run-operator-locally-aws-dev
run-operator-locally-aws-dev:
@$(RUN_OPERATOR_LOCALLY_AWS)


.PHONY:
download-prometheus-crds:
@for crd in $(PROM_CRDS); do \
curl -f -s -w "%{http_code}" $$crd > /dev/null 2>&1; \
if [ $$? -eq 0 ]; then \
echo "Downloading `basename $$crd` -> $$crd"; \
curl -s $$crd -o cmd/install/assets/prereqs-azure/`basename $$crd`; \
echo " Saved cmd/install/assets/prereqs-azure/`basename $$crd`"; \
else \
echo "Failed to download $$crd"; \
fi; \
done

.PHONY:
download-route-crd:
@for crd in $(OS_ROUTE_CRD); do \
curl -f -s -w "%{http_code}" $$crd > /dev/null 2>&1; \
if [ $$? -eq 0 ]; then \
echo "Downloading `basename $$crd` -> $$crd"; \
curl -s $$crd -o cmd/install/assets/prereqs-azure/route.openshift.io_routes.yaml; \
echo " Saved cmd/install/assets/prereqs-azure/route.openshift.io_routes.yaml"; \
else \
echo "Failed to download $$crd"; \
fi; \
done
1 change: 1 addition & 0 deletions cmd/install/assets/assets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
crclient "sigs.k8s.io/controller-runtime/pkg/client"
)

//go:embed prereqs-azure/*

@jparrill jparrill Sep 2, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where those CRDs come from? I mean, for self-maintenance would we need to add a command to auto-generation/update of those CRDs in the Makefile, like we do with CAPI ones?

@devguyio devguyio Sep 2, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a good idea! I wasn't aware we do that. I'll check it out.

//go:embed hypershift-operator/*
//go:embed cluster-api/*
//go:embed cluster-api-provider-aws/*
Expand Down
Loading