fix gitea configuration, install external-secrets
This commit is contained in:
parent
77644f5240
commit
251f012e9a
|
@ -25,7 +25,7 @@ spec:
|
|||
fieldRef:
|
||||
fieldPath: metadata.namespace
|
||||
- name: DRONE_RPC_HOST
|
||||
value: drone-server.$(DRONE_NAMESPACE_DEFAULT).svc.cluster.local
|
||||
value: drone-server.gitea.svc.cluster.local # TODO: not hardcode
|
||||
- name: DRONE_RPC_PROTO
|
||||
value: http
|
||||
- name: DRONE_RPC_SECRET
|
||||
|
|
|
@ -23,14 +23,14 @@ spec:
|
|||
- name: drone
|
||||
image: drone/drone
|
||||
env:
|
||||
- name: DRONE_GITEA_SERVER
|
||||
value: https://${GITEA_EXTERNAL_HOST}
|
||||
- name: DRONE_SERVER_HOST
|
||||
value: ${DRONE_EXTERNAL_HOST}
|
||||
- name: DRONE_SERVER_PORT
|
||||
value: ":80"
|
||||
- name: DRONE_SERVER_PROTO
|
||||
value: https
|
||||
- name: DRONE_GITEA_SERVER
|
||||
value: https://${GITEA_EXTERNAL_HOST}
|
||||
- name: DRONE_GITEA_CLIENT_ID
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
apiVersion: helm.cattle.io/v1
|
||||
kind: HelmChart
|
||||
metadata:
|
||||
name: external-secrets
|
||||
namespace: kube-system
|
||||
spec:
|
||||
repo: https://charts.external-secrets.io
|
||||
chart: external-secrets
|
||||
version: 0.7.2
|
||||
targetNamespace: external-secrets
|
||||
set:
|
||||
installCRDs: "true"
|
|
@ -0,0 +1,4 @@
|
|||
apiVersion: v1
|
||||
kind: Namespace
|
||||
metadata:
|
||||
name: external-secrets
|
|
@ -0,0 +1,6 @@
|
|||
resources:
|
||||
- external-secrets-namespace.yaml
|
||||
- external-secrets-helmchart.yaml
|
||||
|
||||
commonLabels:
|
||||
app.kubernetes.io/name: external-secrets
|
|
@ -20,12 +20,14 @@ spec:
|
|||
- name: gitea
|
||||
image: gitea/gitea
|
||||
env:
|
||||
- name: GITEA__SERVER__ROOT_URL
|
||||
value: https://${GITEA_EXTERNAL_HOST}
|
||||
- name: GITEA__WEBHOOK_ALLOWED_HOST_LIST
|
||||
value: ${DRONE_EXTERNAL_HOST}
|
||||
- name: GITEA__DEFAULT__APP_NAME
|
||||
value: Badjware's code stash
|
||||
- name: GITEA__SERVICE__DISABLE_REGISTRATION
|
||||
value: "yes"
|
||||
- name: GITEA__SERVER__ROOT_URL
|
||||
value: https://${GITEA_EXTERNAL_HOST}
|
||||
- name: GITEA__SERVER__SSH_DOMAIN
|
||||
value: ${GITEA_EXTERNAL_HOST}
|
||||
- name: GITEA__SERVER__SSH_PORT
|
||||
|
@ -36,8 +38,6 @@ spec:
|
|||
value: repo.wiki
|
||||
- name: GITEA__REPOSITORY__DEFAULT_REPO_UNITS
|
||||
value: repo.code,repo.releases
|
||||
- name: GITEA__WEBHOOK_ALLOWED_HOST_LIST
|
||||
value: ${DRONE_EXTERNAL_HOST}
|
||||
ports:
|
||||
- name: http
|
||||
containerPort: 3000
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
resources:
|
||||
- https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/release-0.50/bundle.yaml
|
||||
|
||||
namespace: kube-system
|
||||
|
||||
commonLabels:
|
||||
app.kubernetes.io/part-of: monitoring
|
|
@ -4,5 +4,7 @@ resources:
|
|||
- traefik-helmchartconfig.yaml
|
||||
- traefik-ingress.yaml
|
||||
|
||||
namespace: kube-system
|
||||
|
||||
commonLabels:
|
||||
app.kubernetes.io/name: traefik
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
resources:
|
||||
- ../../bases/traefik
|
||||
- ../../bases/prometheus-operator
|
||||
|
||||
namespace: kube-system
|
||||
- ../../bases/external-secrets
|
|
@ -3,7 +3,7 @@ resources:
|
|||
- ../../bases/prometheus
|
||||
# - ../../bases/node-exporter
|
||||
- ../../bases/blackbox-exporter
|
||||
- ../../bases/ecommerce-exporter
|
||||
# - ../../bases/ecommerce-exporter
|
||||
- ../../bases/kube-state-metrics
|
||||
- ../../bases/grafana-agent
|
||||
- ../../bases/grafana
|
||||
|
|
|
@ -4,7 +4,6 @@ resources:
|
|||
|
||||
buildMetadata:
|
||||
- originAnnotations
|
||||
- transformerAnnotations
|
||||
|
||||
commonLabels:
|
||||
app.kubernetes.io/managed-by: kustomize-cluster
|
||||
|
|
|
@ -9,7 +9,6 @@ resources:
|
|||
|
||||
buildMetadata:
|
||||
- originAnnotations
|
||||
- transformerAnnotations
|
||||
|
||||
images:
|
||||
- name: gitea/gitea
|
||||
|
@ -38,15 +37,17 @@ configMapGenerator:
|
|||
namespace: default
|
||||
literals:
|
||||
- GITEA_EXTERNAL_HOST=code.badjware.dev
|
||||
- GITEA_EXTERNAL_URL=https://code.badjware.dev
|
||||
|
||||
- DRONE_EXTERNAL_HOST=drone.badjware.dev
|
||||
- NEXTCLOUD_EXTERNAL_HOST=cloud.badjware.dev
|
||||
- GRAFANA_EXTERNAL_HOST=grafana.badjware.dev
|
||||
- PROMETHEUS_EXTERNAL_HOST=prometheus.badjnet.home
|
||||
- name: ecommerce-exporter-config
|
||||
namespace: monitoring
|
||||
behavior: replace
|
||||
files:
|
||||
- ecommerce-exporter.yml=configurations/ecommerce-exporter/ecommerce-exporter.yml
|
||||
# - name: ecommerce-exporter-config
|
||||
# namespace: monitoring
|
||||
# behavior: replace
|
||||
# files:
|
||||
# - ecommerce-exporter.yml=configurations/ecommerce-exporter/ecommerce-exporter.yml
|
||||
|
||||
secretGenerator:
|
||||
- name: drone-secret
|
||||
|
@ -138,6 +139,24 @@ replacements:
|
|||
namespace: gitea
|
||||
fieldPaths:
|
||||
- spec.rules.0.host
|
||||
- source:
|
||||
kind: ConfigMap
|
||||
name: replacements
|
||||
namespace: default
|
||||
fieldPath: data.GITEA_EXTERNAL_URL
|
||||
targets:
|
||||
- select:
|
||||
kind: Deployment
|
||||
name: gitea
|
||||
namespace: gitea
|
||||
fieldPaths:
|
||||
- spec.template.spec.containers.0.env.0.value
|
||||
- select:
|
||||
kind: Deployment
|
||||
name: drone-server
|
||||
namespace: gitea
|
||||
fieldPaths:
|
||||
- spec.template.spec.containers.0.env.0.value
|
||||
- source:
|
||||
kind: ConfigMap
|
||||
name: replacements
|
||||
|
@ -150,6 +169,24 @@ replacements:
|
|||
namespace: gitea
|
||||
fieldPaths:
|
||||
- spec.rules.0.host
|
||||
- select:
|
||||
kind: Deployment
|
||||
name: drone-server
|
||||
namespace: gitea
|
||||
fieldPaths:
|
||||
- spec.template.spec.containers.0.env.1.value
|
||||
- select:
|
||||
kind: Deployment
|
||||
name: gitea
|
||||
namespace: gitea
|
||||
fieldPaths:
|
||||
- spec.template.spec.containers.0.env.1.value
|
||||
- select:
|
||||
kind: Deployment
|
||||
name: drone-server
|
||||
namespace: gitea
|
||||
fieldPaths:
|
||||
- spec.template.spec.containers.0.env.1.value
|
||||
- source:
|
||||
kind: ConfigMap
|
||||
name: replacements
|
||||
|
|
Loading…
Reference in New Issue