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(excalidraw): migrate to app-template v2 #2171

Merged
merged 2 commits into from
Nov 28, 2023

Conversation

tyriis
Copy link
Owner

@tyriis tyriis commented Nov 28, 2023

No description provided.

@tyriis-automation
Copy link
Contributor

tyriis-automation bot commented Nov 28, 2023

--- kubernetes/talos-flux/apps/productivity/excalidraw/app Kustomization: flux-system/apps-excalidraw HelmRelease: productivity/excalidraw

+++ kubernetes/talos-flux/apps/productivity/excalidraw/app Kustomization: flux-system/apps-excalidraw HelmRelease: productivity/excalidraw

@@ -9,65 +9,70 @@

     spec:
       chart: app-template
       sourceRef:
         kind: HelmRepository
         name: bjw-s-charts
         namespace: flux-system
-      version: 1.5.1
+      version: 2.3.0
   install:
     createNamespace: true
     remediation:
       retries: 3
   interval: 15m
   upgrade:
     remediation:
       retries: 3
   values:
-    controller:
-      replicas: 3
-      strategy: RollingUpdate
-    image:
-      repository: ghcr.io/onedr0p/excalidraw
-      tag: latest@sha256:bafe3a1e529aac9e9d536199e77133b60bfce4413458ee0a46e48fb07095d23b
+    controllers:
+      main:
+        containers:
+          main:
+            image:
+              repository: ghcr.io/onedr0p/excalidraw
+              tag: latest@sha256:bafe3a1e529aac9e9d536199e77133b60bfce4413458ee0a46e48fb07095d23b
+            resources:
+              limits:
+                memory: 50Mi
+              requests:
+                cpu: 5m
+                memory: 10Mi
+        pod:
+          topologySpreadConstraints:
+          - labelSelector:
+              matchLabels:
+                app.kubernetes.io/name: excalidraw
+            maxSkew: 1
+            topologyKey: kubernetes.io/hostname
+            whenUnsatisfiable: DoNotSchedule
+        replicas: 3
+        strategy: RollingUpdate
     ingress:
       main:
         annotations:
           cert-manager.io/cluster-issuer: letsencrypt-production
           hajimari.io/appName: excalidraw
           hajimari.io/enable: 'true'
           hajimari.io/icon: draw-pen
           kubernetes.io/tls-acme: 'true'
           traefik.ingress.kubernetes.io/affinity: 'true'
           traefik.ingress.kubernetes.io/router.entrypoints: websecure
           traefik.ingress.kubernetes.io/router.middlewares: traefik-ingress-sso@kubernetescrd
           traefik.ingress.kubernetes.io/router.tls: 'true'
+        className: traefik
         enabled: true
         hosts:
         - host: draw.${SECRET_DOMAIN}
           paths:
           - path: /
-            pathType: Prefix
-        ingressClassName: traefik
+            service:
+              name: main
+              port: http
         tls:
         - hosts:
           - draw.${SECRET_DOMAIN}
           secretName: excalidraw-tls
-    resources:
-      limits:
-        memory: 50Mi
-      requests:
-        cpu: 5m
-        memory: 10Mi
     service:
       main:
         ports:
           http:
             port: 80
-    topologySpreadConstraints:
-    - labelSelector:
-        matchLabels:
-          app.kubernetes.io/name: excalidraw
-      maxSkew: 1
-      topologyKey: kubernetes.io/hostname
-      whenUnsatisfiable: DoNotSchedule
-    values: null
 

@tyriis-automation
Copy link
Contributor

tyriis-automation bot commented Nov 28, 2023

--- kubernetes HelmRelease: productivity/excalidraw Deployment: productivity/excalidraw

+++ kubernetes HelmRelease: productivity/excalidraw Deployment: productivity/excalidraw

@@ -1,71 +1,72 @@

 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: excalidraw
   labels:
+    app.kubernetes.io/component: main
     app.kubernetes.io/instance: excalidraw
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: excalidraw
 spec:
   revisionHistoryLimit: 3
   replicas: 3
   strategy:
     type: RollingUpdate
   selector:
     matchLabels:
