diff --git a/k8s/apps/pasarguard/daemonset.yaml b/k8s/apps/pasarguard/daemonset.yaml index 15abe5a..007d7ee 100644 --- a/k8s/apps/pasarguard/daemonset.yaml +++ b/k8s/apps/pasarguard/daemonset.yaml @@ -1,5 +1,4 @@ --- -image: &image 'pasarguard/node:v0.4.0' apiVersion: apps/v1 kind: DaemonSet metadata: @@ -47,7 +46,7 @@ spec: mountPath: /scripts containers: - name: pasarguard-node - image: *image + image: pasarguard/node:v0.4.0 imagePullPolicy: Always command: - /bin/sh @@ -220,4 +219,4 @@ roleRef: subjects: - kind: ServiceAccount name: pasarguard-node - namespace: pasarguard \ No newline at end of file + namespace: pasarguard diff --git a/k8s/apps/pasarguard/deployment.yaml b/k8s/apps/pasarguard/deployment.yaml index 9eeced1..4418785 100644 --- a/k8s/apps/pasarguard/deployment.yaml +++ b/k8s/apps/pasarguard/deployment.yaml @@ -1,5 +1,4 @@ --- -image: &image 'pasarguard/panel:v4.0.2' apiVersion: apps/v1 kind: Deployment metadata: @@ -35,7 +34,7 @@ spec: mountPath: /templates/subscription containers: - name: pasarguard-web - image: *image + image: pasarguard/panel:v4.0.2 imagePullPolicy: Always envFrom: - secretRef: @@ -47,10 +46,6 @@ spec: value: "8000" - name: DOCS value: "true" - - name: UVICORN_SSL_CERTFILE - value: "/app/tls/tls.crt" - - name: UVICORN_SSL_KEYFILE - value: "/app/tls/tls.key" - name: CUSTOM_TEMPLATES_DIRECTORY value: "/code/app/templates/" - name: SUBSCRIPTION_PAGE_TEMPLATE @@ -60,15 +55,9 @@ spec: containerPort: 8000 protocol: TCP volumeMounts: - - name: tls - mountPath: /app/tls - readOnly: true - name: subscription-template mountPath: /code/app/templates/subscription volumes: - - name: tls - secret: - secretName: pasarguard-tls - name: subscription-template emptyDir: {} --- @@ -76,9 +65,6 @@ apiVersion: v1 kind: Service metadata: name: pasarguard - annotations: - traefik.ingress.kubernetes.io/service.serversscheme: https - traefik.ingress.kubernetes.io/service.serverstransport: pasarguard-pasarguard-transport@kubernetescrd spec: selector: app: pasarguard diff --git a/k8s/apps/pasarguard/ingress.yaml b/k8s/apps/pasarguard/ingress.yaml index b102f63..f75b5d5 100644 --- a/k8s/apps/pasarguard/ingress.yaml +++ b/k8s/apps/pasarguard/ingress.yaml @@ -1,31 +1,15 @@ ---- apiVersion: traefik.io/v1alpha1 -kind: ServersTransport +kind: IngressRoute metadata: - name: pasarguard-transport + name: pasarguard spec: - insecureSkipVerify: true ---- -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: pasarguard-ingress - annotations: - traefik.ingress.kubernetes.io/router.entrypoints: websecure -spec: - ingressClassName: traefik - rules: - - host: ps.hexor.cy - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: pasarguard - port: - number: 80 + entryPoints: + - websecure + routes: + - match: Host(`ps.hexor.cy`) + kind: Rule + services: + - name: pasarguard + port: 80 tls: - - secretName: pasarguard-tls - hosts: - - ps.hexor.cy + secretName: pasarguard-tls