diff --git a/src/cassandra/Makefile b/src/cassandra/Makefile index 5f62a95..9eb76f6 100644 --- a/src/cassandra/Makefile +++ b/src/cassandra/Makefile @@ -8,18 +8,20 @@ HELM_OCI_REGISTRY ?= HELM_OCI_NAMESPACE ?= HELM_OCI_USERNAME ?= HELM_OCI_PASSWORD ?= +HELM_REPO_NAME ?= k8ssandra +HELM_REPO_URL ?= https://helm.k8ssandra.io/stable # Operator configuration OPERATOR_RELEASE_NAME ?= k8ssandra-operator OPERATOR_NAMESPACE ?= k8ssandra-operator -OPERATOR_CHART_REPO ?= k8ssandra/k8ssandra-operator +OPERATOR_CHART_REPO ?= $(HELM_REPO_NAME)/k8ssandra-operator OPERATOR_CHART_VERSION ?= OPERATOR_VALUES_FILE ?= ./values.yaml # Cluster configuration CLUSTER_RELEASE_NAME ?= cassandra-cluster -CLUSTER_CHART_REPO ?= k8ssandra/k8ssandra -CLUSTER_VALUES_FILE ?= ./values-cluster.yaml +CLUSTER_CHART_REPO ?= $(HELM_REPO_NAME)/k8ssandra +CLUSTER_VALUES_FILE ?= ./cluster-values.yaml # Enable CRD waiting WAIT_FOR_CRD ?= true diff --git a/src/duckdb/Makefile b/src/duckdb/Makefile index 73b05ef..3d16e4e 100644 --- a/src/duckdb/Makefile +++ b/src/duckdb/Makefile @@ -1,5 +1,5 @@ HELM_RELEASE_NAME ?= duckdb -HELM_APPLICATION_NAME ?= duckdb +HELM_APPLICATION_NAME ?= jupyterhub HELM_NAMESPACE ?= duckdb HELM_DIR ?= ./helm HELM_CHART_VERSION ?= @@ -10,6 +10,6 @@ HELM_OCI_USERNAME ?= HELM_OCI_PASSWORD ?= HELM_REPO_NAME ?= jupyterhub HELM_REPO_URL ?= https://hub.jupyter.org/helm-chart/ -HELM_CHART_REPO ?= $(HELM_REPO_NAME)/jupyterhub +HELM_CHART_REPO ?= $(HELM_REPO_NAME)/$(HELM_APPLICATION_NAME) include ../_template/base.mk diff --git a/src/flink/Makefile b/src/flink/Makefile index 8fd7382..dbd6d8d 100644 --- a/src/flink/Makefile +++ b/src/flink/Makefile @@ -8,18 +8,20 @@ HELM_OCI_REGISTRY ?= HELM_OCI_NAMESPACE ?= HELM_OCI_USERNAME ?= HELM_OCI_PASSWORD ?= +HELM_REPO_NAME ?= flink-operator +HELM_REPO_URL ?= https://downloads.apache.org/flink/flink-kubernetes-operator-1.9.0/ # Operator configuration OPERATOR_RELEASE_NAME ?= flink-operator OPERATOR_NAMESPACE ?= flink-operator -OPERATOR_CHART_REPO ?= flink-operator/flink-operator +OPERATOR_CHART_REPO ?= $(HELM_REPO_NAME)/flink-operator OPERATOR_CHART_VERSION ?= OPERATOR_VALUES_FILE ?= ./values.yaml # Cluster configuration (Flink uses FlinkDeployment CR, installed via kubectl or separate chart) CLUSTER_RELEASE_NAME ?= flink-cluster -CLUSTER_CHART_REPO ?= flink-operator/flink-cluster -CLUSTER_VALUES_FILE ?= ./values-cluster.yaml +CLUSTER_CHART_REPO ?= $(HELM_REPO_NAME)/flink-cluster +CLUSTER_VALUES_FILE ?= ./cluster-values.yaml # Enable CRD waiting WAIT_FOR_CRD ?= true diff --git a/src/gitea-runner/Makefile b/src/gitea-runner/Makefile index 1dee121..95660f5 100644 --- a/src/gitea-runner/Makefile +++ b/src/gitea-runner/Makefile @@ -1,5 +1,5 @@ HELM_RELEASE_NAME ?= gitea-runner -HELM_APPLICATION_NAME ?= gitea-runner +HELM_APPLICATION_NAME ?= actions HELM_NAMESPACE ?= gitea-runner HELM_DIR ?= ./helm HELM_CHART_VERSION ?= @@ -10,6 +10,6 @@ HELM_OCI_USERNAME ?= HELM_OCI_PASSWORD ?= HELM_REPO_NAME ?= gitea HELM_REPO_URL ?= https://dl.gitea.com/charts -HELM_CHART_REPO ?= $(HELM_REPO_NAME)/actions +HELM_CHART_REPO ?= $(HELM_REPO_NAME)/$(HELM_APPLICATION_NAME) include ../_template/base.mk diff --git a/src/kafka/Makefile b/src/kafka/Makefile index 5007441..8c3fd25 100644 --- a/src/kafka/Makefile +++ b/src/kafka/Makefile @@ -12,7 +12,7 @@ HELM_REPO_URL ?= https://strimzi.io/charts/ # Operator configuration (Strimzi only has operator, cluster is created via CRDs) OPERATOR_RELEASE_NAME ?= strimzi-kafka-operator OPERATOR_NAMESPACE ?= strimzi-operator -OPERATOR_CHART_REPO ?= strimzi/strimzi-kafka-operator +OPERATOR_CHART_REPO ?= $(HELM_REPO_NAME)/strimzi-kafka-operator OPERATOR_CHART_VERSION ?= $(HELM_CHART_VERSION) OPERATOR_VALUES_FILE ?= ./values.yaml diff --git a/src/mysql/Makefile b/src/mysql/Makefile index 453087e..98c0e90 100644 --- a/src/mysql/Makefile +++ b/src/mysql/Makefile @@ -8,17 +8,19 @@ HELM_OCI_REGISTRY ?= HELM_OCI_NAMESPACE ?= HELM_OCI_USERNAME ?= HELM_OCI_PASSWORD ?= +HELM_REPO_NAME ?= mysql-operator +HELM_REPO_URL ?= https://mysql.github.io/mysql-operator/ # Operator configuration OPERATOR_RELEASE_NAME ?= mysql-operator OPERATOR_NAMESPACE ?= mysql-operator -OPERATOR_CHART_REPO ?= mysql-operator/mysql-operator +OPERATOR_CHART_REPO ?= $(HELM_REPO_NAME)/mysql-operator OPERATOR_CHART_VERSION ?= OPERATOR_VALUES_FILE ?= # Cluster configuration CLUSTER_RELEASE_NAME ?= mysql-cluster -CLUSTER_CHART_REPO ?= mysql-operator/mysql-innodbcluster +CLUSTER_CHART_REPO ?= $(HELM_REPO_NAME)/mysql-innodbcluster CLUSTER_VALUES_FILE ?= ./values.yaml # Enable CRD waiting diff --git a/src/nebulagraph/Makefile b/src/nebulagraph/Makefile index 9d437d2..3d6525d 100644 --- a/src/nebulagraph/Makefile +++ b/src/nebulagraph/Makefile @@ -8,17 +8,19 @@ HELM_OCI_REGISTRY ?= HELM_OCI_NAMESPACE ?= HELM_OCI_USERNAME ?= HELM_OCI_PASSWORD ?= +HELM_REPO_NAME ?= nebula-operator +HELM_REPO_URL ?= https://vesoft-inc.github.io/nebula-operator/charts # Operator configuration OPERATOR_RELEASE_NAME ?= nebula-operator OPERATOR_NAMESPACE ?= nebula-operator-system -OPERATOR_CHART_REPO ?= nebula-operator/nebula-operator +OPERATOR_CHART_REPO ?= $(HELM_REPO_NAME)/nebula-operator OPERATOR_CHART_VERSION ?= OPERATOR_VALUES_FILE ?= # Cluster configuration CLUSTER_RELEASE_NAME ?= nebula-cluster -CLUSTER_CHART_REPO ?= nebula-operator/nebula-cluster +CLUSTER_CHART_REPO ?= $(HELM_REPO_NAME)/nebula-cluster CLUSTER_VALUES_FILE ?= ./values.yaml # Enable CRD waiting diff --git a/src/rainbond/Makefile b/src/rainbond/Makefile index 41c717a..0364b33 100644 --- a/src/rainbond/Makefile +++ b/src/rainbond/Makefile @@ -10,6 +10,6 @@ HELM_OCI_USERNAME ?= HELM_OCI_PASSWORD ?= HELM_REPO_NAME ?= goodrain HELM_REPO_URL ?= https://openchart.goodrain.com/goodrain/rainbond -HELM_CHART_REPO ?= goodrain/rainbond +HELM_CHART_REPO ?= $(HELM_REPO_NAME)/$(HELM_APPLICATION_NAME) include ../_template/base.mk