This repository was archived by the owner on Sep 9, 2026. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 82
OSAC-22: Create OSAC umbrella Helm chart and installer tooling #98
Merged
openshift-merge-bot
merged 4 commits into
osac-project:main
from
eliorerz:OSAC-693-create-osac-umbrella-helm-chart
May 21, 2026
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
6d2b8d3
OSAC-693: Create OSAC umbrella Helm chart
eliorerz 6951a60
OSAC-694: Add values files, setup script, and Makefile
eliorerz 7fd2101
OSAC-696: Add Helm CI workflows
eliorerz 35c1c21
OSAC-693: Add deployment guide, update README, bump submodules
eliorerz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| name: Helm Integration Test | ||
|
|
||
| on: | ||
| schedule: | ||
| # Run daily at 06:00 UTC | ||
| - cron: '0 6 * * *' | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| integration-test: | ||
| name: Deploy to Kind Cluster | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 | ||
| with: | ||
| submodules: recursive | ||
| persist-credentials: false | ||
|
|
||
| - name: Update submodules to pinned commits | ||
| run: git submodule update --init --recursive | ||
|
|
||
| - name: Set up Helm | ||
| uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4 | ||
| with: | ||
| version: v3.17.0 | ||
|
|
||
| - name: Create Kind cluster | ||
| uses: helm/kind-action@ef37e7f390d99f746eb8b610417061a60e82a6cc # v1 | ||
| with: | ||
| cluster_name: osac-integration | ||
|
|
||
| - name: Install cert-manager | ||
| run: | | ||
| kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.17.1/cert-manager.yaml | ||
| kubectl wait --for=condition=Available deployment/cert-manager -n cert-manager --timeout=120s | ||
| kubectl wait --for=condition=Available deployment/cert-manager-webhook -n cert-manager --timeout=120s | ||
| kubectl wait --for=condition=Available deployment/cert-manager-cainjector -n cert-manager --timeout=120s | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
|
|
||
| - name: Build chart dependencies | ||
| run: helm dependency build charts/osac/ | ||
|
|
||
| - name: Lint chart | ||
| run: helm lint charts/osac/ | ||
|
|
||
| - name: Template chart (dry-run validation) | ||
| run: helm template osac charts/osac/ --values values/development.yaml > /dev/null | ||
|
|
||
| - name: Deploy umbrella chart | ||
| continue-on-error: true | ||
| run: | | ||
| helm install osac charts/osac/ \ | ||
| --namespace osac \ | ||
| --create-namespace \ | ||
| --values values/development.yaml \ | ||
| --set validation.enabled=false \ | ||
| --set aap.bootstrap.enabled=false \ | ||
| --set aap.aap.instance.enabled=false \ | ||
| --set dbMigrate.enabled=false \ | ||
| --timeout 10m \ | ||
| --wait | ||
|
|
||
| - name: Check deployed resources | ||
| if: always() | ||
| run: | | ||
| echo "=== Pods ===" | ||
| kubectl get pods -n osac 2>/dev/null || true | ||
| echo "=== Deployments ===" | ||
| kubectl get deployments -n osac 2>/dev/null || true | ||
| echo "=== Services ===" | ||
| kubectl get services -n osac 2>/dev/null || true | ||
| echo "=== Helm status ===" | ||
| helm status osac -n osac 2>/dev/null || true | ||
|
|
||
| - name: Test idempotency (helm upgrade with no changes) | ||
| continue-on-error: true | ||
| run: | | ||
| helm upgrade osac charts/osac/ \ | ||
| --namespace osac \ | ||
| --values values/development.yaml \ | ||
| --set validation.enabled=false \ | ||
| --set aap.bootstrap.enabled=false \ | ||
| --set aap.aap.instance.enabled=false \ | ||
| --set dbMigrate.enabled=false \ | ||
| --timeout 10m \ | ||
| --wait | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| name: Helm Lint | ||
|
|
||
| on: | ||
| pull_request: | ||
|
|
||
| concurrency: | ||
| group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} | ||
| cancel-in-progress: true | ||
|
|
||
| jobs: | ||
| helm-lint: | ||
| name: Lint Helm Charts | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 | ||
| with: | ||
| submodules: recursive | ||
| persist-credentials: false | ||
|
|
||
| - name: Set up Helm | ||
| uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4 | ||
| with: | ||
| version: v3.17.0 | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
|
|
||
| - name: Build chart dependencies | ||
| run: helm dependency build charts/osac/ | ||
|
|
||
| - name: Lint umbrella chart | ||
| run: helm lint charts/osac/ | ||
|
|
||
| - name: Template umbrella chart (dry-run) | ||
| run: helm template osac charts/osac/ --values values/development.yaml > /dev/null | ||
|
|
||
| - name: Validate values schema | ||
| run: | | ||
| # Ensure values.schema.json is valid JSON | ||
| python3 -m json.tool charts/osac/values.schema.json > /dev/null | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| INSTALLER_NAMESPACE ?= osac | ||
| VALUES_FILE ?= values/development.yaml | ||
| DEPLOY_MODE ?= helm | ||
|
|
||
| .PHONY: help | ||
| help: ## Display this help | ||
| @awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m<target>\033[0m\n\nTargets:\n"} /^[a-zA-Z_-]+:.*?##/ { printf " \033[36m%-20s\033[0m %s\n", $$1, $$2 }' $(MAKEFILE_LIST) | ||
|
|
||
| ##@ Helm Chart Management | ||
|
|
||
| .PHONY: sync-charts | ||
| sync-charts: ## Update submodules to latest main and rebuild chart dependencies | ||
| git submodule update --init --recursive --remote | ||
| helm dependency build charts/osac/ | ||
|
|
||
| .PHONY: helm-deps | ||
| helm-deps: ## Build Helm chart dependencies | ||
| helm dependency build charts/osac/ | ||
|
|
||
| .PHONY: helm-lint | ||
| helm-lint: ## Lint the umbrella chart | ||
| helm dependency build charts/osac/ | ||
| helm lint charts/osac/ | ||
|
|
||
| .PHONY: helm-template | ||
| helm-template: ## Dry-run render all templates | ||
| helm dependency build charts/osac/ | ||
| helm template osac charts/osac/ --values $(VALUES_FILE) | ||
|
|
||
| ##@ Deployment | ||
|
|
||
| .PHONY: helm-deploy | ||
| helm-deploy: ## Deploy OSAC to current cluster using Helm | ||
| helm dependency build charts/osac/ | ||
| helm upgrade --install osac charts/osac/ \ | ||
| --namespace $(INSTALLER_NAMESPACE) \ | ||
| --create-namespace \ | ||
| --values $(VALUES_FILE) \ | ||
| --timeout 40m \ | ||
| --wait | ||
|
|
||
| .PHONY: helm-undeploy | ||
| helm-undeploy: ## Uninstall OSAC from current cluster | ||
| helm uninstall osac --namespace $(INSTALLER_NAMESPACE) | ||
|
|
||
| .PHONY: setup | ||
| setup: ## Run setup.sh with DEPLOY_MODE=helm | ||
| DEPLOY_MODE=$(DEPLOY_MODE) ./scripts/setup.sh | ||
|
|
||
| .PHONY: teardown | ||
| teardown: ## Teardown OSAC deployment | ||
| ./scripts/teardown.sh | ||
|
|
||
| ##@ Validation | ||
|
|
||
| .PHONY: helm-validate | ||
| helm-validate: helm-lint ## Validate Helm chart (lint + template) | ||
| helm template osac charts/osac/ --values $(VALUES_FILE) > /dev/null | ||
| @echo "Validation passed." |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.