+      app.kubernetes.io/component: main
       app.kubernetes.io/name: excalidraw
       app.kubernetes.io/instance: excalidraw
   template:
     metadata:
       labels:
+        app.kubernetes.io/component: main
+        app.kubernetes.io/instance: excalidraw
         app.kubernetes.io/name: excalidraw
-        app.kubernetes.io/instance: excalidraw
     spec:
+      enableServiceLinks: true
       serviceAccountName: default
       automountServiceAccountToken: true
+      hostIPC: false
+      hostNetwork: false
+      hostPID: false
       dnsPolicy: ClusterFirst
-      enableServiceLinks: true
+      topologySpreadConstraints:
+      - labelSelector:
+          matchLabels:
+            app.kubernetes.io/name: excalidraw
+        maxSkew: 1
+        topologyKey: kubernetes.io/hostname
+        whenUnsatisfiable: DoNotSchedule
       containers:
-      - name: excalidraw
-        image: ghcr.io/onedr0p/excalidraw:latest@sha256:bafe3a1e529aac9e9d536199e77133b60bfce4413458ee0a46e48fb07095d23b
-        imagePullPolicy: null
-        ports:
-        - name: http
-          containerPort: 80
-          protocol: TCP
+      - image: ghcr.io/onedr0p/excalidraw:latest@sha256:bafe3a1e529aac9e9d536199e77133b60bfce4413458ee0a46e48fb07095d23b
         livenessProbe:
           failureThreshold: 3
           initialDelaySeconds: 0
           periodSeconds: 10
           tcpSocket:
             port: 80
           timeoutSeconds: 1
+        name: main
         readinessProbe:
           failureThreshold: 3
           initialDelaySeconds: 0
           periodSeconds: 10
-          tcpSocket:
-            port: 80
-          timeoutSeconds: 1
-        startupProbe:
-          failureThreshold: 30
-          initialDelaySeconds: 0
-          periodSeconds: 5
           tcpSocket:
             port: 80
           timeoutSeconds: 1
         resources:
           limits:
             memory: 50Mi
           requests:
             cpu: 5m
             memory: 10Mi
-      topologySpreadConstraints:
-      - labelSelector:
-          matchLabels:
-            app.kubernetes.io/name: excalidraw
-        maxSkew: 1
-        topologyKey: kubernetes.io/hostname
-        whenUnsatisfiable: DoNotSchedule
+        startupProbe:
+          failureThreshold: 30
+          initialDelaySeconds: 0
+          periodSeconds: 5
+          tcpSocket:
+            port: 80
+          timeoutSeconds: 1
 
--- kubernetes HelmRelease: productivity/excalidraw Service: productivity/excalidraw

+++ kubernetes HelmRelease: productivity/excalidraw Service: productivity/excalidraw

@@ -1,21 +1,22 @@

 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: excalidraw
   labels:
-    app.kubernetes.io/service: excalidraw
     app.kubernetes.io/instance: excalidraw
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: excalidraw
+    app.kubernetes.io/service: excalidraw
 spec:
   type: ClusterIP
   ports:
   - port: 80
-    targetPort: http
+    targetPort: 80
     protocol: TCP
     name: http
   selector:
+    app.kubernetes.io/component: main
     app.kubernetes.io/instance: excalidraw
     app.kubernetes.io/name: excalidraw
 

@tyriis-automation
Copy link
Contributor

tyriis-automation bot commented Nov 28, 2023

🦙 MegaLinter status: ✅ SUCCESS

Descriptor Linter Files Fixed Errors Elapsed time
✅ EDITORCONFIG editorconfig-checker 1 0 0.01s
✅ REPOSITORY gitleaks yes no 1.55s
✅ YAML prettier 1 0 0.5s
✅ YAML yamllint 1 0 0.26s

See detailed report in MegaLinter reports
Set VALIDATE_ALL_CODEBASE: true in mega-linter.yml to validate all sources, not only the diff

MegaLinter is graciously provided by OX Security

@tyriis tyriis merged commit 9bd05e2 into main Nov 28, 2023
8 checks passed
@tyriis tyriis deleted the feature/app-template-v2-migration branch November 28, 2023 11:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant