Skip to content

Commit d8ed508

Browse files
committed
HYPERFLEET-610: Add OCI/OKE deployment targets
Add make install-all-oci target that deploys HyperFleet on Oracle Kubernetes Engine with in-cluster RabbitMQ, quay.io v0.2.0 images, and adapter1. GCP-specific PodMonitoring CRDs are disabled via a sentinel values-oci.yaml overlay. Pin sentinel chart to v0.2.0 tag for OCI deployments to match the v0.2.0 binary config format.
1 parent 1c40e1a commit d8ed508

2 files changed

Lines changed: 55 additions & 1 deletion

File tree

Makefile

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ ADAPTER_REPOSITORY ?= ci/hyperfleet-adapter
1919
API_IMAGE_TAG ?= latest
2020
SENTINEL_IMAGE_TAG ?= latest
2121
ADAPTER_IMAGE_TAG ?= latest
22+
SENTINEL_EXTRA_ARGS ?=
2223
DRY_RUN ?=
2324
AUTO_APPROVE ?=
2425
# Derived flags from boolean variables (only true/1 are treated as truthy)
@@ -183,7 +184,8 @@ install-sentinel-clusters: check-helm check-kubectl check-namespace ## Install S
183184
$(if $(REGISTRY),--set hyperfleet-sentinel.image.registry=$(REGISTRY)) \
184185
$(if $(SENTINEL_REPOSITORY),--set hyperfleet-sentinel.image.repository=$(SENTINEL_REPOSITORY)) \
185186
--set hyperfleet-sentinel.image.tag=$(SENTINEL_IMAGE_TAG) \
186-
$(if $(wildcard $(GENERATED_DIR)/sentinel-clusters.yaml),--values $(GENERATED_DIR)/sentinel-clusters.yaml)
187+
$(if $(wildcard $(GENERATED_DIR)/sentinel-clusters.yaml),--values $(GENERATED_DIR)/sentinel-clusters.yaml) \
188+
$(SENTINEL_EXTRA_ARGS)
187189

188190
.PHONY: install-sentinel-nodepools
189191
install-sentinel-nodepools: check-helm check-kubectl check-namespace ## Install Sentinel for nodepools
@@ -268,6 +270,34 @@ install-all: install-terraform get-credentials tf-helm-values install-maestro cr
268270
install-all-rabbitmq: BROKER_TYPE = rabbitmq
269271
install-all-rabbitmq: install-rabbitmq tf-helm-values install-hyperfleet install-maestro create-maestro-consumer ## Full RabbitMQ install (rabbitmq + hyperfleet + maestro, no terraform)
270272

273+
# ──────────────────────────────────────────────
274+
# OCI/OKE deployment targets
275+
# ──────────────────────────────────────────────
276+
277+
.PHONY: install-hyperfleet-oci
278+
install-hyperfleet-oci: install-api install-sentinel-clusters install-adapter1 ## Install API + sentinel + adapter1 for OCI
279+
280+
.PHONY: install-all-oci
281+
install-all-oci: ## Full OCI/OKE install (rabbitmq + api + sentinel + adapter1)
282+
install-all-oci: BROKER_TYPE = rabbitmq
283+
install-all-oci: REGISTRY = quay.io
284+
install-all-oci: API_REPOSITORY = openshift-hyperfleet/hyperfleet-api
285+
install-all-oci: SENTINEL_REPOSITORY = openshift-hyperfleet/hyperfleet-sentinel
286+
install-all-oci: ADAPTER_REPOSITORY = openshift-hyperfleet/hyperfleet-adapter
287+
install-all-oci: API_IMAGE_TAG = v0.2.0
288+
install-all-oci: SENTINEL_IMAGE_TAG = v0.2.0
289+
install-all-oci: ADAPTER_IMAGE_TAG = v0.2.0
290+
install-all-oci: SENTINEL_CHART_REF = v0.2.0
291+
install-all-oci: SENTINEL_EXTRA_ARGS = --values $(HELM_DIR)/sentinel-clusters/values-oci.yaml
292+
install-all-oci: install-rabbitmq tf-helm-values install-hyperfleet-oci
293+
294+
.PHONY: uninstall-all-oci
295+
uninstall-all-oci: ## Uninstall all OCI components
296+
-helm uninstall $(NAMESPACE)-adapter1 --namespace $(NAMESPACE) --kubeconfig $(KUBECONFIG)
297+
-helm uninstall $(NAMESPACE)-sentinel-clusters --namespace $(NAMESPACE) --kubeconfig $(KUBECONFIG)
298+
-helm uninstall $(NAMESPACE)-api --namespace $(NAMESPACE) --kubeconfig $(KUBECONFIG)
299+
$(MAKE) uninstall-rabbitmq
300+
271301
# ──────────────────────────────────────────────
272302
# CI validation targets
273303
# ──────────────────────────────────────────────
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# OCI/OKE overrides for Sentinel (v0.2.0 config format)
2+
# The v0.2.0 binary uses flat config (hyperfleetApi under config, not clients)
3+
4+
hyperfleet-sentinel:
5+
config:
6+
resourceType: clusters
7+
resourceSelector: []
8+
9+
hyperfleetApi:
10+
baseUrl: http://hyperfleet-api:8000
11+
timeout: 5s
12+
13+
broker:
14+
type: rabbitmq
15+
topic: hyperfleet-clusters
16+
rabbitmq:
17+
url: amqp://guest:guest@rabbitmq:5672/
18+
exchangeType: topic
19+
20+
monitoring:
21+
podMonitoring:
22+
enabled: false
23+
prometheusRule:
24+
enabled: false

0 commit comments

Comments
 (0)