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.

Sign up for GitHub

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

Add flag for remove prefix in every kubernetes resources #56 #57

Merged
merged 9 commits into from
Feb 22, 2024
+90 −29
Merged

Add flag for remove prefix in every kubernetes resources #56 #57

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6ea78f3
Add flag for remove prefix in every kubernetes resources #56
Luv7804 Feb 21, 2024
50ce402
Update Polymorphic-App chart #56
Luv7804 Feb 21, 2024
c5eb845
Update github action steps #56
Luv7804 Feb 21, 2024
aafca5f
Update github action steps #56
Luv7804 Feb 21, 2024
a9f743d
Update github action steps and fix lint #56
Luv7804 Feb 21, 2024
37b9a06
fix: bug #56
Luv7804 Feb 21, 2024
49377fb
fix: bug #56
Luv7804 Feb 21, 2024
86b8d4f
fix: bug #56
Luv7804 Feb 22, 2024
5deaae3
fix:merge two if condition for HPA #56
Luv7804 Feb 22, 2024
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
14 changes: 7 additions & 7 deletions .github/workflows/lint-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,22 @@ jobs:
fetch-depth: 0

- name: Set up Helm
uses: azure/setup-helm@v3
uses: azure/setup-helm@v4.0.0
with:
version: v3.11.1
version: v3.14.1

- name: Adding bitnamirepo
run: |
helm repo add bitnami https://charts.bitnami.com/bitnami
helm repo add bitnami-full-index https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.9'
python-version: "3.12.2"
check-latest: true

- name: Set up chart-testing
uses: helm/chart-testing-action@v2.4.0
uses: helm/chart-testing-action@v2.6.1

- name: Run chart-testing (list-changed)
id: list-changed
Expand All @@ -59,9 +59,9 @@ jobs:

- name: Create kind cluster
if: steps.list-changed.outputs.changed == 'true'
uses: helm/kind-action@v1.8.0
uses: helm/kind-action@v1.9.0
with:
version: "v0.17.0"
version: "v0.21.0"
node_image: "kindest/node:v${{ matrix.k8s }}"

- name: Run chart-testing (install)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ jobs:
helm repo add bitnami-full-index https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami

- name: Run chart-releaser
uses: helm/chart-releaser-action@v1.5.0
uses: helm/chart-releaser-action@v1.6.0
env:
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
2 changes: 1 addition & 1 deletion charts/polymorphic-app/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ description: A Helm chart for deploying any custom applications, specifically po
maintainers:
- name: improwised
type: application
version: 1.2.8
version: 1.3.0
appVersion: 1.0.0
14 changes: 13 additions & 1 deletion charts/polymorphic-app/templates/cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,18 @@
apiVersion: {{ include "cronjob.apiVersion" $ }}
kind: CronJob
metadata:
{{- if $.Values.prefixWithReleaseName.enabled }}
name: "{{ $.Release.Name }}-{{ .name | default $.Values.cronJobTemplate.name }}"
{{- else}}
name: "{{ .name | default $.Values.cronJobTemplate.name }}"
{{- end }}
labels:
{{- include "polymorphic-app.labels" $ | nindent 4 }}
app.kubernetes.io/component: {{ $.Release.Name }}-{{ .name | default $.Values.cronJobTemplate.name }}
{{- if $.Values.prefixWithReleaseName.enabled }}
app.kubernetes.io/component: "{{ $.Release.Name }}-{{ .name | default $.Values.cronJobTemplate.name }}"
{{- else}}
app.kubernetes.io/component: "{{ .name | default $.Values.cronJobTemplate.name }}"
{{- end }}
deltasquare4 marked this conversation as resolved.
Show resolved Hide resolved
deltasquare4 marked this conversation as resolved.
Show resolved Hide resolved
annotations:
linkerd.io/inject: disabled
{{- with .annotations | default $.Values.cronJobTemplate.annotations }}
Expand Down Expand Up @@ -35,7 +43,11 @@ spec:
{{- end }}
restartPolicy: Never
containers:
{{- if $.Values.prefixWithReleaseName.enabled }}
- name: "{{ $.Release.Name }}-{{ .name | default $.Values.cronJobTemplate.name }}"
{{- else}}
- name: "{{ .name | default $.Values.cronJobTemplate.name }}"
{{- end }}
{{- if .image }}
image: "{{ .image.repository }}:{{ .image.tag }}"
{{- else }}
Expand Down
20 changes: 18 additions & 2 deletions charts/polymorphic-app/templates/job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,18 @@
apiVersion: batch/v1
kind: Job
metadata:
{{- if $.Values.prefixWithReleaseName.enabled }}
name: "{{ $.Release.Name }}-{{ .name | default $.Values.jobTemplate.name }}"
{{- else}}
name: "{{ .name | default $.Values.jobTemplate.name }}"
{{- end }}
labels:
{{- include "polymorphic-app.labels" $ | nindent 4 }}
app.kubernetes.io/component: {{ $.Release.Name }}-{{ .name | default $.Values.jobTemplate.name }}
{{- if $.Values.prefixWithReleaseName.enabled }}
app.kubernetes.io/component: "{{ $.Release.Name }}-{{ .name | default $.Values.jobTemplate.name }}"
{{- else}}
app.kubernetes.io/component: "{{ .name | default $.Values.jobTemplate.name }}"
{{- end }}
deltasquare4 marked this conversation as resolved.
Show resolved Hide resolved
annotations:
linkerd.io/inject: disabled
{{- with .annotations | default $.Values.jobTemplate.annotations }}
Expand All @@ -17,7 +25,11 @@ spec:
metadata:
labels:
{{- include "polymorphic-app.labels" $ | nindent 8 }}
app.kubernetes.io/component: {{ $.Release.Name }}-{{ .name | default $.Values.jobTemplate.name }}
{{- if $.Values.prefixWithReleaseName.enabled }}
app.kubernetes.io/component: "{{ $.Release.Name }}-{{ .name | default $.Values.jobTemplate.name }}"
{{- else}}
app.kubernetes.io/component: "{{ .name | default $.Values.jobTemplate.name }}"
{{- end }}
deltasquare4 marked this conversation as resolved.
Show resolved Hide resolved
spec:
{{- if $.Values.jobTemplate.imagePullSecrets }}
imagePullSecrets:
Expand All @@ -33,7 +45,11 @@ spec:
{{- end }}
restartPolicy: Never
containers:
{{- if $.Values.prefixWithReleaseName.enabled }}
- name: "{{ $.Release.Name }}-{{ .name | default $.Values.jobTemplate.name }}"
{{- else}}
- name: "{{ .name | default $.Values.jobTemplate.name }}"
{{- end }}
{{- if .image }}
image: "{{ .image.repository }}:{{ .image.tag }}"
{{- else }}
Expand Down
67 changes: 61 additions & 6 deletions charts/polymorphic-app/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,18 @@
apiVersion: {{ include "deployment.apiVersion" $ }}
kind: {{ if eq .type "StatefulSet"}}StatefulSet{{- else }}Deployment{{- end }}
metadata:
{{- if $.Values.prefixWithReleaseName.enabled }}
name: "{{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc"
{{- else}}
name: "{{ .name | default $.Values.serviceTemplate.name }}"
{{- end }}
labels:
{{- include "polymorphic-app.labels" $ | nindent 4 }}
app.kubernetes.io/component: {{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc
{{- if $.Values.prefixWithReleaseName.enabled }}
app.kubernetes.io/component: "{{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc"
{{- else }}
app.kubernetes.io/component: "{{ .name | default $.Values.serviceTemplate.name }}"
{{- end }}
deltasquare4 marked this conversation as resolved.
Show resolved Hide resolved
{{- with .annotations | default $.Values.serviceTemplate.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
Expand All @@ -22,17 +30,29 @@ spec:
{{- end }}
replicas: {{ .minReplicaCount | default $.Values.serviceTemplate.minReplicaCount }}
{{ if eq .type "StatefulSet"}}
{{- if $.Values.prefixWithReleaseName.enabled }}
serviceName: "{{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc"
{{- else }}
serviceName: "{{ .name | default $.Values.serviceTemplate.name }}"
{{- end }}
{{- end }}
selector:
matchLabels:
{{- include "polymorphic-app.selectorLabels" $ | nindent 6 }}
{{- if $.Values.prefixWithReleaseName.enabled }}
app.kubernetes.io/component: "{{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc"
{{- else}}
app.kubernetes.io/component: "{{ .name | default $.Values.serviceTemplate.name }}"
{{- end }}
deltasquare4 marked this conversation as resolved.
Show resolved Hide resolved
template:
metadata:
labels:
{{- include "polymorphic-app.labels" $ | nindent 8 }}
app.kubernetes.io/component: {{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc
{{- if $.Values.prefixWithReleaseName.enabled }}
app.kubernetes.io/component: "{{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc"
{{- else}}
app.kubernetes.io/component: "{{ .name | default $.Values.serviceTemplate.name }}"
{{- end }}
deltasquare4 marked this conversation as resolved.
Show resolved Hide resolved
spec:
{{- if $.Values.serviceTemplate.imagePullSecrets }}
imagePullSecrets:
Expand All @@ -54,7 +74,11 @@ spec:
{{- end }}
{{- end }}
containers:
{{- if $.Values.prefixWithReleaseName.enabled }}
- name: "{{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}"
{{- else}}
- name: "{{ .name | default $.Values.serviceTemplate.name }}"
{{- end }}
{{- if .image }}
image: "{{ .image.repository }}:{{ .image.tag }}"
{{- else }}
Expand Down Expand Up @@ -177,7 +201,11 @@ spec:
labelSelector:
matchLabels:
{{- include "polymorphic-app.labels" $ | nindent 18 }}
{{- if $.Values.prefixWithReleaseName.enabled }}
app.kubernetes.io/component: "{{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc"
{{- else}}
app.kubernetes.io/component: "{{ .name | default $.Values.serviceTemplate.name }}"
{{- end }}
deltasquare4 marked this conversation as resolved.
Show resolved Hide resolved
{{- with .affinity | default $.Values.serviceTemplate.affinity }}
{{ toYaml . | indent 8 }}
{{- end }}
Expand All @@ -201,15 +229,27 @@ spec:
apiVersion: autoscaling/v2beta2
kind: HorizontalPodAutoscaler
metadata:
{{- if $.Values.prefixWithReleaseName.enabled }}
name: "{{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc"
{{- else }}
name: "{{ .name | default $.Values.serviceTemplate.name }}"
{{- end }}
labels:
{{- include "polymorphic-app.labels" $ | nindent 4 }}
app.kubernetes.io/component: {{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc
{{- if $.Values.prefixWithReleaseName.enabled }}
app.kubernetes.io/component: "{{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc"
{{- else}}
app.kubernetes.io/component: "{{ .name | default $.Values.serviceTemplate.name }}"
{{- end }}
deltasquare4 marked this conversation as resolved.
Show resolved Hide resolved
spec:
scaleTargetRef:
apiVersion: apps/v1
kind: {{ if eq .type "StatefulSet"}}StatefulSet{{- else }}Deployment{{- end }}
{{- if $.Values.prefixWithReleaseName.enabled }}
name: "{{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc"
{{- else}}
name: "{{ .name | default $.Values.serviceTemplate.name }}"
{{- end }}
deltasquare4 marked this conversation as resolved.
Show resolved Hide resolved
minReplicas: {{ .minReplicaCount | default $.Values.serviceTemplate.minReplicaCount }}
maxReplicas: {{ .maxReplicaCount | default $.Values.serviceTemplate.maxReplicaCount }}
metrics:
Expand All @@ -232,10 +272,18 @@ spec:
apiVersion: v1
kind: Service
metadata:
{{- if $.Values.prefixWithReleaseName.enabled }}
name: "{{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc"
{{- else}}
name: "{{ .name | default $.Values.serviceTemplate.name }}"
{{- end }}
labels:
{{- include "polymorphic-app.labels" $ | nindent 4 }}
app.kubernetes.io/component: {{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc
{{- if $.Values.prefixWithReleaseName.enabled }}
app.kubernetes.io/component: "{{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc"
{{- else}}
app.kubernetes.io/component: "{{ .name | default $.Values.serviceTemplate.name }}"
{{- end }}
deltasquare4 marked this conversation as resolved.
Show resolved Hide resolved
{{- with (.service.annotations | default $.Values.serviceTemplate.service.annotations) }}
annotations:
{{- toYaml . | nindent 4 }}
Expand All @@ -251,18 +299,25 @@ spec:
{{- end }}
selector:
{{- include "polymorphic-app.selectorLabels" $ | nindent 4 }}
app.kubernetes.io/component: {{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc
{{- if $.Values.prefixWithReleaseName.enabled }}
app.kubernetes.io/component: "{{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc"
{{- else}}
app.kubernetes.io/component: "{{ .name | default $.Values.serviceTemplate.name }}"
{{- end }}
deltasquare4 marked this conversation as resolved.
Show resolved Hide resolved
{{- end }}


{{- if and .ingress (.ingress.enabled | default $.Values.serviceTemplate.ingress.enabled) }}
---
{{- $fullName := printf "%s-%s-svc" $.Release.Name (.name | default $.Values.serviceTemplate.name) -}}

apiVersion: {{ include "ingress.apiVersion" $ }}
kind: Ingress
metadata:
{{- if $.Values.prefixWithReleaseName.enabled }}
name: "{{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc"
{{- else}}
name: "{{ .name | default $.Values.serviceTemplate.name }}"
{{- end }}
labels:
{{- include "polymorphic-app.labels" $ | nindent 4 }}
{{- with (.ingress.annotations | default $.Values.serviceTemplate.ingress.annotations) }}
Expand Down
42 changes: 39 additions & 3 deletions charts/polymorphic-app/templates/worker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,18 @@
apiVersion: {{ include "deployment.apiVersion" $ }}
kind: Deployment
metadata:
{{- if $.Values.prefixWithReleaseName.enabled }}
name: "{{ $.Release.Name }}-{{ .name | default $.Values.workerTemplate.name }}"
{{- else }}
name: "{{ .name | default $.Values.workerTemplate.name }}"
{{- end }}
labels:
{{- include "polymorphic-app.labels" $ | nindent 4 }}
app.kubernetes.io/component: {{ $.Release.Name }}-{{ .name | default $.Values.workerTemplate.name }}
{{- if $.Values.prefixWithReleaseName.enabled }}
app.kubernetes.io/component: "{{ $.Release.Name }}-{{ .name | default $.Values.workerTemplate.name }}"
{{- else }}
app.kubernetes.io/component: "{{ .name | default $.Values.workerTemplate.name }}"
{{- end }}
deltasquare4 marked this conversation as resolved.
Show resolved Hide resolved
spec:
strategy:
type: RollingUpdate
Expand All @@ -17,12 +25,20 @@ spec:
selector:
matchLabels:
{{- include "polymorphic-app.selectorLabels" $ | nindent 6 }}
{{- if $.Values.prefixWithReleaseName.enabled }}
app.kubernetes.io/component: "{{ $.Release.Name }}-{{ .name | default $.Values.workerTemplate.name }}"
{{- else }}
app.kubernetes.io/component: "{{ .name | default $.Values.workerTemplate.name }}"
{{- end }}
template:
deltasquare4 marked this conversation as resolved.
Show resolved Hide resolved
metadata:
labels:
{{- include "polymorphic-app.labels" $ | nindent 8 }}
app.kubernetes.io/component: {{ $.Release.Name }}-{{ .name | default $.Values.workerTemplate.name }}
{{- if $.Values.prefixWithReleaseName.enabled }}
app.kubernetes.io/component: "{{ $.Release.Name }}-{{ .name | default $.Values.workerTemplate.name }}"
{{- else }}
app.kubernetes.io/component: "{{ .name | default $.Values.workerTemplate.name }}"
{{- end }}
deltasquare4 marked this conversation as resolved.
Show resolved Hide resolved
spec:
{{- if $.Values.workerTemplate.imagePullSecrets }}
imagePullSecrets:
Expand All @@ -38,7 +54,11 @@ spec:
{{- end }}
terminationGracePeriodSeconds: {{ .terminationGracePeriodSeconds | default $.Values.workerTemplate.terminationGracePeriodSeconds }}
containers:
{{- if $.Values.prefixWithReleaseName.enabled }}
- name: "{{ $.Release.Name }}-{{ .name | default $.Values.workerTemplate.name }}"
{{- else }}
- name: "{{ .name | default $.Values.workerTemplate.name }}"
{{- end }}
{{- if .image }}
image: "{{ .image.repository }}:{{ .image.tag }}"
{{- else }}
Expand Down Expand Up @@ -175,15 +195,27 @@ spec:
apiVersion: autoscaling/v2beta1
kind: HorizontalPodAutoscaler
deltasquare4 marked this conversation as resolved.
Show resolved Hide resolved
metadata:
{{- if $.Values.prefixWithReleaseName.enabled }}
name: "{{ $.Release.Name }}-{{ .name | default $.Values.workerTemplate.name }}"
{{- else }}
name: "{{ .name | default $.Values.workerTemplate.name }}"
{{- end }}
labels:
{{- include "polymorphic-app.labels" $ | nindent 4 }}
app.kubernetes.io/component: {{ $.Release.Name }}-{{ .name | default $.Values.workerTemplate.name }}
{{- if $.Values.prefixWithReleaseName.enabled }}
app.kubernetes.io/component: "{{ $.Release.Name }}-{{ .name | default $.Values.workerTemplate.name }}"
{{- else }}
app.kubernetes.io/component: "{{ .name | default $.Values.workerTemplate.name }}"
{{- end }}
deltasquare4 marked this conversation as resolved.
Show resolved Hide resolved
spec:
scaleTargetRef:
apiVersion: apps/v1beta2
kind: Deployment
{{- if $.Values.prefixWithReleaseName.enabled }}
name: "{{ $.Release.Name }}-{{ .name | default $.Values.workerTemplate.name }}"
{{- else }}
name: "{{ .name | default $.Values.workerTemplate.name }}"
{{- end }}
minReplicas: {{ .minReplicaCount | default $.Values.workerTemplate.minReplicaCount }}
maxReplicas: {{ .maxReplicaCount | default $.Values.workerTemplate.maxReplicaCount }}
metrics:
Expand All @@ -195,7 +227,11 @@ spec:
target:
apiVersion: apps/v1
kind: Deployment
{{- if $.Values.prefixWithReleaseName.enabled }}
name: "{{ $.Release.Name }}-{{ .name | default $.Values.workerTemplate.name }}"
{{- else }}
name: "{{ .name | default $.Values.workerTemplate.name }}"
{{- end }}
deltasquare4 marked this conversation as resolved.
Show resolved Hide resolved
targetValue: 100
{{- end }}
{{- end }}
3 changes: 2 additions & 1 deletion charts/polymorphic-app/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

nameOverride: ""
fullnameOverride: ""

prefixWithReleaseName:
enabled: true
image:
repository:
tag:
Expand Down