From 91e02df818b580f25d13855ae952a70c21691bf5 Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Sun, 29 Oct 2023 18:22:06 -0700 Subject: [PATCH] Use appscode oci repo for all helm charts (#249) Signed-off-by: Tamal Saha --- apis/installer/v1alpha1/ace_options_types.go | 22 --------- charts/ace-installer/README.md | 1 - .../templates/apps/kubeops/reloader.yaml | 2 +- .../templates/repositories/repositories.yaml | 1 - charts/ace-installer/values.yaml | 2 - charts/opscenter-features/README.md | 46 ++++++++----------- .../dbaas-capa/aws-ebs-csi-driver.yaml | 2 +- .../dbaas-capa/cluster-autoscaler.yaml | 2 +- .../featuresets/dbaas-capa/crossplane.yaml | 4 +- .../featuresets/dbaas-capg/crossplane.yaml | 4 +- .../featuresets/dbaas-capz/crossplane.yaml | 4 +- .../featuresets/opscenter-core/flux2.yaml | 2 +- .../opscenter-cost/keda-add-ons-http.yaml | 4 +- .../featuresets/opscenter-cost/keda.yaml | 4 +- .../kubeform/crossplane.yaml | 4 +- .../kube-prometheus-stack.yaml | 4 +- .../cert-manager/cert-manager.yaml | 2 +- .../opscenter-security/falco/falco.yaml | 4 +- .../gatekeeper/gatekeeper.yaml | 4 +- charts/opscenter-features/values.yaml | 20 -------- .../ace-options/values.openapiv3_schema.yaml | 22 --------- 21 files changed, 41 insertions(+), 119 deletions(-) diff --git a/apis/installer/v1alpha1/ace_options_types.go b/apis/installer/v1alpha1/ace_options_types.go index 536511452..eb5bbf530 100644 --- a/apis/installer/v1alpha1/ace_options_types.go +++ b/apis/installer/v1alpha1/ace_options_types.go @@ -86,28 +86,6 @@ type HelmRepositories struct { AppscodeChartsLegacy string `json:"appscode-charts-legacy"` //+optional AppscodeChartsOci string `json:"appscode-charts-oci"` - //+optional - AwsEbsCsiDriver string `json:"aws-ebs-csi-driver"` - //+optional - CertManager string `json:"cert-manager"` - //+optional - ClusterAutoscaler string `json:"cluster-autoscaler"` - //+optional - Crossplane string `json:"crossplane"` - //+optional - Falcosecurity string `json:"falcosecurity"` - //+optional - FluxcdCommunity string `json:"fluxcd-community"` - //+optional - Gatekeeper string `json:"gatekeeper"` - //+optional - Kedacore string `json:"kedacore"` - //+optional - Nats string `json:"nats"` - //+optional - PrometheusCommunity string `json:"prometheus-community"` - //+optional - Stakater string `json:"stakater"` } type AceOptionsComponentSpec struct { diff --git a/charts/ace-installer/README.md b/charts/ace-installer/README.md index 85cfbb149..0cecdda49 100644 --- a/charts/ace-installer/README.md +++ b/charts/ace-installer/README.md @@ -58,7 +58,6 @@ The following table lists the configurable parameters of the `ace-installer` cha | image.proxies.kubernetes | registry.k8s.io/bin:tag | registry.k8s.io | | registry.credentials | | {} | | helm.repositories.appscode-charts-oci.url | | oci://r.appscode.com/charts | -| helm.repositories.stakater.url | | https://stakater.github.io/stakater-charts | | helm.releases.ace.enabled | | false | | helm.releases.ace.version | | "v2023.10.18" | | helm.releases.cert-manager-csi-driver-cacerts.enabled | | true | diff --git a/charts/ace-installer/templates/apps/kubeops/reloader.yaml b/charts/ace-installer/templates/apps/kubeops/reloader.yaml index 8ac3a20b4..ca953ea69 100644 --- a/charts/ace-installer/templates/apps/kubeops/reloader.yaml +++ b/charts/ace-installer/templates/apps/kubeops/reloader.yaml @@ -41,7 +41,7 @@ spec: interval: 60m sourceRef: kind: HelmRepository - name: stakater + name: appscode-charts-oci namespace: {{ $.Release.Namespace }} {{- with $vals }} {{- dict "values" . | toYaml | nindent 2 }} diff --git a/charts/ace-installer/templates/repositories/repositories.yaml b/charts/ace-installer/templates/repositories/repositories.yaml index b7b51a529..b92ade940 100644 --- a/charts/ace-installer/templates/repositories/repositories.yaml +++ b/charts/ace-installer/templates/repositories/repositories.yaml @@ -1,6 +1,5 @@ {{ $helmrepos := dict "bootstrap" (index .Values.helm "repositories" "appscode-charts-oci") - "stakater" (index .Values.helm "repositories" "stakater") }} {{ range $name, $cfg := $helmrepos }} diff --git a/charts/ace-installer/values.yaml b/charts/ace-installer/values.yaml index 8331916c2..0c2c42e49 100644 --- a/charts/ace-installer/values.yaml +++ b/charts/ace-installer/values.yaml @@ -44,8 +44,6 @@ helm: repositories: appscode-charts-oci: url: oci://r.appscode.com/charts - stakater: - url: https://stakater.github.io/stakater-charts releases: ace: diff --git a/charts/opscenter-features/README.md b/charts/opscenter-features/README.md index 23ea112ea..febaa29e1 100644 --- a/charts/opscenter-features/README.md +++ b/charts/opscenter-features/README.md @@ -45,34 +45,24 @@ The command removes all the Kubernetes components associated with the chart and The following table lists the configurable parameters of the `opscenter-features` chart and their default values. -| Parameter | Description | Default | -|----------------------------------------------|-------------------------|--------------------------------------------------------------------| -| nameOverride | | "" | -| fullnameOverride | | "" | -| image.registryFQDN | | "" | -| image.proxies.appscode | r.appscode.com | r.appscode.com | -| image.proxies.dockerHub | company/bin:tag | "" | -| image.proxies.dockerLibrary | alpine, nginx etc. | "" | -| image.proxies.ghcr | ghcr.io/company/bin:tag | ghcr.io | -| image.proxies.quay | quay.io/company/bin:tag | quay.io | -| image.proxies.kubernetes | registry.k8s.io/bin:tag | registry.k8s.io | -| registry.credentials | | {} | -| helm.repositories.appscode-charts-legacy.url | | https://charts.appscode.com/stable | -| helm.repositories.appscode-charts-oci.url | | oci://r.appscode.com/charts | -| helm.repositories.aws-ebs-csi-driver.url | | https://kubernetes-sigs.github.io/aws-ebs-csi-driver | -| helm.repositories.cert-manager.url | | https://charts.jetstack.io | -| helm.repositories.cluster-autoscaler.url | | https://kubernetes.github.io/autoscaler | -| helm.repositories.crossplane.url | | https://charts.crossplane.io/stable | -| helm.repositories.falcosecurity.url | | https://falcosecurity.github.io/charts | -| helm.repositories.fluxcd-community.url | | https://fluxcd-community.github.io/helm-charts | -| helm.repositories.gatekeeper.url | | https://open-policy-agent.github.io/gatekeeper/charts | -| helm.repositories.kedacore.url | | https://kedacore.github.io/charts | -| helm.repositories.nats.url | | https://nats-io.github.io/k8s/helm/charts | -| helm.repositories.prometheus-community.url | | https://prometheus-community.github.io/helm-charts | -| clusterManagers | | [] | -| capi.provider | | "" | -| capi.namespace | | "" | -| capi.clusterName | | "" | +| Parameter | Description | Default | +|----------------------------------------------|-------------------------|-------------------------------------------------| +| nameOverride | | "" | +| fullnameOverride | | "" | +| image.registryFQDN | | "" | +| image.proxies.appscode | r.appscode.com | r.appscode.com | +| image.proxies.dockerHub | company/bin:tag | "" | +| image.proxies.dockerLibrary | alpine, nginx etc. | "" | +| image.proxies.ghcr | ghcr.io/company/bin:tag | ghcr.io | +| image.proxies.quay | quay.io/company/bin:tag | quay.io | +| image.proxies.kubernetes | registry.k8s.io/bin:tag | registry.k8s.io | +| registry.credentials | | {} | +| helm.repositories.appscode-charts-legacy.url | | https://charts.appscode.com/stable | +| helm.repositories.appscode-charts-oci.url | | oci://r.appscode.com/charts | +| clusterManagers | | [] | +| capi.provider | | "" | +| capi.namespace | | "" | +| capi.clusterName | | "" | Specify each parameter using the `--set key=value[,key=value]` argument to `helm upgrade -i`. For example: diff --git a/charts/opscenter-features/templates/featuresets/dbaas-capa/aws-ebs-csi-driver.yaml b/charts/opscenter-features/templates/featuresets/dbaas-capa/aws-ebs-csi-driver.yaml index c3f256069..adc7d3f64 100644 --- a/charts/opscenter-features/templates/featuresets/dbaas-capa/aws-ebs-csi-driver.yaml +++ b/charts/opscenter-features/templates/featuresets/dbaas-capa/aws-ebs-csi-driver.yaml @@ -30,7 +30,7 @@ spec: version: "2.23.0" sourceRef: kind: HelmRepository - name: aws-ebs-csi-driver + name: appscode-charts-oci namespace: {{ .Release.Namespace }} {{- end }} diff --git a/charts/opscenter-features/templates/featuresets/dbaas-capa/cluster-autoscaler.yaml b/charts/opscenter-features/templates/featuresets/dbaas-capa/cluster-autoscaler.yaml index 977212dfb..3602685fe 100644 --- a/charts/opscenter-features/templates/featuresets/dbaas-capa/cluster-autoscaler.yaml +++ b/charts/opscenter-features/templates/featuresets/dbaas-capa/cluster-autoscaler.yaml @@ -48,7 +48,7 @@ spec: version: "9.29.0" sourceRef: kind: HelmRepository - name: cluster-autoscaler + name: appscode-charts-oci namespace: {{ .Release.Namespace }} {{- with $vals }} {{- dict "values" . | toYaml | nindent 2 }} diff --git a/charts/opscenter-features/templates/featuresets/dbaas-capa/crossplane.yaml b/charts/opscenter-features/templates/featuresets/dbaas-capa/crossplane.yaml index 07684b9f8..369e79360 100644 --- a/charts/opscenter-features/templates/featuresets/dbaas-capa/crossplane.yaml +++ b/charts/opscenter-features/templates/featuresets/dbaas-capa/crossplane.yaml @@ -35,10 +35,10 @@ spec: chart: name: crossplane namespace: crossplane-system - version: "1.12.2" + version: "1.13.2" sourceRef: kind: HelmRepository - name: crossplane + name: appscode-charts-oci namespace: {{ .Release.Namespace }} {{- with $vals }} {{- dict "values" . | toYaml | nindent 2 }} diff --git a/charts/opscenter-features/templates/featuresets/dbaas-capg/crossplane.yaml b/charts/opscenter-features/templates/featuresets/dbaas-capg/crossplane.yaml index 64edbd80f..8863f419b 100644 --- a/charts/opscenter-features/templates/featuresets/dbaas-capg/crossplane.yaml +++ b/charts/opscenter-features/templates/featuresets/dbaas-capg/crossplane.yaml @@ -35,10 +35,10 @@ spec: chart: name: crossplane namespace: crossplane-system - version: "1.12.2" + version: "1.13.2" sourceRef: kind: HelmRepository - name: crossplane + name: appscode-charts-oci namespace: {{ .Release.Namespace }} {{- with $vals }} {{- dict "values" . | toYaml | nindent 2 }} diff --git a/charts/opscenter-features/templates/featuresets/dbaas-capz/crossplane.yaml b/charts/opscenter-features/templates/featuresets/dbaas-capz/crossplane.yaml index fb1f50e13..299fa2588 100644 --- a/charts/opscenter-features/templates/featuresets/dbaas-capz/crossplane.yaml +++ b/charts/opscenter-features/templates/featuresets/dbaas-capz/crossplane.yaml @@ -35,10 +35,10 @@ spec: chart: name: crossplane namespace: crossplane-system - version: "1.12.2" + version: "1.13.2" sourceRef: kind: HelmRepository - name: crossplane + name: appscode-charts-oci namespace: {{ .Release.Namespace }} {{- with $vals }} {{- dict "values" . | toYaml | nindent 2 }} diff --git a/charts/opscenter-features/templates/featuresets/opscenter-core/flux2.yaml b/charts/opscenter-features/templates/featuresets/opscenter-core/flux2.yaml index 89c744026..8e394a723 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-core/flux2.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-core/flux2.yaml @@ -70,7 +70,7 @@ spec: chart: name: flux2 namespace: kubeops - version: "" + version: "2.10.6" sourceRef: kind: HelmRepository name: fluxcd-community diff --git a/charts/opscenter-features/templates/featuresets/opscenter-cost/keda-add-ons-http.yaml b/charts/opscenter-features/templates/featuresets/opscenter-cost/keda-add-ons-http.yaml index 3fc4d3f7b..5761a50a9 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-cost/keda-add-ons-http.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-cost/keda-add-ons-http.yaml @@ -64,10 +64,10 @@ spec: chart: name: keda-add-ons-http namespace: keda - # version: "" + version: "0.6.0" sourceRef: kind: HelmRepository - name: kedacore + name: appscode-charts-oci namespace: {{ .Release.Namespace }} {{- with $vals }} {{- dict "values" . | toYaml | nindent 2 }} diff --git a/charts/opscenter-features/templates/featuresets/opscenter-cost/keda.yaml b/charts/opscenter-features/templates/featuresets/opscenter-cost/keda.yaml index 2cb8b2d22..767911cc1 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-cost/keda.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-cost/keda.yaml @@ -54,10 +54,10 @@ spec: chart: name: keda namespace: keda - # version: "" + version: "2.12.0" sourceRef: kind: HelmRepository - name: kedacore + name: appscode-charts-oci namespace: {{ .Release.Namespace }} {{- with $vals }} {{- dict "values" . | toYaml | nindent 2 }} diff --git a/charts/opscenter-features/templates/featuresets/opscenter-datastore/kubeform/crossplane.yaml b/charts/opscenter-features/templates/featuresets/opscenter-datastore/kubeform/crossplane.yaml index 05acf9a2d..3ab342c14 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-datastore/kubeform/crossplane.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-datastore/kubeform/crossplane.yaml @@ -35,10 +35,10 @@ spec: chart: name: crossplane namespace: crossplane-system - version: "1.12.2" + version: "1.13.2" sourceRef: kind: HelmRepository - name: crossplane + name: appscode-charts-oci namespace: {{ .Release.Namespace }} {{- with $vals }} {{- dict "values" . | toYaml | nindent 2 }} diff --git a/charts/opscenter-features/templates/featuresets/opscenter-monitoring/kube-prometheus-stack.yaml b/charts/opscenter-features/templates/featuresets/opscenter-monitoring/kube-prometheus-stack.yaml index e6e446210..61ac5cec3 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-monitoring/kube-prometheus-stack.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-monitoring/kube-prometheus-stack.yaml @@ -105,10 +105,10 @@ spec: chart: name: kube-prometheus-stack namespace: monitoring - version: "45.0.0" + version: "52.1.0" sourceRef: kind: HelmRepository - name: prometheus-community + name: appscode-charts-oci namespace: {{ .Release.Namespace }} {{- with $vals }} {{- dict "values" . | toYaml | nindent 2 }} diff --git a/charts/opscenter-features/templates/featuresets/opscenter-security/cert-manager/cert-manager.yaml b/charts/opscenter-features/templates/featuresets/opscenter-security/cert-manager/cert-manager.yaml index ed994e37f..b738bc6fd 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-security/cert-manager/cert-manager.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-security/cert-manager/cert-manager.yaml @@ -48,7 +48,7 @@ spec: version: "v1.11.0" sourceRef: kind: HelmRepository - name: cert-manager + name: appscode-charts-oci namespace: {{ .Release.Namespace }} {{- with $vals }} {{- dict "values" . | toYaml | nindent 2 }} diff --git a/charts/opscenter-features/templates/featuresets/opscenter-security/falco/falco.yaml b/charts/opscenter-features/templates/featuresets/opscenter-security/falco/falco.yaml index 873a82c98..a62e0d267 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-security/falco/falco.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-security/falco/falco.yaml @@ -67,10 +67,10 @@ spec: chart: name: falco namespace: falco - # version: "v2023.10.1" + version: "3.8.4" sourceRef: kind: HelmRepository - name: falcosecurity + name: appscode-charts-oci namespace: {{ .Release.Namespace }} {{- with $vals }} {{- dict "values" . | toYaml | nindent 2 }} diff --git a/charts/opscenter-features/templates/featuresets/opscenter-security/gatekeeper/gatekeeper.yaml b/charts/opscenter-features/templates/featuresets/opscenter-security/gatekeeper/gatekeeper.yaml index 25e20fcc3..5ac1d6399 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-security/gatekeeper/gatekeeper.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-security/gatekeeper/gatekeeper.yaml @@ -71,10 +71,10 @@ spec: chart: name: gatekeeper namespace: gatekeeper-system - # version: "v2023.10.1" + version: "3.13.3" sourceRef: kind: HelmRepository - name: gatekeeper + name: appscode-charts-oci namespace: {{ .Release.Namespace }} {{- with $vals }} {{- dict "values" . | toYaml | nindent 2 }} diff --git a/charts/opscenter-features/values.yaml b/charts/opscenter-features/values.yaml index 2435a1516..da015ba27 100644 --- a/charts/opscenter-features/values.yaml +++ b/charts/opscenter-features/values.yaml @@ -46,26 +46,6 @@ helm: url: https://charts.appscode.com/stable appscode-charts-oci: url: oci://r.appscode.com/charts - aws-ebs-csi-driver: - url: https://kubernetes-sigs.github.io/aws-ebs-csi-driver - cert-manager: - url: https://charts.jetstack.io - cluster-autoscaler: - url: https://kubernetes.github.io/autoscaler - crossplane: - url: https://charts.crossplane.io/stable - falcosecurity: - url: https://falcosecurity.github.io/charts - fluxcd-community: - url: https://fluxcd-community.github.io/helm-charts - gatekeeper: - url: https://open-policy-agent.github.io/gatekeeper/charts - kedacore: - url: https://kedacore.github.io/charts - nats: - url: https://nats-io.github.io/k8s/helm/charts - prometheus-community: - url: https://prometheus-community.github.io/helm-charts clusterManagers: [] diff --git a/schema/ace-options/values.openapiv3_schema.yaml b/schema/ace-options/values.openapiv3_schema.yaml index 7fafb68d9..8f932a45a 100644 --- a/schema/ace-options/values.openapiv3_schema.yaml +++ b/schema/ace-options/values.openapiv3_schema.yaml @@ -1049,28 +1049,6 @@ properties: type: string appscode-charts-oci: type: string - aws-ebs-csi-driver: - type: string - cert-manager: - type: string - cluster-autoscaler: - type: string - crossplane: - type: string - falcosecurity: - type: string - fluxcd-community: - type: string - gatekeeper: - type: string - kedacore: - type: string - nats: - type: string - prometheus-community: - type: string - stakater: - type: string type: object type: object release: