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