resolve conflicts

This commit is contained in:
MuneebAijaz
2024-08-08 10:51:00 +05:00
6 changed files with 63 additions and 15 deletions

View File

@@ -8,7 +8,7 @@ metadata:
meta.helm.sh/release-name: "reloader"
labels:
app: reloader-reloader
chart: "reloader-1.0.119"
chart: "reloader-1.0.121"
release: "reloader"
heritage: "Helm"
app.kubernetes.io/managed-by: "Helm"
@@ -25,7 +25,7 @@ metadata:
meta.helm.sh/release-name: "reloader"
labels:
app: reloader-reloader
chart: "reloader-1.0.119"
chart: "reloader-1.0.121"
release: "reloader"
heritage: "Helm"
app.kubernetes.io/managed-by: "Helm"
@@ -92,7 +92,7 @@ metadata:
meta.helm.sh/release-name: "reloader"
labels:
app: reloader-reloader
chart: "reloader-1.0.119"
chart: "reloader-1.0.121"
release: "reloader"
heritage: "Helm"
app.kubernetes.io/managed-by: "Helm"
@@ -115,7 +115,7 @@ metadata:
meta.helm.sh/release-name: "reloader"
labels:
app: reloader-reloader
chart: "reloader-1.0.119"
chart: "reloader-1.0.121"
release: "reloader"
heritage: "Helm"
app.kubernetes.io/managed-by: "Helm"
@@ -135,7 +135,7 @@ spec:
metadata:
labels:
app: reloader-reloader
chart: "reloader-1.0.119"
chart: "reloader-1.0.121"
release: "reloader"
heritage: "Helm"
app.kubernetes.io/managed-by: "Helm"
@@ -147,7 +147,15 @@ spec:
- image: "ghcr.io/stakater/reloader:latest"
imagePullPolicy: IfNotPresent
name: reloader-reloader
env:
- name: GOMAXPROCS
valueFrom:
resourceFieldRef:
resource: limits.cpu
- name: GOMEMLIMIT
valueFrom:
resourceFieldRef:
resource: limits.memory
ports:
- name: http
containerPort: 9090
@@ -174,8 +182,8 @@ spec:
{}
resources:
limits:
cpu: 150m
memory: 512Mi
cpu: "1"
memory: 128Mi
requests:
cpu: 10m
memory: 128Mi