Skip to content

Commit

Permalink
Use appscode oci repo for all helm charts (#249)
Browse files Browse the repository at this point in the history 
Signed-off-by: Tamal Saha <[email protected]>
  • Loading branch information
@tamalsaha
tamalsaha authored Oct 30, 2023
1 parent a19e8c6 commit 91e02df
Show file tree
Hide file tree
Showing 21 changed files with 41 additions and 119 deletions.
22 changes: 0 additions & 22 deletions apis/installer/v1alpha1/ace_options_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion charts/ace-installer/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ The following table lists the configurable parameters of the `ace-installer` cha
| image.proxies.kubernetes | registry.k8s.io/bin:tag | <code>registry.k8s.io</code> |
| registry.credentials | | <code>{}</code> |
| helm.repositories.appscode-charts-oci.url | | <code>oci://r.appscode.com/charts</code> |
| helm.repositories.stakater.url | | <code>https://stakater.github.io/stakater-charts</code> |
| helm.releases.ace.enabled | | <code>false</code> |
| helm.releases.ace.version | | <code>"v2023.10.18"</code> |
| helm.releases.cert-manager-csi-driver-cacerts.enabled | | <code>true</code> |
Expand Down
2 changes: 1 addition & 1 deletion charts/ace-installer/templates/apps/kubeops/reloader.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
1 change: 0 additions & 1 deletion charts/ace-installer/templates/repositories/repositories.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{{ $helmrepos := dict
"bootstrap" (index .Values.helm "repositories" "appscode-charts-oci")
"stakater" (index .Values.helm "repositories" "stakater")
}}

{{ range $name, $cfg := $helmrepos }}
Expand Down
2 changes: 0 additions & 2 deletions charts/ace-installer/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
46 changes: 18 additions & 28 deletions charts/opscenter-features/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 | | <code>""</code> |
| fullnameOverride | | <code>""</code> |
| image.registryFQDN | | <code>""</code> |
| image.proxies.appscode | r.appscode.com | <code>r.appscode.com</code> |
| image.proxies.dockerHub | company/bin:tag | <code>""</code> |
| image.proxies.dockerLibrary | alpine, nginx etc. | <code>""</code> |
| image.proxies.ghcr | ghcr.io/company/bin:tag | <code>ghcr.io</code> |
| image.proxies.quay | quay.io/company/bin:tag | <code>quay.io</code> |
| image.proxies.kubernetes | registry.k8s.io/bin:tag | <code>registry.k8s.io</code> |
| registry.credentials | | <code>{}</code> |
| helm.repositories.appscode-charts-legacy.url | | <code>https://charts.appscode.com/stable</code> |
| helm.repositories.appscode-charts-oci.url | | <code>oci://r.appscode.com/charts</code> |
| helm.repositories.aws-ebs-csi-driver.url | | <code>https://kubernetes-sigs.github.io/aws-ebs-csi-driver</code> |
| helm.repositories.cert-manager.url | | <code>https://charts.jetstack.io</code> |
| helm.repositories.cluster-autoscaler.url | | <code>https://kubernetes.github.io/autoscaler</code> |
| helm.repositories.crossplane.url | | <code>https://charts.crossplane.io/stable</code> |
| helm.repositories.falcosecurity.url | | <code>https://falcosecurity.github.io/charts</code> |
| helm.repositories.fluxcd-community.url | | <code>https://fluxcd-community.github.io/helm-charts</code> |
| helm.repositories.gatekeeper.url | | <code>https://open-policy-agent.github.io/gatekeeper/charts</code> |
| helm.repositories.kedacore.url | | <code>https://kedacore.github.io/charts</code> |
| helm.repositories.nats.url | | <code>https://nats-io.github.io/k8s/helm/charts</code> |
| helm.repositories.prometheus-community.url | | <code>https://prometheus-community.github.io/helm-charts</code> |
| clusterManagers | | <code>[]</code> |
| capi.provider | | <code>""</code> |
| capi.namespace | | <code>""</code> |
| capi.clusterName | | <code>""</code> |
| Parameter | Description | Default |
|----------------------------------------------|-------------------------|-------------------------------------------------|
| nameOverride | | <code>""</code> |
| fullnameOverride | | <code>""</code> |
| image.registryFQDN | | <code>""</code> |
| image.proxies.appscode | r.appscode.com | <code>r.appscode.com</code> |
| image.proxies.dockerHub | company/bin:tag | <code>""</code> |
| image.proxies.dockerLibrary | alpine, nginx etc. | <code>""</code> |
| image.proxies.ghcr | ghcr.io/company/bin:tag | <code>ghcr.io</code> |
| image.proxies.quay | quay.io/company/bin:tag | <code>quay.io</code> |
| image.proxies.kubernetes | registry.k8s.io/bin:tag | <code>registry.k8s.io</code> |
| registry.credentials | | <code>{}</code> |
| helm.repositories.appscode-charts-legacy.url | | <code>https://charts.appscode.com/stable</code> |
| helm.repositories.appscode-charts-oci.url | | <code>oci://r.appscode.com/charts</code> |
| clusterManagers | | <code>[]</code> |
| capi.provider | | <code>""</code> |
| capi.namespace | | <code>""</code> |
| capi.clusterName | | <code>""</code> |


Specify each parameter using the `--set key=value[,key=value]` argument to `helm upgrade -i`. For example:
Expand Down
2 changes: 1 addition & 1 deletion charts/opscenter-features/templates/featuresets/dbaas-capa/aws-ebs-csi-driver.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
2 changes: 1 addition & 1 deletion charts/opscenter-features/templates/featuresets/dbaas-capa/cluster-autoscaler.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions charts/opscenter-features/templates/featuresets/dbaas-capa/crossplane.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions charts/opscenter-features/templates/featuresets/dbaas-capg/crossplane.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions charts/opscenter-features/templates/featuresets/dbaas-capz/crossplane.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/opscenter-features/templates/featuresets/opscenter-core/flux2.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ spec:
chart:
name: flux2
namespace: kubeops
version: ""
version: "2.10.6"
sourceRef:
kind: HelmRepository
name: fluxcd-community
Expand Down
4 changes: 2 additions & 2 deletions charts/opscenter-features/templates/featuresets/opscenter-cost/keda-add-ons-http.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions charts/opscenter-features/templates/featuresets/opscenter-cost/keda.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions charts/opscenter-features/templates/featuresets/opscenter-datastore/kubeform/crossplane.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .../opscenter-features/templates/featuresets/opscenter-monitoring/kube-prometheus-stack.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion ...pscenter-features/templates/featuresets/opscenter-security/cert-manager/cert-manager.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions charts/opscenter-features/templates/featuresets/opscenter-security/falco/falco.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions ...ts/opscenter-features/templates/featuresets/opscenter-security/gatekeeper/gatekeeper.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
20 changes: 0 additions & 20 deletions charts/opscenter-features/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: []

Expand Down
22 changes: 0 additions & 22 deletions schema/ace-options/values.openapiv3_schema.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 91e02df

Please sign in to comment.