This is an automated email from the ASF dual-hosted git repository.
sciabarracom pushed a commit to branch 0.9.0
in repository https://gitbox.apache.org/repos/asf/openserverless-task.git
The following commit(s) were added to refs/heads/0.9.0 by this push:
new 7981be9 fixing extra path
7981be9 is described below
commit 7981be97d0b8df4fa7453ff493b3cb65c4117ebf
Author: Build OpenServerless <[email protected]>
AuthorDate: Thu Oct 1 14:26:35 2026 +0000
fixing extra path
---
admin/ingress/nginx-template.yaml | 51 ++--------------------------------
admin/ingress/traefik-template.yaml | 55 ++-----------------------------------
cloud/k3s/opsfile.yml | 8 +++---
3 files changed, 10 insertions(+), 104 deletions(-)
diff --git a/admin/ingress/nginx-template.yaml
b/admin/ingress/nginx-template.yaml
index 94a0a9a..ed87d2b 100644
--- a/admin/ingress/nginx-template.yaml
+++ b/admin/ingress/nginx-template.yaml
@@ -12,42 +12,6 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
- annotations:
- nginx.ingress.kubernetes.io/proxy-body-size: 48m
- nginx.ingress.kubernetes.io/proxy-connect-timeout: "300"
- nginx.ingress.kubernetes.io/proxy-read-timeout: "300"
- nginx.ingress.kubernetes.io/proxy-send-timeout: "300"
-
-$T cert-manager.io/cluster-issuer: letsencrypt-prod
-$T nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
-
- name: ${USERNAME}-my-streamer-ingress
- namespace: openserverless
-
-spec:
- ingressClassName: nginx
-
-$T tls:
-$T - hosts:
-$T - ${USERNAME}.${BASE_HOST:-localhost}
-$T secretName: streamer-api-tls
-
- rules:
- - host: ${USERNAME}.${BASE_HOST:-localhost}
- http:
- paths:
- - backend:
- service:
- name: openserverless-streamer-api
- port:
- number: 8080
- path: /
- pathType: Prefix
-
---
# /stream/web/... -> /web/${USERNAME}/...
apiVersion: networking.k8s.io/v1
@@ -61,9 +25,6 @@ metadata:
nginx.ingress.kubernetes.io/use-regex: "true"
nginx.ingress.kubernetes.io/rewrite-target: /web/${USERNAME}/$$2
-$T cert-manager.io/cluster-issuer: letsencrypt-prod
-$T nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
-
name: ${USERNAME}-my-streamer-web-ingress
namespace: openserverless
@@ -73,7 +34,7 @@ spec:
$T tls:
$T - hosts:
$T - ${USERNAME}.${BASE_HOST:-localhost}
-$T secretName: streamer-api-tls
+$T secretName: ${USERNAME}-crt
rules:
- host: ${USERNAME}.${BASE_HOST:-localhost}
@@ -100,9 +61,6 @@ metadata:
nginx.ingress.kubernetes.io/use-regex: "true"
nginx.ingress.kubernetes.io/rewrite-target: /action/${USERNAME}/$$2
-$T cert-manager.io/cluster-issuer: letsencrypt-prod
-$T nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
-
name: ${USERNAME}-my-streamer-action-ingress
namespace: openserverless
@@ -112,7 +70,7 @@ spec:
$T tls:
$T - hosts:
$T - ${USERNAME}.${BASE_HOST:-localhost}
-$T secretName: streamer-api-tls
+$T secretName: ${USERNAME}-crt
rules:
- host: ${USERNAME}.${BASE_HOST:-localhost}
@@ -142,9 +100,6 @@ metadata:
nginx.ingress.kubernetes.io/proxy-read-timeout: "300"
nginx.ingress.kubernetes.io/proxy-send-timeout: "300"
-$T cert-manager.io/cluster-issuer: letsencrypt-prod
-$T nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
-
name: ${USERNAME}-my-s3-ingress
namespace: openserverless
@@ -154,7 +109,7 @@ spec:
$T tls:
$T - hosts:
$T - ${USERNAME}.${BASE_HOST:-localhost}
-$T secretName: streamer-api-tls
+$T secretName: ${USERNAME}-crt
rules:
- host: ${USERNAME}.${BASE_HOST:-localhost}
diff --git a/admin/ingress/traefik-template.yaml
b/admin/ingress/traefik-template.yaml
index 1806f9a..260a285 100644
--- a/admin/ingress/traefik-template.yaml
+++ b/admin/ingress/traefik-template.yaml
@@ -12,43 +12,6 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
- annotations:
- nginx.ingress.kubernetes.io/proxy-body-size: 1024m
- traefik.ingress.kubernetes.io/transport.respondingTimeouts.idleTimeout:
"600"
- traefik.ingress.kubernetes.io/transport.respondingTimeouts.readTimeout:
"600"
- traefik.ingress.kubernetes.io/transport.respondingTimeouts.writeTimeout:
"600"
-
-$T cert-manager.io/cluster-issuer: letsencrypt-prod
-$T traefik.ingress.kubernetes.io/router.tls: "true"
-$T traefik.ingress.kubernetes.io/router.entrypoints: websecure,web
-
- name: ${USERNAME}-my-streamer-ingress
- namespace: openserverless
-
-spec:
- ingressClassName: traefik
-
-$T tls:
-$T - hosts:
-$T - ${USERNAME}.${BASE_HOST:-localhost}
-$T secretName: streamer-api-tls
-
- rules:
- - host: ${USERNAME}.${BASE_HOST:-localhost}
- http:
- paths:
- - backend:
- service:
- name: openserverless-streamer-api
- port:
- number: 8080
- path: /
- pathType: Prefix
-
---
# /stream/web/... -> /web/${USERNAME}/...
apiVersion: traefik.io/v1alpha1
@@ -84,10 +47,6 @@ metadata:
traefik.ingress.kubernetes.io/transport.respondingTimeouts.readTimeout:
"600"
traefik.ingress.kubernetes.io/transport.respondingTimeouts.writeTimeout:
"600"
-$T cert-manager.io/cluster-issuer: letsencrypt-prod
-$T traefik.ingress.kubernetes.io/router.tls: "true"
-$T traefik.ingress.kubernetes.io/router.entrypoints: websecure,web
-
name: ${USERNAME}-my-streamer-web-ingress
namespace: openserverless
@@ -97,7 +56,7 @@ spec:
$T tls:
$T - hosts:
$T - ${USERNAME}.${BASE_HOST:-localhost}
-$T secretName: streamer-api-tls
+$T secretName: ${USERNAME}-crt
rules:
- host: ${USERNAME}.${BASE_HOST:-localhost}
@@ -122,10 +81,6 @@ metadata:
traefik.ingress.kubernetes.io/transport.respondingTimeouts.readTimeout:
"600"
traefik.ingress.kubernetes.io/transport.respondingTimeouts.writeTimeout:
"600"
-$T cert-manager.io/cluster-issuer: letsencrypt-prod
-$T traefik.ingress.kubernetes.io/router.tls: "true"
-$T traefik.ingress.kubernetes.io/router.entrypoints: websecure,web
-
name: ${USERNAME}-my-streamer-action-ingress
namespace: openserverless
@@ -135,7 +90,7 @@ spec:
$T tls:
$T - hosts:
$T - ${USERNAME}.${BASE_HOST:-localhost}
-$T secretName: streamer-api-tls
+$T secretName: ${USERNAME}-crt
rules:
- host: ${USERNAME}.${BASE_HOST:-localhost}
@@ -165,10 +120,6 @@ metadata:
traefik.ingress.kubernetes.io/transport.respondingTimeouts.readTimeout:
"600"
traefik.ingress.kubernetes.io/transport.respondingTimeouts.writeTimeout:
"600"
-$T cert-manager.io/cluster-issuer: letsencrypt-prod
-$T traefik.ingress.kubernetes.io/router.tls: "true"
-$T traefik.ingress.kubernetes.io/router.entrypoints: websecure,web
-
name: ${USERNAME}-my-s3-ingress
namespace: openserverless
@@ -178,7 +129,7 @@ spec:
$T tls:
$T - hosts:
$T - ${USERNAME}.${BASE_HOST:-localhost}
-$T secretName: streamer-api-tls
+$T secretName: ${USERNAME}-crt
rules:
- host: ${USERNAME}.${BASE_HOST:-localhost}
diff --git a/cloud/k3s/opsfile.yml b/cloud/k3s/opsfile.yml
index 205bd4e..1c91124 100644
--- a/cloud/k3s/opsfile.yml
+++ b/cloud/k3s/opsfile.yml
@@ -76,15 +76,15 @@ tasks:
- cp "$OPS_TMP/kubeconfig" "$OPS_TMP/k3s-{{._server_}}.kubeconfig"
delete:
+ vars:
+ INSTALL_USER: '{{._user_ | default "root"}}'
silent: true
desc: uninstall with ssh in <server> using <username> with sudo
cmds:
- test -n "{{._server_}}" || die "please use <server>"
- - "{{.SSH}} '{{._user_}}@{{._server_}}' sudo
/usr/local/bin/k3s-killall.sh"
- - "{{.SSH}} '{{._user_}}@{{._server_}}' sudo
/usr/local/bin/k3s-uninstall.sh"
+ - "{{.SSH}} '{{.INSTALL_USER}}@{{._server_}}' sudo
/usr/local/bin/k3s-killall.sh"
+ - "{{.SSH}} '{{.INSTALL_USER}}@{{._server_}}' sudo
/usr/local/bin/k3s-uninstall.sh"
- rm "$OPS_TMP/kubeconfig" "$OPS_TMP/k3s-{{._server_}}.kubeconfig"
- vars:
- USERNAME: '{{.USERNAME | default "root"}}'
status:
desc: status of the server
