Skip to content

Commit 11f60da

Browse files
committed
Post v4 reverted
1 parent 828549f commit 11f60da

File tree

8 files changed

+2
-30
lines changed

8 files changed

+2
-30
lines changed

.github/workflows/publish-docker.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,13 @@ jobs:
132132
echo "dockerfile=$DOCKERFILE" >> $GITHUB_OUTPUT
133133
-
134134
name: Build Docker image
135-
uses: docker/build-push-action@v3
135+
uses: docker/build-push-action@v5
136136
#! env:
137137
#! cache_image: '${{ steps.info.outputs.image_name }}:cache'
138138
with:
139139
#cache-from: 'type=registry,ref=${{ env.cache_image }}'
140140
#cache-to: 'type=registry,mode=max,ref=${{ env.cache_image }}'
141+
allow: 'network.host'
141142
push: true
142143
context: ${{ fromJson(inputs.settings).build.docker.context }}
143144
file: ${{ steps.info.outputs.dockerfile }}

.github/workflows/release-gks-template-chart.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ jobs:
2727
uses: actions/checkout@v3
2828
with:
2929
ref: ${{ github.ref }}
30-
token: ${{ secrets.GKS_GH_ACCESS_TOKEN }}
3130
-
3231
name: Set up Helm
3332
uses: Geta/gks/actions/setup-helm@actions/v1

assets/icons/plussagenturer.jpg

23.6 KB
Loading

assets/icons/soleliten.png

20.6 KB
Loading

assets/icons/sundolitt.jpeg

8.38 KB
Loading

assets/icons/wj.jpg

10.3 KB
Loading

charts/gks-template/templates/_deployment.tpl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ metadata:
1313
{{- toYaml . | nindent 4 }}
1414
{{- end }}
1515
spec:
16-
{{- if not .Values.autoscaling.enabled }}
1716
replicas: {{ .Values.replicaCount }}
18-
{{- end }}
1917
selector:
2018
matchLabels:
2119
{{- include "gks.shared.selectorLabels" . | nindent 6 }}

charts/gks-template/templates/_hpa.tpl

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,5 @@
33
*/ -}}
44
{{- define "gks.shared.hpa" -}}
55
{{- if .Values.autoscaling.enabled }}
6-
apiVersion: autoscaling/v2beta1
7-
kind: HorizontalPodAutoscaler
8-
metadata:
9-
name: {{ include "gks.shared.fullname" . }}
10-
labels:
11-
{{- include "gks.shared.labels" . | nindent 4 }}
12-
spec:
13-
scaleTargetRef:
14-
apiVersion: apps/v1
15-
kind: Deployment
16-
name: {{ include "gks.shared.fullname" . }}
17-
minReplicas: {{ .Values.autoscaling.minReplicas }}
18-
maxReplicas: {{ .Values.autoscaling.maxReplicas }}
19-
metrics:
20-
{{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
21-
- type: Resource
22-
resource:
23-
name: cpu
24-
targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
25-
{{- end }}
26-
{{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
27-
- type: Resource
28-
resource:
29-
name: memory
30-
targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
31-
{{- end }}
326
{{- end }}
337
{{- end }}

0 commit comments

Comments
 (0)