Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(staging): Renaming helm entities #5266

Merged
merged 2 commits into from
Mar 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: cert-manager
resources:
- helm-release.yaml
- helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ kind: Kustomization
namespace: dbms
resources:
- postgres-superuser-secret.yaml
- helm-release.yaml
- helmrelease.yaml
- service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- pgadmin-secret.yaml
- helm-release.yaml
- helmrelease.yaml
configMapGenerator:
- name: servers-json
files:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- helm-release.yaml
- helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- helm-release.yaml
- helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- helm-release.yaml
- helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ spec:
retries: 3
valuesFrom:
- kind: ConfigMap
name: flux-operator-helm-values
name: flux-operator-values
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- helm-release.yaml
- helmrelease.yaml
configMapGenerator:
- name: flux-operator-helm-values
- name: flux-operator-values
files:
- values.yaml=./helm-values.yaml
- values.yaml=./values.yaml
configurations:
- kustomizeconfig.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ spec:
retries: 3
valuesFrom:
- kind: ConfigMap
name: flux-instance-helm-values
name: flux-instance-values
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- helm-release.yaml
- helmrelease.yaml
- prometheusrule.yaml
configMapGenerator:
- name: flux-instance-helm-values
- name: flux-instance-values
files:
- values.yaml=./helm-values.yaml
- values.yaml=./values.yaml
configurations:
- kustomizeconfig.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@

valuesFrom:
- kind: ConfigMap
name: cilium-helm-values
name: cilium-values

# values:

Check warning on line 37 in kubernetes/staging/apps/kube-system/cilium/app/helmrelease.yaml

View workflow job for this annotation

GitHub Actions / yamllint

37:3 [comments-indentation] comment not indented like content
# hubble:
# enabled: false
# metrics:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: kube-system
resources:
- helm-release.yaml
- helmrelease.yaml
configMapGenerator:
- name: cilium-helm-values
- name: cilium-values
files:
- values.yaml=./helm-values.yaml
- values.yaml=./values.yaml
configurations:
- kustomizeconfig.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- helm-release.yaml
- helmrelease.yaml
configMapGenerator:
- name: coredns-values
files:
- values.yaml=./helm-values.yaml
- values.yaml=./values.yaml

configurations:
- kustomizeconfig.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- helm-release.yaml
- helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- external-dns-unifi-secrets.yaml
- helm-release.yaml
- helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: networking
resources:
- helm-release.yaml
- helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- helm-release.yaml
- helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- dashboard-secret.yaml
- helm-release.yaml
- helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ghcr-credentials.yaml
- helm-release.yaml
- helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- rbac.yaml
- helm-release.yaml
- helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: kube-system
resources:
- helm-release.yaml
- helmrelease.yaml
configMapGenerator:
- name: kubelet-csr-approver-values
files:
- values.yaml=./helm-values.yaml
- values.yaml=./values.yaml
configurations:
- kustomizeconfig.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- helm-release.yaml
- helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- helm-release.yaml
- helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- helm-release.yaml
- helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- helm-release.yaml
- helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- mutations
- helm-release.yaml
- helmrelease.yaml
- prometheus-rule.yaml
10 changes: 5 additions & 5 deletions kubernetes/staging/bootstrap/apps/helmfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ releases:
namespace: kube-system
chart: cilium/cilium
version: 1.17.1
values: ['{{ requiredEnv "KUBERNETES_DIR" }}/apps/kube-system/cilium/app/helm-values.yaml']
values: ['{{ requiredEnv "KUBERNETES_DIR" }}/apps/kube-system/cilium/app/values.yaml']
hooks:
- events: ["postsync"]
command: '{{ requiredEnv "KUBERNETES_DIR" }}/bootstrap/apps/resources/cilium-config.sh'
Expand All @@ -29,27 +29,27 @@ releases:
namespace: kube-system
chart: oci://ghcr.io/coredns/charts/coredns
version: 1.39.1
values: ['{{ requiredEnv "KUBERNETES_DIR" }}/apps/kube-system/coredns/app/helm-values.yaml']
values: ['{{ requiredEnv "KUBERNETES_DIR" }}/apps/kube-system/coredns/app/values.yaml']
needs: ["kube-system/cilium"]

- name: kubelet-csr-approver
namespace: system
chart: postfinance/kubelet-csr-approver
version: 1.2.6
values: ['{{ requiredEnv "KUBERNETES_DIR" }}/apps/system/kubelet-csr-approver/app/helm-values.yaml']
values: ['{{ requiredEnv "KUBERNETES_DIR" }}/apps/system/kubelet-csr-approver/app/values.yaml']
needs: ["kube-system/cilium"]

- name: flux-operator
namespace: flux-system
chart: oci://ghcr.io/controlplaneio-fluxcd/charts/flux-operator
version: 0.17.0
values: ['{{ requiredEnv "KUBERNETES_DIR" }}/apps/flux-system/flux-operator/app/helm-values.yaml']
values: ['{{ requiredEnv "KUBERNETES_DIR" }}/apps/flux-system/flux-operator/app/values.yaml']
needs: ["kube-system/coredns"]

- name: flux-instance
namespace: flux-system
chart: oci://ghcr.io/controlplaneio-fluxcd/charts/flux-instance
version: 0.17.0
values: ['{{ requiredEnv "KUBERNETES_DIR" }}/apps/flux-system/flux-operator/instance/helm-values.yaml']
values: ['{{ requiredEnv "KUBERNETES_DIR" }}/apps/flux-system/flux-operator/instance/values.yaml']
needs: ["flux-system/flux-operator"]
wait: false