9 Commits

8 changed files with 113 additions and 4 deletions

View File

@@ -35,7 +35,7 @@ spec:
name: cluster-fun (v2) name: cluster-fun (v2)
source: source:
repoURL: 'https://charts.jetstack.io' repoURL: 'https://charts.jetstack.io'
targetRevision: v1.19.2 targetRevision: v1.19.3
chart: cert-manager chart: cert-manager
helm: helm:
version: v3 version: v3

View File

@@ -22,5 +22,9 @@ spec:
- kind: Secret - kind: Secret
jsonPointers: jsonPointers:
- /data - /data
- group: apps
kind: Deployment
jqPathExpressions:
- .spec.template.spec.containers[]?.image
--- ---

View File

@@ -0,0 +1,25 @@
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: mazanoke
namespace: argocd
finalizers:
- resources-finalizer.argocd.argoproj.io
spec:
project: cluster.fun
destination:
namespace: mazanoke
name: cluster-fun (v2)
source:
path: manifests/mazanoke
repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"
targetRevision: HEAD
syncPolicy:
automated: {}
syncOptions:
- CreateNamespace=true
ignoreDifferences:
- kind: Secret
jsonPointers:
- /data

View File

@@ -12,7 +12,7 @@ spec:
name: cluster-fun (v2) name: cluster-fun (v2)
source: source:
repoURL: 'https://stakater.github.io/stakater-charts' repoURL: 'https://stakater.github.io/stakater-charts'
targetRevision: v0.0.129 targetRevision: 2.2.7
chart: reloader chart: reloader
syncPolicy: syncPolicy:
automated: {} automated: {}

View File

@@ -18,6 +18,7 @@ spec:
- ombi.cluster.fun - ombi.cluster.fun
- bsky-feeds.cluster.fun - bsky-feeds.cluster.fun
- ai.cluster.fun - ai.cluster.fun
- penpot.cluster.fun
secretName: non-auth-proxy-ingress secretName: non-auth-proxy-ingress
rules: rules:
- host: hello-world.cluster.fun - host: hello-world.cluster.fun
@@ -60,3 +61,13 @@ spec:
name: tailscale-proxy name: tailscale-proxy
port: port:
name: non-auth name: non-auth
- host: penpot.cluster.fun
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
service:
name: tailscale-proxy
port:
name: non-auth

View File

@@ -0,0 +1,69 @@
apiVersion: v1
kind: Service
metadata:
name: mazanoke
namespace: mazanoke
spec:
type: ClusterIP
ports:
- port: 80
targetPort: web
name: web
selector:
app: mazanoke
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: mazanoke
namespace: mazanoke
spec:
replicas: 1
selector:
matchLabels:
app: mazanoke
template:
metadata:
labels:
app: mazanoke
spec:
containers:
- name: web
image: ghcr.io/civilblur/mazanoke:v1.1.5
imagePullPolicy: Always
ports:
- containerPort: 80
name: web
resources:
limits:
memory: 200Mi
requests:
memory: 200Mi
---
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: mazanoke
namespace: mazanoke
annotations:
cert-manager.io/cluster-issuer: letsencrypt
ingress.kubernetes.io/ssl-redirect: "true"
nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
spec:
ingressClassName: nginx
tls:
- hosts:
- image.cluster.fun
secretName: mazanoke-ingress
rules:
- host: image.cluster.fun
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
service:
name: mazanoke
port:
number: 80

View File

@@ -217,7 +217,7 @@ spec:
serviceAccountName: prometheus-server serviceAccountName: prometheus-server
containers: containers:
- name: vmagent - name: vmagent
image: "victoriametrics/vmagent:v1.134.0" image: "victoriametrics/vmagent:v1.135.0"
imagePullPolicy: "IfNotPresent" imagePullPolicy: "IfNotPresent"
args: args:
- -remoteWrite.url=http://vmcluster.auth-proxy.svc/insert/0/prometheus/ - -remoteWrite.url=http://vmcluster.auth-proxy.svc/insert/0/prometheus/

View File

@@ -45,7 +45,7 @@ spec:
- --entrypoints.websecure.http.tls=true - --entrypoints.websecure.http.tls=true
- --entrypoints.web.http.redirections.entrypoint.to=websecure - --entrypoints.web.http.redirections.entrypoint.to=websecure
- --entrypoints.web.http.redirections.entrypoint.scheme=https - --entrypoints.web.http.redirections.entrypoint.scheme=https
image: rancher/mirrored-library-traefik:3.6.7 image: rancher/mirrored-library-traefik:2.11.34
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
livenessProbe: livenessProbe:
failureThreshold: 3 failureThreshold: 3