Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(container)!: Update image app-template to v3 #12

Merged
merged 8 commits into from
Mar 15, 2024

Conversation

renovate[bot]
Copy link
Contributor

@renovate renovate bot commented Mar 15, 2024

Mend Renovate

This PR contains the following updates:

Package Update Change
app-template major 2.6.0 -> 3.0.3

Configuration

📅 Schedule: Branch creation - "on saturday" (UTC), Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update again.


  • If you want to rebase/retry this PR, check this box

This PR has been generated by Mend Renovate. View repository job log here.

Copy link

github-actions bot commented Mar 15, 2024

--- kubernetes/apps/network/cloudflared/app Kustomization: flux-system/cloudflared HelmRelease: network/cloudflared

+++ kubernetes/apps/network/cloudflared/app Kustomization: flux-system/cloudflared HelmRelease: network/cloudflared

@@ -13,30 +13,30 @@

     spec:
       chart: app-template
       sourceRef:
         kind: HelmRepository
         name: bjw-s
         namespace: flux-system
-      version: 2.6.0
+      version: 3.0.3
   install:
     remediation:
       retries: 3
   interval: 30m
   uninstall:
     keepHistory: false
   upgrade:
     cleanupOnFail: true
     remediation:
       retries: 3
   values:
     controllers:
-      main:
+      cloudflared:
         annotations:
           reloader.stakater.com/auto: 'true'
         containers:
-          main:
+          cloudflared:
             args:
             - tunnel
             - --config
             - /etc/cloudflared/config/config.yaml
             - run
             - $(TUNNEL_ID)
@@ -99,13 +99,12 @@

             runAsNonRoot: true
             runAsUser: 65534
         replicas: 2
         strategy: RollingUpdate
     persistence:
       config:
-        enabled: true
         globalMounts:
         - path: /etc/cloudflared/config/config.yaml
           readOnly: true
           subPath: config.yaml
         name: cloudflared-configmap
         type: configMap
@@ -114,14 +113,21 @@

         - path: /etc/cloudflared/creds/credentials.json
           readOnly: true
           subPath: credentials.json
         name: cloudflared-secret
         type: secret
     service:
-      main:
+      cloudflared:
+        controller: cloudflared
         ports:
           http:
             port: 8080
     serviceMonitor:
-      main:
-        enabled: true
+      cloudflared:
+        endpoints:
+        - interval: 1m
+          path: /metrics
+          port: http
+          scheme: http
+          scrapeTimeout: 10s
+        serviceName: cloudflared
 
--- kubernetes/apps/network/echo-server/app Kustomization: flux-system/echo-server HelmRelease: network/echo-server

+++ kubernetes/apps/network/echo-server/app Kustomization: flux-system/echo-server HelmRelease: network/echo-server

@@ -13,28 +13,28 @@

     spec:
       chart: app-template
       sourceRef:
         kind: HelmRepository
         name: bjw-s
         namespace: flux-system
-      version: 2.6.0
+      version: 3.0.3
   install:
     remediation:
       retries: 3
   interval: 30m
   uninstall:
     keepHistory: false
   upgrade:
     cleanupOnFail: true
     remediation:
       retries: 3
   values:
     controllers:
-      main:
+      echo-server:
         containers:
-          main:
+          echo-server:
             env:
               HTTP_PORT: 8080
               LOG_IGNORE_PATH: /healthz
               LOG_WITHOUT_NEWLINE: true
               PROMETHEUS_ENABLED: true
             image:
@@ -82,43 +82,48 @@

           securityContext:
             runAsGroup: 65534
             runAsNonRoot: true
             runAsUser: 65534
         strategy: RollingUpdate
     ingress:
+      external:
+        annotations:
+          external-dns.alpha.kubernetes.io/target: external.${SECRET_DOMAIN}
+        className: external
+        hosts:
+        - host: '{{ .Release.Name }}-external.${SECRET_DOMAIN}'
+          paths:
+          - path: /
+            service:
+              identifier: echo-server
+              port: http
+        tls:
+        - hosts:
+          - '{{ .Release.Name }}-external.${SECRET_DOMAIN}'
       internal:
         className: internal
-        enabled: true
         hosts:
         - host: '{{ .Release.Name }}-internal.${SECRET_DOMAIN}'
           paths:
           - path: /
             service:
-              name: main
+              identifier: echo-server
               port: http
         tls:
         - hosts:
           - '{{ .Release.Name }}-internal.${SECRET_DOMAIN}'
-      main:
-        annotations:
-          external-dns.alpha.kubernetes.io/target: external.${SECRET_DOMAIN}
-        className: external
-        enabled: true
-        hosts:
-        - host: '{{ .Release.Name }}-external.${SECRET_DOMAIN}'
-          paths:
-          - path: /
-            service:
-              name: main
-              port: http
-        tls:
-        - hosts:
-          - '{{ .Release.Name }}-external.${SECRET_DOMAIN}'
     service:
-      main:
+      echo-server:
+        controller: echo-server
         ports:
           http:
             port: 8080
     serviceMonitor:
-      main:
-        enabled: true
+      echo-server:
+        endpoints:
+        - interval: 1m
+          path: /metrics
+          port: http
+          scheme: http
+          scrapeTimeout: 10s
+        serviceName: echo-server
 
--- kubernetes/apps/default/mc-raul/app Kustomization: flux-system/mc-raul HelmRelease: default/mc-raul

+++ kubernetes/apps/default/mc-raul/app Kustomization: flux-system/mc-raul HelmRelease: default/mc-raul

@@ -13,20 +13,20 @@

     spec:
       chart: app-template
       sourceRef:
         kind: HelmRepository
         name: bjw-s
         namespace: flux-system
-      version: 2.6.0
+      version: 3.0.3
   interval: 30m
   timeout: 15m
   values:
     controllers:
-      main:
+      mc-raul:
         containers:
-          main:
+          mc-raul:
             env:
               EULA: 'TRUE'
               LEVEL: world
               MAX_PLAYERS: '20'
               MEMORY: 2048M
               MODRINTH_ALLOWED_VERSION_TYPE: release
@@ -98,36 +98,31 @@

         runAsNonRoot: true
         runAsUser: 1000
         seccompProfile:
           type: RuntimeDefault
     persistence:
       data:
-        enabled: true
         existingClaim: pvc-mc-raul
         globalMounts:
         - path: /data
           readOnly: false
       tmp:
-        enabled: true
         globalMounts:
         - path: /tmp
           readOnly: false
         medium: Memory
         type: emptyDir
     service:
-      main:
+      mc-raul:
         annotations:
           io.cilium/lb-ipam-ips: 10.10.10.29
-        controller: main
-        enabled: true
+        controller: mc-raul
         externalTrafficPolicy: Cluster
         labels:
           io.cilium/l2: 'true'
         ports:
-          http:
-            enabled: false
           minecraft:
             enabled: true
             port: 25565
             primary: true
             protocol: TCP
         primary: true

Copy link

--- HelmRelease: network/cloudflared Service: network/cloudflared

+++ HelmRelease: network/cloudflared Service: network/cloudflared

@@ -13,10 +13,10 @@

   ports:
   - port: 8080
     targetPort: 8080
     protocol: TCP
     name: http
   selector:
-    app.kubernetes.io/component: main
+    app.kubernetes.io/component: cloudflared
     app.kubernetes.io/instance: cloudflared
     app.kubernetes.io/name: cloudflared
 
--- HelmRelease: network/cloudflared Deployment: network/cloudflared

+++ HelmRelease: network/cloudflared Deployment: network/cloudflared

@@ -1,36 +1,36 @@

 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: cloudflared
   labels:
-    app.kubernetes.io/component: main
+    app.kubernetes.io/component: cloudflared
     app.kubernetes.io/instance: cloudflared
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: cloudflared
   annotations:
     reloader.stakater.com/auto: 'true'
 spec:
   revisionHistoryLimit: 3
   replicas: 2
   strategy:
     type: RollingUpdate
   selector:
     matchLabels:
-      app.kubernetes.io/component: main
+      app.kubernetes.io/component: cloudflared
       app.kubernetes.io/name: cloudflared
       app.kubernetes.io/instance: cloudflared
   template:
     metadata:
       labels:
-        app.kubernetes.io/component: main
+        app.kubernetes.io/component: cloudflared
         app.kubernetes.io/instance: cloudflared
         app.kubernetes.io/name: cloudflared
     spec:
-      enableServiceLinks: true
+      enableServiceLinks: false
       serviceAccountName: default
       automountServiceAccountToken: true
       securityContext:
         runAsGroup: 65534
         runAsNonRoot: true
         runAsUser: 65534
@@ -69,13 +69,13 @@

           httpGet:
             path: /ready
             port: 8080
           initialDelaySeconds: 0
           periodSeconds: 10
           timeoutSeconds: 1
-        name: main
+        name: cloudflared
         readinessProbe:
           failureThreshold: 3
           httpGet:
             path: /ready
             port: 8080
           initialDelaySeconds: 0
--- HelmRelease: network/echo-server Service: network/echo-server

+++ HelmRelease: network/echo-server Service: network/echo-server

@@ -13,10 +13,10 @@

   ports:
   - port: 8080
     targetPort: 8080
     protocol: TCP
     name: http
   selector:
-    app.kubernetes.io/component: main
+    app.kubernetes.io/component: echo-server
     app.kubernetes.io/instance: echo-server
     app.kubernetes.io/name: echo-server
 
--- HelmRelease: network/echo-server Deployment: network/echo-server

+++ HelmRelease: network/echo-server Deployment: network/echo-server

@@ -1,34 +1,34 @@

 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: echo-server
   labels:
-    app.kubernetes.io/component: main
+    app.kubernetes.io/component: echo-server
     app.kubernetes.io/instance: echo-server
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: echo-server
 spec:
   revisionHistoryLimit: 3
   replicas: 1
   strategy:
     type: RollingUpdate
   selector:
     matchLabels:
-      app.kubernetes.io/component: main
+      app.kubernetes.io/component: echo-server
       app.kubernetes.io/name: echo-server
       app.kubernetes.io/instance: echo-server
   template:
     metadata:
       labels:
