Compare commits
1 Commits
master
...
fix/autosc
Author | SHA1 | Date | |
---|---|---|---|
bbe9a1d0e2 |
@ -14,6 +14,9 @@ jobs:
|
|||||||
chart:
|
chart:
|
||||||
- py-app
|
- py-app
|
||||||
- pgbouncer
|
- pgbouncer
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
packages: write
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: azure/setup-helm@v4.2.0
|
- uses: azure/setup-helm@v4.2.0
|
||||||
@ -23,7 +26,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
helm package --dependency-update ./charts/${{ matrix.chart }}
|
helm package --dependency-update ./charts/${{ matrix.chart }}
|
||||||
helm show chart *.tgz
|
helm show chart *.tgz
|
||||||
helm registry login -u ${{ gitea.actor }} -p ${{ secrets.UPLOADER_PAT }} gitea.le-memese.com
|
helm registry login -u ${{ github.actor }} -p ${{ secrets.GITHUB_TOKEN }} ghcr.io
|
||||||
helm push *.tgz oci://gitea.le-memese.com/common/charts
|
helm push *.tgz oci://ghcr.io/intreecom/charts
|
||||||
env:
|
env:
|
||||||
HELM_EXPERIMENTAL_OCI: 1
|
HELM_EXPERIMENTAL_OCI: 1
|
@ -1,6 +1,6 @@
|
|||||||
{{- range $name, $val := .Values.externalSecrets }}
|
{{- range $name, $val := .Values.externalSecrets }}
|
||||||
---
|
---
|
||||||
apiVersion: external-secrets.io/v1
|
apiVersion: external-secrets.io/v1beta1
|
||||||
kind: ExternalSecret
|
kind: ExternalSecret
|
||||||
metadata:
|
metadata:
|
||||||
name: "{{include "pgbouncer.name" $ }}-{{ $name }}"
|
name: "{{include "pgbouncer.name" $ }}-{{ $name }}"
|
||||||
|
@ -1,15 +1,14 @@
|
|||||||
{{- range $name, $val := .Values.externalSecrets }}
|
{{- range $name, $val := .Values.externalSecrets }}
|
||||||
---
|
---
|
||||||
apiVersion: external-secrets.io/v1
|
apiVersion: external-secrets.io/v1beta1
|
||||||
kind: ExternalSecret
|
kind: ExternalSecret
|
||||||
metadata:
|
metadata:
|
||||||
name: "{{include "py-app.name" $ }}-{{ $name }}"
|
name: "{{include "py-app.name" $ }}-{{ $name }}"
|
||||||
labels:
|
labels:
|
||||||
{{- include "py-app.labels" $ | nindent 4 }}
|
{{- include "py-app.labels" $ | nindent 4 }}
|
||||||
annotations:
|
annotations:
|
||||||
"helm.sh/hook": pre-install,pre-upgrade
|
argocd.argoproj.io/hook: PreSync,Sync
|
||||||
"helm.sh/hook-delete-policy": before-hook-creation
|
argocd.argoproj.io/sync-wave: "-1"
|
||||||
"helm.sh/hook-weight": "-1"
|
|
||||||
spec:
|
spec:
|
||||||
refreshInterval: {{ default "1h" $val.refreshInterval }}
|
refreshInterval: {{ default "1h" $val.refreshInterval }}
|
||||||
secretStoreRef:
|
secretStoreRef:
|
||||||
|
@ -17,13 +17,17 @@ spec:
|
|||||||
- type: Resource
|
- type: Resource
|
||||||
resource:
|
resource:
|
||||||
name: cpu
|
name: cpu
|
||||||
targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
|
target:
|
||||||
|
type: Utilization
|
||||||
|
averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
|
{{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
|
||||||
- type: Resource
|
- type: Resource
|
||||||
resource:
|
resource:
|
||||||
name: memory
|
name: memory
|
||||||
targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
|
target:
|
||||||
|
type: Utilization
|
||||||
|
averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
---
|
---
|
||||||
@ -46,12 +50,16 @@ spec:
|
|||||||
- type: Resource
|
- type: Resource
|
||||||
resource:
|
resource:
|
||||||
name: cpu
|
name: cpu
|
||||||
targetAverageUtilization: {{ .Values.taskiq.autoscaling.targetCPUUtilizationPercentage }}
|
target:
|
||||||
|
type: Utilization
|
||||||
|
averageUtilization: {{ .Values.taskiq.autoscaling.targetCPUUtilizationPercentage }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.taskiq.autoscaling.targetMemoryUtilizationPercentage }}
|
{{- if .Values.taskiq.autoscaling.targetMemoryUtilizationPercentage }}
|
||||||
- type: Resource
|
- type: Resource
|
||||||
resource:
|
resource:
|
||||||
name: memory
|
name: memory
|
||||||
targetAverageUtilization: {{ .Values.taskiq.autoscaling.targetMemoryUtilizationPercentage }}
|
target:
|
||||||
|
type: Utilization
|
||||||
|
averageUtilization: {{ .Values.taskiq.autoscaling.targetMemoryUtilizationPercentage }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
@ -5,12 +5,12 @@
|
|||||||
apiVersion: batch/v1
|
apiVersion: batch/v1
|
||||||
kind: Job
|
kind: Job
|
||||||
metadata:
|
metadata:
|
||||||
name: "{{ include "py-app.fullname" $ }}-{{ $name }}-mj"
|
generateName: "{{ include "py-app.fullname" $ }}-{{ $name }}-mj"
|
||||||
labels:
|
labels:
|
||||||
{{- include "py-app.labels" $ | nindent 4 }}
|
{{- include "py-app.labels" $ | nindent 4 }}
|
||||||
annotations:
|
annotations:
|
||||||
"helm.sh/hook": pre-install,pre-upgrade
|
argocd.argoproj.io/hook: PreSync
|
||||||
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
|
argocd.argoproj.io/hook-delete-policy: HookSucceeded
|
||||||
{{- with $val.annotations }}
|
{{- with $val.annotations }}
|
||||||
{{- toYaml . | nindent 4 }}
|
{{- toYaml . | nindent 4 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
@ -20,7 +20,7 @@ migrators: {}
|
|||||||
# pg:
|
# pg:
|
||||||
# # Job's additional annotations
|
# # Job's additional annotations
|
||||||
# annotations:
|
# annotations:
|
||||||
# "helm.sh/hook-weight": "-1"
|
# argocd.argoproj.io/sync-wave: "5"
|
||||||
# command: ["alembic", "upgrade", "head"]
|
# command: ["alembic", "upgrade", "head"]
|
||||||
# # You can specify limits for every migrator Job.
|
# # You can specify limits for every migrator Job.
|
||||||
# resources: {}
|
# resources: {}
|
||||||
|
Reference in New Issue
Block a user