Post v4 reverted

Geta · Dec 1, 2023 · 11f60da · 11f60da
1 parent 828549f
commit 11f60da
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 30 deletions.
diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
@@ -132,12 +132,13 @@ jobs:
           echo "dockerfile=$DOCKERFILE" >> $GITHUB_OUTPUT
       - 
         name: Build Docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         #! env:
         #!   cache_image: '${{ steps.info.outputs.image_name }}:cache'
         with:
           #cache-from: 'type=registry,ref=${{ env.cache_image }}'
           #cache-to: 'type=registry,mode=max,ref=${{ env.cache_image }}'
+          allow: 'network.host'
           push: true
           context: ${{ fromJson(inputs.settings).build.docker.context }}
           file: ${{ steps.info.outputs.dockerfile }}

diff --git a/.github/workflows/release-gks-template-chart.yaml b/.github/workflows/release-gks-template-chart.yaml
@@ -27,7 +27,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ github.ref }}
-          token: ${{ secrets.GKS_GH_ACCESS_TOKEN }}
       -
         name: Set up Helm
         uses: Geta/gks/actions/setup-helm@actions/v1

diff --git a/assets/icons/plussagenturer.jpg b/assets/icons/plussagenturer.jpg
diff --git a/assets/icons/soleliten.png b/assets/icons/soleliten.png
diff --git a/assets/icons/sundolitt.jpeg b/assets/icons/sundolitt.jpeg
diff --git a/assets/icons/wj.jpg b/assets/icons/wj.jpg
diff --git a/charts/gks-template/templates/_deployment.tpl b/charts/gks-template/templates/_deployment.tpl
@@ -13,9 +13,7 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
-  {{- end }}
   selector:
     matchLabels:
       {{- include "gks.shared.selectorLabels" . | nindent 6 }}

diff --git a/charts/gks-template/templates/_hpa.tpl b/charts/gks-template/templates/_hpa.tpl
@@ -3,31 +3,5 @@
 */ -}}
 {{- define "gks.shared.hpa" -}}
 {{- if .Values.autoscaling.enabled }}
-apiVersion: autoscaling/v2beta1
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ include "gks.shared.fullname" . }}
-  labels:
-    {{- include "gks.shared.labels" . | nindent 4 }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ include "gks.shared.fullname" . }}
-  minReplicas: {{ .Values.autoscaling.minReplicas }}
-  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
-  metrics:
-    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: cpu
-        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
-    {{- end }}
-    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    {{- end }}
 {{- end }}
 {{- end }}