-        app.kubernetes.io/component: main
+        app.kubernetes.io/component: echo-server
         app.kubernetes.io/instance: echo-server
         app.kubernetes.io/name: echo-server
     spec:
-      enableServiceLinks: true
+      enableServiceLinks: false
       serviceAccountName: default
       automountServiceAccountToken: true
       securityContext:
         runAsGroup: 65534
         runAsNonRoot: true
         runAsUser: 65534
@@ -52,13 +52,13 @@

           httpGet:
             path: /healthz
             port: 8080
           initialDelaySeconds: 0
           periodSeconds: 10
           timeoutSeconds: 1
-        name: main
+        name: echo-server
         readinessProbe:
           failureThreshold: 3
           httpGet:
             path: /healthz
             port: 8080
           initialDelaySeconds: 0
--- HelmRelease: network/echo-server Ingress: network/echo-server

+++ HelmRelease: network/echo-server Ingress: network/echo-server

@@ -1,28 +0,0 @@

----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: echo-server
-  labels:
-    app.kubernetes.io/instance: echo-server
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/name: echo-server
-  annotations:
-    external-dns.alpha.kubernetes.io/target: external.${SECRET_DOMAIN}
-spec:
-  ingressClassName: external
-  tls:
-  - hosts:
-    - echo-server-external.${SECRET_DOMAIN}
-  rules:
-  - host: echo-server-external.${SECRET_DOMAIN}
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: echo-server
-            port:
-              number: 8080
-
--- HelmRelease: network/echo-server Ingress: network/echo-server-external

+++ HelmRelease: network/echo-server Ingress: network/echo-server-external

@@ -0,0 +1,28 @@

+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: echo-server-external
+  labels:
+    app.kubernetes.io/instance: echo-server
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: echo-server
+  annotations:
+    external-dns.alpha.kubernetes.io/target: external.${SECRET_DOMAIN}
+spec:
+  ingressClassName: external
+  tls:
+  - hosts:
+    - echo-server-external.${SECRET_DOMAIN}
+  rules:
+  - host: echo-server-external.${SECRET_DOMAIN}
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: echo-server
+            port:
+              number: 8080
+
--- HelmRelease: default/mc-raul Service: default/mc-raul

+++ HelmRelease: default/mc-raul Service: default/mc-raul

@@ -17,10 +17,10 @@

   ports:
   - port: 25565
     targetPort: 25565
     protocol: TCP
     name: minecraft
   selector:
-    app.kubernetes.io/component: main
+    app.kubernetes.io/component: mc-raul
     app.kubernetes.io/instance: mc-raul
     app.kubernetes.io/name: mc-raul
 
--- HelmRelease: default/mc-raul Deployment: default/mc-raul

+++ HelmRelease: default/mc-raul Deployment: default/mc-raul

@@ -1,34 +1,34 @@

 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: mc-raul
   labels:
-    app.kubernetes.io/component: main
+    app.kubernetes.io/component: mc-raul
     app.kubernetes.io/instance: mc-raul
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: mc-raul
 spec:
   revisionHistoryLimit: 3
   replicas: 1
   strategy:
     type: Recreate
   selector:
     matchLabels:
-      app.kubernetes.io/component: main
+      app.kubernetes.io/component: mc-raul
       app.kubernetes.io/name: mc-raul
       app.kubernetes.io/instance: mc-raul
   template:
     metadata:
       labels:
-        app.kubernetes.io/component: main
+        app.kubernetes.io/component: mc-raul
         app.kubernetes.io/instance: mc-raul
         app.kubernetes.io/name: mc-raul
     spec:
-      enableServiceLinks: true
+      enableServiceLinks: false
       serviceAccountName: default
       automountServiceAccountToken: false
       securityContext:
         fsGroup: 1000
         fsGroupChangePolicy: Always
         runAsGroup: 1000
@@ -73,25 +73,19 @@

             Sailanarmo, McThom1st, exoticJai, JessMae05
         image: ghcr.io/itzg/minecraft-server:2024.3.0
         livenessProbe:
           exec:
             command:
             - mc-health
-          failureThreshold: 3
-          initialDelaySeconds: 0
           periodSeconds: 60
-          timeoutSeconds: 1
-        name: main
+        name: mc-raul
         readinessProbe:
           exec:
             command:
             - mc-health
-          failureThreshold: 3
-          initialDelaySeconds: 0
           periodSeconds: 60
-          timeoutSeconds: 1
         resources:
           limits:
             cpu: 2000m
             memory: 6000Mi
           requests:
             cpu: 100m
@@ -108,13 +102,12 @@

           exec:
             command:
             - mc-health
           failureThreshold: 300
           initialDelaySeconds: 30
           periodSeconds: 1
-          timeoutSeconds: 1
         volumeMounts:
         - mountPath: /data
           name: data
         - mountPath: /tmp
           name: tmp
       volumes:

@cschmittiey
Copy link
Owner

lgtm 🚀 🚀 🚀

@cschmittiey cschmittiey merged commit 4b05a4b into main Mar 15, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant