Skip to content
Draft
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,11 @@ clean-generated: ## Remove generated Helm values
MAESTRO_CONSUMER ?= cluster1
MANIFESTS_DIR := manifests

.PHONY: install-priority-classes
install-priority-classes: check-kubectl ## Install PriorityClasses for critical infrastructure pods
kubectl apply -f $(MANIFESTS_DIR)/priority-classes.yaml --kubeconfig $(KUBECONFIG)
@echo "OK: PriorityClasses applied"

.PHONY: install-rabbitmq
install-rabbitmq: check-kubectl check-namespace ## Install RabbitMQ (dev only, for BROKER_TYPE=rabbitmq)
kubectl apply -f $(MANIFESTS_DIR)/rabbitmq.yaml --namespace $(NAMESPACE) --kubeconfig $(KUBECONFIG)
Expand Down Expand Up @@ -262,11 +267,11 @@ install-adapters: install-adapter1 install-adapter2 install-adapter3 ## Install
install-hyperfleet: install-api install-sentinels install-adapters ## Install API + sentinels + adapters (no maestro, no terraform)

.PHONY: install-all
install-all: install-terraform get-credentials tf-helm-values install-maestro create-maestro-consumer install-hyperfleet ## Full GCP install (terraform + googlepubsub + hyperfleet + maestro)
install-all: install-terraform get-credentials tf-helm-values install-priority-classes install-maestro create-maestro-consumer install-hyperfleet ## Full GCP install (terraform + googlepubsub + hyperfleet + maestro)

.PHONY: install-all-rabbitmq
install-all-rabbitmq: BROKER_TYPE = rabbitmq
install-all-rabbitmq: install-rabbitmq tf-helm-values install-hyperfleet install-maestro create-maestro-consumer ## Full RabbitMQ install (rabbitmq + hyperfleet + maestro, no terraform)
install-all-rabbitmq: install-rabbitmq tf-helm-values install-priority-classes install-hyperfleet install-maestro create-maestro-consumer ## Full RabbitMQ install (rabbitmq + hyperfleet + maestro, no terraform)

# ──────────────────────────────────────────────
# CI validation targets
Expand Down
6 changes: 3 additions & 3 deletions helm/maestro/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ apiVersion: v2
name: maestro-stack
description: Umbrella chart for Maestro Server and Agent deployment
type: application
version: 0.1.0
version: 0.1.2
appVersion: "0.0.0-dev"

dependencies:
- name: maestro-server
version: "0.1.0"
version: "0.1.1"
repository: "git+https://github.com/openshift-online/maestro@charts/maestro-server?ref=main"
alias: server
- name: maestro-agent
version: "0.1.0"
version: "0.1.1"
repository: "git+https://github.com/openshift-online/maestro@charts/maestro-agent?ref=main"
alias: agent
condition: agent.enabled
5 changes: 5 additions & 0 deletions helm/maestro/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ server:
name: maestro-server

server:
priorityClassName: hyperfleet-critical
grpc:
tls:
enabled: false
Expand All @@ -31,6 +32,7 @@ server:

# Embedded PostgreSQL for development/demo
postgresql:
priorityClassName: hyperfleet-critical
enabled: true
database:
name: maestro
Expand All @@ -44,6 +46,7 @@ server:

# Embedded Mosquitto MQTT broker for development/demo
mosquitto:
priorityClassName: hyperfleet-critical
enabled: true
service:
name: maestro-mqtt
Expand All @@ -65,6 +68,8 @@ agent:
enabled: true
environment: production

priorityClassName: hyperfleet-critical

consumerName: "cluster1"
cloudeventsClientId: "cluster1-work-agent"

Expand Down
7 changes: 7 additions & 0 deletions manifests/priority-classes.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
apiVersion: scheduling.k8s.io/v1
kind: PriorityClass
metadata:
name: hyperfleet-critical
value: 1000000000
globalDefault: false
description: "HyperFleet critical infrastructure pods — above default but below system-critical"