Compare commits

...

2 Commits

Author SHA1 Message Date
f257bee149 Add a redirection from .org to .io 2025-08-15 22:59:35 +02:00
ac6b75de11 Change domain to "katenary.io" 2025-08-15 22:59:23 +02:00
11 changed files with 62 additions and 16 deletions

View File

@@ -68,7 +68,7 @@ def tranform(name: str, ns: str, domain: str) -> dict:
if __name__ == "__main__": if __name__ == "__main__":
name = os.getenv("NAME", "website-server") # name of the ingress name = os.getenv("NAME", "website-server") # name of the ingress
ns = os.getenv("NAMESPACE", "katenary") # namespace ns = os.getenv("NAMESPACE", "katenary") # namespace
domain = os.getenv("DOMAIN", "katenary.org") # domain name without www domain = os.getenv("DOMAIN", "katenary.io") # domain name without www
transformed = tranform(name, ns, domain) transformed = tranform(name, ns, domain)
print(yaml.dump(transformed)) print(yaml.dump(transformed))

View File

@@ -1,14 +1,14 @@
# This is the main values.yaml file for the website chart. # This is the main values.yaml file for the website chart.
# More information can be found in the chart's README.md file. # More information can be found in the chart's README.md file.
# #
# generated at: 2025-07-13T12:10:43+02:00 # generated at: 2025-08-15T22:10:22+02:00
# compose files: compose.katenary.yaml, compose.yaml # compose files: compose.katenary.yaml, compose.yaml
# compose hash (sha1): ad8a7a55c2536a97d1e04148b6677ce1c72b6d5c # compose hash (sha1): 0c69ac40895910ccdabc3a2655ff7a3e6f5cf9fa
# Name of the chart (required), basically the name of the project. # Name of the chart (required), basically the name of the project.
name: website name: website
apiVersion: v2 apiVersion: v2
icon: https://repo.katenary.io/Katenary/katenary/src/branch/master/doc/docs/statics/icon.svg
# Version of the chart (required) # Version of the chart (required)
version: 0.1.0 version: 0.1.0

View File

@@ -28,7 +28,7 @@ The following table lists the configurable parameters of the website chart and t
| `server.imagePullPolicy` | `IfNotPresent` | | `server.imagePullPolicy` | `IfNotPresent` |
| `server.ingress.class` | `-` | | `server.ingress.class` | `-` |
| `server.ingress.enabled` | `false` | | `server.ingress.enabled` | `false` |
| `server.ingress.host` | `katenary.org` | | `server.ingress.host` | `katenary.io` |
| `server.ingress.path` | `/` | | `server.ingress.path` | `/` |
| `server.ingress.tls.enabled` | `true` | | `server.ingress.tls.enabled` | `true` |
| `server.ingress.tls.secretName` | `` | | `server.ingress.tls.secretName` | `` |

View File

@@ -2,8 +2,8 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
katenary.v3/compose-hash: ad8a7a55c2536a97d1e04148b6677ce1c72b6d5c katenary.v3/compose-hash: 0c69ac40895910ccdabc3a2655ff7a3e6f5cf9fa
katenary.v3/version: develop-89fd516 katenary.v3/version: 3.0.0-rc5
labels: labels:
{{- include "website.labels" . | nindent 4 }} {{- include "website.labels" . | nindent 4 }}
katenary.v3/component: server katenary.v3/component: server

View File

@@ -5,8 +5,8 @@ apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
annotations: annotations:
katenary.v3/compose-hash: ad8a7a55c2536a97d1e04148b6677ce1c72b6d5c katenary.v3/compose-hash: 0c69ac40895910ccdabc3a2655ff7a3e6f5cf9fa
katenary.v3/version: develop-89fd516 katenary.v3/version: 3.0.0-rc5
{{- if .Values.server.ingress.annotations -}} {{- if .Values.server.ingress.annotations -}}
{{- toYaml .Values.server.ingress.annotations | nindent 4 }} {{- toYaml .Values.server.ingress.annotations | nindent 4 }}
{{- end }} {{- end }}

View File

@@ -2,8 +2,8 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
annotations: annotations:
katenary.v3/compose-hash: ad8a7a55c2536a97d1e04148b6677ce1c72b6d5c katenary.v3/compose-hash: 0c69ac40895910ccdabc3a2655ff7a3e6f5cf9fa
katenary.v3/version: develop-89fd516 katenary.v3/version: 3.0.0-rc5
labels: labels:
{{- include "website.labels" . | nindent 4 }} {{- include "website.labels" . | nindent 4 }}
katenary.v3/component: server katenary.v3/component: server

View File

@@ -148,8 +148,8 @@ data:
kind: ConfigMap kind: ConfigMap
metadata: metadata:
annotations: annotations:
katenary.v3/compose-hash: ad8a7a55c2536a97d1e04148b6677ce1c72b6d5c katenary.v3/compose-hash: 0c69ac40895910ccdabc3a2655ff7a3e6f5cf9fa
katenary.v3/version: develop-89fd516 katenary.v3/version: 3.0.0-rc5
labels: labels:
{{- include "website.labels" . | nindent 4 }} {{- include "website.labels" . | nindent 4 }}
katenary.v3/component: server katenary.v3/component: server

View File

@@ -36,7 +36,7 @@ server:
# key: server.ingress.annotations # key: server.ingress.annotations
annotations: {} annotations: {}
# key: server.ingress.host # key: server.ingress.host
host: katenary.org host: katenary.io
# key: server.ingress.path # key: server.ingress.path
path: / path: /
# key: server.ingress.class # key: server.ingress.class

View File

@@ -7,7 +7,7 @@ services:
- ./dist:/usr/share/nginx/html - ./dist:/usr/share/nginx/html
labels: labels:
katenary.v3/ingress: |- katenary.v3/ingress: |-
hostname: katenary.org hostname: katenary.io
port: 80 port: 80
katenary.v3/configmap-files: |- katenary.v3/configmap-files: |-

46
ingress-redirect.yaml Normal file
View File

@@ -0,0 +1,46 @@
---
# Source: website/templates/server/ingress.yaml
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
annotations:
katenary.v3/compose-hash: 0c69ac40895910ccdabc3a2655ff7a3e6f5cf9fa
katenary.v3/version: 3.0.0-rc5
cert-manager.io/cluster-issuer: letsencrypt-prod
nginx.ingress.kubernetes.io/permanent-redirect: https://katenary.io$request_uri
nginx.ingress.kubernetes.io/rewrite-target: /
labels:
katenary.v3/name: website
katenary.v3/instance: website
katenary.v3/chart-version: "0.1.0"
katenary.v3/app-version: "0.1.0"
katenary.v3/component: server
name: "website-server-org"
spec:
rules:
- host: "katenary.org"
http:
paths:
- backend:
service:
name: "website-server"
port:
name: http
path: "/"
pathType: ImplementationSpecific
- host: "www.katenary.org"
http:
paths:
- backend:
service:
name: "website-server"
port:
name: http
path: "/"
pathType: ImplementationSpecific
tls:
- hosts:
- "www.katenary.org"
- "katenary.org"
secretName: "website-server-tls-org"

View File

@@ -2,6 +2,6 @@ server:
replicas: 2 replicas: 2
ingress: ingress:
enabled: true enabled: true
host: www.katenary.org host: www.katenary.io
annotations: annotations:
cert-manager.io/cluster-issuer: letsencrypt-prod cert-manager.io/cluster-issuer: letsencrypt-prod