diff --git a/packages/apps/Makefile b/packages/apps/Makefile index 506c8750..de61e3fa 100644 --- a/packages/apps/Makefile +++ b/packages/apps/Makefile @@ -11,7 +11,7 @@ repo: rm -rf "$(TMP)" fix-chartnames: - find . -maxdepth 2 -name Chart.yaml | awk -F/ '{print $$2}' | while read i; do sed -i "s/^name: .*/name: $$i/" "$$i/Chart.yaml"; done + find . -maxdepth 2 -name Chart.yaml | awk -F/ '{print $$2}' | while read i; do sed "s/^name: .*/name: $$i/" "$$i/Chart.yaml"; done gen-versions-map: fix-chartnames ../../hack/gen_versions_map.sh diff --git a/packages/core/installer/values.yaml b/packages/core/installer/values.yaml index ef6c1362..e85bc2d5 100644 --- a/packages/core/installer/values.yaml +++ b/packages/core/installer/values.yaml @@ -1,2 +1,2 @@ cozystack: - image: ghcr.io/aenix-io/cozystack/cozystack:v0.14.1@sha256:13c318a7946696933a2c190a59e1fa3df352a70a95ef341e3a5632226e338f1c + image: harbor.cp.if.ua/cozystack/cozystack:latest@sha256:99d721e847cb28350f31459175e25c7a57dab8ac82bab7d5a5fe112eb382e343 diff --git a/packages/extra/Makefile b/packages/extra/Makefile index 5586c59e..7212987d 100644 --- a/packages/extra/Makefile +++ b/packages/extra/Makefile @@ -11,7 +11,7 @@ repo: rm -rf "$(TMP)" fix-chartnames: - find . -maxdepth 2 -name Chart.yaml | awk -F/ '{print $$2}' | while read i; do sed -i "s/^name: .*/name: $$i/" "$$i/Chart.yaml"; done + find . -maxdepth 2 -name Chart.yaml | awk -F/ '{print $$2}' | while read i; do sed "s/^name: .*/name: $$i/" "$$i/Chart.yaml"; done gen-versions-map: fix-chartnames ../../hack/gen_versions_map.sh diff --git a/packages/system/capi-providers/templates/providers.yaml b/packages/system/capi-providers/templates/providers.yaml index 802ece2b..9679cfca 100644 --- a/packages/system/capi-providers/templates/providers.yaml +++ b/packages/system/capi-providers/templates/providers.yaml @@ -22,6 +22,8 @@ metadata: spec: # https://github.com/kubernetes-sigs/cluster-api version: v1.7.3 + +{{- if .Values.providers.kubevirt }} --- apiVersion: operator.cluster.x-k8s.io/v1alpha2 kind: InfrastructureProvider @@ -30,6 +32,9 @@ metadata: spec: # https://github.com/kubernetes-sigs/cluster-api-provider-kubevirt version: v0.1.8 +{{- end }} + +{{- if .Values.providers.proxmox }} --- apiVersion: operator.cluster.x-k8s.io/v1alpha2 kind: InfrastructureProvider @@ -38,11 +43,15 @@ metadata: spec: # https://github.com/ionos-cloud/cluster-api-provider-proxmox version: v0.5.1 +{{- end }} + +{{- if .Values.providers.hetzner }} --- apiVersion: operator.cluster.x-k8s.io/v1alpha2 -kind: ProxmoxProvider +kind: InfrastructureProvider metadata: - name: proxmox + name: hetzner spec: - # https://github.com/ionos-cloud/cluster-api-provider-proxmox - version: v0.5.1 + # https://github.com/syself/cluster-api-provider-hetzner + version: v1.0.0-beta.40 +{{- end }} diff --git a/packages/system/capi-providers/values.yaml b/packages/system/capi-providers/values.yaml new file mode 100644 index 00000000..63c6a7b2 --- /dev/null +++ b/packages/system/capi-providers/values.yaml @@ -0,0 +1,4 @@ +providers: + kubevirt: true + proxmox: true + hetzner: false \ No newline at end of file