diff --git a/ntfy/deployment.yaml b/ntfy/deployment.yaml index 4a146c9..ac75d0c 100644 --- a/ntfy/deployment.yaml +++ b/ntfy/deployment.yaml @@ -4,7 +4,7 @@ kind: Service metadata: annotations: kompose.cmd: kompose convert -o deployment.yaml -n ntfy - kompose.service.expose: ntfy.wayl.one + kompose.service.expose: ntfy.wayl.one,ntfy.k.waylonwalker.com kompose.version: 1.31.2 (a92241f79) creationTimestamp: null labels: @@ -13,8 +13,8 @@ metadata: namespace: ntfy spec: ports: - - name: "3008" - port: 3008 + - name: "80" + port: 80 targetPort: 80 selector: io.kompose.service: ntfy @@ -37,7 +37,7 @@ kind: Deployment metadata: annotations: kompose.cmd: kompose convert -o deployment.yaml -n ntfy - kompose.service.expose: ntfy.wayl.one + kompose.service.expose: ntfy.wayl.one,ntfy.k.waylonwalker.com kompose.version: 1.31.2 (a92241f79) creationTimestamp: null labels: @@ -55,7 +55,7 @@ spec: metadata: annotations: kompose.cmd: kompose convert -o deployment.yaml -n ntfy - kompose.service.expose: ntfy.wayl.one + kompose.service.expose: ntfy.wayl.one,ntfy.k.waylonwalker.com kompose.version: 1.31.2 (a92241f79) creationTimestamp: null labels: @@ -80,7 +80,6 @@ spec: name: ntfy ports: - containerPort: 80 - hostPort: 3008 protocol: TCP resources: {} securityContext: @@ -106,7 +105,7 @@ kind: Ingress metadata: annotations: kompose.cmd: kompose convert -o deployment.yaml -n ntfy - kompose.service.expose: ntfy.wayl.one + kompose.service.expose: ntfy.wayl.one,ntfy.k.waylonwalker.com kompose.version: 1.31.2 (a92241f79) creationTimestamp: null labels: @@ -122,7 +121,17 @@ spec: service: name: ntfy port: - number: 3008 + number: 80 + path: / + pathType: Prefix + - host: ntfy.k.waylonwalker.com + http: + paths: + - backend: + service: + name: ntfy + port: + number: 80 path: / pathType: Prefix status: diff --git a/ntfy/docker-compose.yml b/ntfy/docker-compose.yml index 0107e53..034311d 100644 --- a/ntfy/docker-compose.yml +++ b/ntfy/docker-compose.yml @@ -13,7 +13,7 @@ services: - ntfy-cache:/var/cache/ntfy - ntfy:/etc/ntfy ports: - - 3008:80 + - 80 healthcheck: # optional: remember to adapt the host:port to your environment test: ["CMD-SHELL", "wget -q --tries=1 http://localhost:80/v1/health -O - | grep -Eo '\"healthy\"\\s*:\\s*true' || exit 1"] interval: 60s @@ -22,7 +22,7 @@ services: start_period: 40s restart: always labels: - kompose.service.expose: ntfy.wayl.one + kompose.service.expose: ntfy.wayl.one,ntfy.k.waylonwalker.com volumes: ntfy: ntfy-cache: diff --git a/ntfy/ntfy-k8s.png b/ntfy/ntfy-k8s.png index ec8d77d..4ead61a 100644 Binary files a/ntfy/ntfy-k8s.png and b/ntfy/ntfy-k8s.png differ