Skip to content

Update Traefik API version #94

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.

Sign up for GitHub

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

Open
miki3421 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update Traefik API version #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deploy/nuvolaris-permissions/operator-roles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ rules:
verbs: ["get","patch","list","update","watch","create","delete"]

# required for traefik middlewares
- apiGroups: ["traefik.containo.us"]
- apiGroups: ["traefik.io"]
resources: ["middlewares"]
verbs: ["get","patch","list","update","watch","create","delete"]

Expand Down
12 changes: 6 additions & 6 deletions nuvolaris/endpoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,11 +240,11 @@ def delete(owner=None):
return res

if(ingress_class == 'traefik'):
res = kube.kubectl("delete", "middleware.traefik.containo.us",api_middleware_ingress_name(namespace,"apihost"))
res += kube.kubectl("delete", "middleware.traefik.containo.us",api_middleware_ingress_name(namespace,"apihost-my"))
res += kube.kubectl("delete", "middleware.traefik.containo.us",api_middleware_ingress_name(namespace,"apihost-info"))
res = kube.kubectl("delete", "middleware.traefik.io",api_middleware_ingress_name(namespace,"apihost"))
res += kube.kubectl("delete", "middleware.traefik.io",api_middleware_ingress_name(namespace,"apihost-my"))
res += kube.kubectl("delete", "middleware.traefik.io",api_middleware_ingress_name(namespace,"apihost-info"))
if should_delete_www:
res += kube.kubectl("delete", "middleware.traefik.containo.us",api_middleware_ingress_name(namespace,"apihost-www-my"))
res += kube.kubectl("delete", "middleware.traefik.io",api_middleware_ingress_name(namespace,"apihost-www-my"))

res += kube.kubectl("delete", "ingress",api_ingress_name(namespace,"apihost"))
res += kube.kubectl("delete", "ingress",api_ingress_name(namespace,"apihost-my"))
Expand Down Expand Up @@ -321,8 +321,8 @@ def delete_ow_api_endpoint(ucfg):
return res

if(ingress_class == 'traefik'):
res += kube.kubectl("delete", "middleware.traefik.containo.us",api_middleware_ingress_name(namespace,"apihost"))
res += kube.kubectl("delete", "middleware.traefik.containo.us",api_middleware_ingress_name(namespace,"apihost-my"))
res += kube.kubectl("delete", "middleware.traefik.io",api_middleware_ingress_name(namespace,"apihost"))
res += kube.kubectl("delete", "middleware.traefik.io",api_middleware_ingress_name(namespace,"apihost-my"))

res += kube.kubectl("delete", "ingress",api_ingress_name(namespace,"apihost"))
res += kube.kubectl("delete", "ingress",api_ingress_name(namespace,"apihost-my"))
Expand Down
2 changes: 1 addition & 1 deletion nuvolaris/minio_ingress.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ def delete_minio_ingress(runtime, namespace, ingress_class, type, owner=None):
res += kube.kubectl("delete", "ingress",endpoint.api_ingress_name(namespace,type))

if(ingress_class == 'traefik'):
res = kube.kubectl("delete", "middleware.traefik.containo.us",endpoint.api_middleware_ingress_name(namespace,type))
res = kube.kubectl("delete", "middleware.traefik.io",endpoint.api_middleware_ingress_name(namespace,type))

return res
except Exception as e:
Expand Down
2 changes: 1 addition & 1 deletion nuvolaris/registry_deploy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ def delete_registry_ingress(owner=None, namespace="nuvolaris"):
res += kube.kubectl("delete", "ingress",endpoint.api_ingress_name(namespace,"registry"))

if(ingress_class == 'traefik'):
res = kube.kubectl("delete", "middleware.traefik.containo.us",endpoint.api_middleware_ingress_name(namespace,"registry"))
res = kube.kubectl("delete", "middleware.traefik.io",endpoint.api_middleware_ingress_name(namespace,"registry"))

return res
except Exception as e:
Expand Down
2 changes: 1 addition & 1 deletion nuvolaris/seaweedfs_ingress.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def delete_seaweedfs_ingress(runtime, namespace, ingress_class, type, owner=None
res += kube.kubectl("delete", "ingress",endpoint.api_ingress_name(namespace,type))

if(ingress_class == 'traefik'):
res = kube.kubectl("delete", "middleware.traefik.containo.us",endpoint.api_middleware_ingress_name(namespace,type))
res = kube.kubectl("delete", "middleware.traefik.io",endpoint.api_middleware_ingress_name(namespace,type))

return res
except Exception as e:
Expand Down
6 changes: 3 additions & 3 deletions nuvolaris/storage_static.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ def delete_ow_static_endpoint(ucfg):

if(ingress_class == 'traefik'):
middleware_name = static_middleware_ingress_name(namespace)
res += kube.kubectl("delete", "middleware.traefik.containo.us",middleware_name)
res += kube.kubectl("delete", "middleware.traefik.io",middleware_name)

ingress_name = static_ingress_name(namespace)
res += kube.kubectl("delete", "ingress",ingress_name)
Expand Down Expand Up @@ -221,11 +221,11 @@ def delete_nuv_ingresses():

if(ingress_class == 'traefik'):
middleware_name = static_middleware_ingress_name("nuvolaris")
res += kube.kubectl("delete", "middleware.traefik.containo.us",middleware_name)
res += kube.kubectl("delete", "middleware.traefik.io",middleware_name)

if should_delete_www:
middleware_name = static_middleware_ingress_name("www-nuvolaris")
res += kube.kubectl("delete", "middleware.traefik.containo.us",middleware_name)
res += kube.kubectl("delete", "middleware.traefik.io",middleware_name)

ingress_name = static_ingress_name("nuvolaris")
res += kube.kubectl("delete", "ingress",ingress_name)
Expand Down
2 changes: 1 addition & 1 deletion nuvolaris/templates/traefik-middleware-tpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# under the License.
#
---
apiVersion: traefik.containo.us/v1alpha1
apiVersion: traefik.io/v1alpha1
kind: Middleware
metadata:
namespace: {{namespace}}
Expand Down