mirror of
https://gitlab.fabcity.hamburg/software/fab-city-software-kit.git
synced 2024-09-20 04:18:51 +02:00
fixed local dns and gitea deployment
This commit is contained in:
parent
35894a2f32
commit
3b6f24d71e
|
@ -7,10 +7,7 @@ helmCharts:
|
||||||
releaseName: fcos-gitea
|
releaseName: fcos-gitea
|
||||||
namespace: gitea
|
namespace: gitea
|
||||||
repo: https://dl.gitea.io/charts/
|
repo: https://dl.gitea.io/charts/
|
||||||
- name: gitea-backup
|
valuesFile: values.yaml
|
||||||
releaseName: fcos-gitea-backup
|
|
||||||
namespace: gitea
|
|
||||||
repo: https://ten7.github.io/gitea-backup/
|
|
||||||
patches:
|
patches:
|
||||||
- target:
|
- target:
|
||||||
{ kind: ServiceAccount|Secret|Deployment|Service|Pod|StatefulSet|Ingress }
|
{ kind: ServiceAccount|Secret|Deployment|Service|Pod|StatefulSet|Ingress }
|
||||||
|
|
30
apps/gitea/values.yaml
Normal file
30
apps/gitea/values.yaml
Normal file
|
@ -0,0 +1,30 @@
|
||||||
|
---
|
||||||
|
# https://gitea.com/gitea/helm-chart/#user-content-parameters
|
||||||
|
|
||||||
|
service:
|
||||||
|
http:
|
||||||
|
type: ClusterIP
|
||||||
|
port: 3000
|
||||||
|
clusterIP:
|
||||||
|
ssh:
|
||||||
|
type: ClusterIP
|
||||||
|
port: 22
|
||||||
|
clusterIP:
|
||||||
|
|
||||||
|
ingress:
|
||||||
|
enabled: true
|
||||||
|
apiVersion: networking.k8s.io/v1
|
||||||
|
# className: nginx
|
||||||
|
# annotations:
|
||||||
|
# kubernetes.io/ingress.class: nginx
|
||||||
|
hosts:
|
||||||
|
- host: code.localhost
|
||||||
|
paths:
|
||||||
|
- path: /
|
||||||
|
pathType: Prefix
|
||||||
|
gitea:
|
||||||
|
# https://docs.gitea.io/en-us/config-cheat-sheet/
|
||||||
|
config:
|
||||||
|
APP_NAME: "Fab City Codebase"
|
||||||
|
log:
|
||||||
|
ENABLE_ACCESS_LOG: true
|
|
@ -3,7 +3,7 @@ helmCharts:
|
||||||
- name: ingress-nginx
|
- name: ingress-nginx
|
||||||
repo: https://kubernetes.github.io/ingress-nginx
|
repo: https://kubernetes.github.io/ingress-nginx
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
version: 4.1.4
|
version: 4.2.0
|
||||||
releaseName: fcos-ingress-nginx
|
releaseName: fcos-ingress-nginx
|
||||||
resources:
|
resources:
|
||||||
- namespace.yaml
|
- namespace.yaml
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
---
|
---
|
||||||
resources:
|
resources:
|
||||||
|
# - ./operator-framework
|
||||||
- ../apps/ingress-nginx
|
- ../apps/ingress-nginx
|
||||||
- ../apps/cert-manager
|
- ../apps/cert-manager
|
||||||
- ../apps/gitea
|
- ../apps/gitea
|
||||||
|
|
|
@ -1,21 +0,0 @@
|
||||||
---
|
|
||||||
apiVersion: networking.k8s.io/v1
|
|
||||||
kind: Ingress
|
|
||||||
metadata:
|
|
||||||
name: gitea-server-ingress
|
|
||||||
namespace: gitea
|
|
||||||
annotations:
|
|
||||||
kubernetes.io/ingress.class: nginx
|
|
||||||
kubernetes.io/tls-acme: "false"
|
|
||||||
spec:
|
|
||||||
rules:
|
|
||||||
- host: code.localhost
|
|
||||||
http:
|
|
||||||
paths:
|
|
||||||
- path: /
|
|
||||||
pathType: Prefix
|
|
||||||
backend:
|
|
||||||
service:
|
|
||||||
name: gitea-http
|
|
||||||
port:
|
|
||||||
name: http
|
|
|
@ -1,23 +0,0 @@
|
||||||
---
|
|
||||||
patches:
|
|
||||||
- target:
|
|
||||||
kind: Ingress
|
|
||||||
group: networking.k8s.io
|
|
||||||
version: v1
|
|
||||||
labelSelector: "app=gitea"
|
|
||||||
patch: |-
|
|
||||||
- op: replace
|
|
||||||
path: /spec/rules
|
|
||||||
value:
|
|
||||||
- host: code.fabcity-hamburg.de
|
|
||||||
http:
|
|
||||||
paths:
|
|
||||||
- path: /
|
|
||||||
pathType: Prefix
|
|
||||||
|
|
||||||
- op: replace
|
|
||||||
path: /spec/tls
|
|
||||||
value:
|
|
||||||
- secretName: gitea-tls
|
|
||||||
hosts:
|
|
||||||
- code.fabcity-hamburg.de
|
|
|
@ -1,12 +1,6 @@
|
||||||
---
|
---
|
||||||
resources:
|
resources:
|
||||||
- ../../base
|
- ../../base
|
||||||
secretGenerator:
|
|
||||||
- name: admin-secret
|
|
||||||
literals:
|
|
||||||
- username=devel
|
|
||||||
- password=devel
|
|
||||||
- email=hostmaster@localhost
|
|
||||||
patches:
|
patches:
|
||||||
- target:
|
- target:
|
||||||
kind: Ingress
|
kind: Ingress
|
||||||
|
|
|
@ -1,9 +1,21 @@
|
||||||
---
|
---
|
||||||
apiVersion: k3d.io/v1alpha4
|
apiVersion: k3d.io/v1alpha4
|
||||||
kind: Simple
|
kind: Simple
|
||||||
|
image: docker.io/rancher/k3s:v1.23.8-k3s1
|
||||||
servers: 1
|
servers: 1
|
||||||
agents: 2
|
agents: 2
|
||||||
image: docker.io/rancher/k3s:v1.23.8-k3s1
|
# network: fcos-dev-net
|
||||||
|
subnet: "172.23.0.0/16"
|
||||||
|
ports:
|
||||||
|
- port: 8080:80
|
||||||
|
nodeFilters:
|
||||||
|
- loadbalancer
|
||||||
|
- port: 8443:443
|
||||||
|
nodeFilters:
|
||||||
|
- loadbalancer
|
||||||
|
- port: 6443:6443
|
||||||
|
nodeFilters:
|
||||||
|
- loadbalancer
|
||||||
options:
|
options:
|
||||||
kubeconfig:
|
kubeconfig:
|
||||||
updateDefaultKubeconfig: true
|
updateDefaultKubeconfig: true
|
||||||
|
|
Loading…
Reference in a new issue