cleanup and mass update: moving from Harbor to Gitea registries and from Drone to Gitea CI/CD with Gitea Act Runner

This commit is contained in:
ace
2023-06-10 06:20:10 +03:00
parent 1283a554fe
commit a251e593c6
89 changed files with 146 additions and 595 deletions

View File

@ -52,7 +52,7 @@ openldap_simple_users:
- { name: testuser2, sn: 6002, uid: 6002, gid: 6002 }
## Harbor ##
harbor_enabled: true
harbor_enabled: false
harbor_publish: false
#harbor_registry_size: "100Gi"
#harbor_registry_storage: "nfs-hdd"
@ -92,13 +92,11 @@ gitea_publish_web: false
gitea_publish_ssh: false
gitea_loadbalancer_ip: "192.168.250.5"
## Drone ##
drone_enabled: true
#drone_size: "10Gi"
#drone_storage: "nfs-ssd"
#drone_gitea_client_id:
#drone_gitea_client_secret:
drone_publish: false
## Gitea Act Runner ##
gitea_act_runner_enabled: true
gitea_act_runner_token: ""
gitea_act_runner_size: "25Gi"
#gitea_act_runner_storage: "nfs-ssd"
### WikiJS ###
wikijs_enabled: true

View File

@ -20,8 +20,8 @@ internal_ingress_nginx_version: 4.2.0
local_ingress_nginx_version: 4.2.0
# PostgreSQL operator
postgres_operator_version: 1.9.0
postgres_operator_ui_version: 1.9.0
postgres_operator_version: 1.10.0
postgres_operator_ui_version: 1.10.0
# OpenLDAP
openldap_version: 1.2.7
@ -32,17 +32,16 @@ adguard_version: 2.3.13
# Bitwarden (aka Vaultwarden)
bitwarden_version: 2.0.20
# Drone
drone_version: 0.6.4
drone_runner_kube_version: 0.1.10
# Gitea
gitea_ingress_nginx_version: 4.2.0
gitea_dns_version: 6.8.1
gitea_version: 8.3.0
# Gitea Act Runner
gitea_act_runner_version: 0.1.0
# Docker and Helm chart registries
harbor_version: 1.10.4
harbor_version: 1.12.2
# Mastodon
mastodon_version: 4.0.0
@ -60,7 +59,7 @@ rspamd_version: 0.4.3
pypiserver_version: 2.5.0
# WikiJS
wikijs_version: 2.3.10
wikijs_version: 2.3.11
# PeerTube
peertube_version: 0.2.1

View File

@ -24,19 +24,14 @@ ddclient_conf: |
ddclient_hosts:
- "{% if nextcloud_publish %}{{ nextcloud_short_name | default('nextcloud') }}.{{ domain }}{% else %}omitme{% endif %}"
- "{% if drone_publish %}{{ drone_short_name | default('drone') }}.{{ domain }}{% else %}omitme{% endif %}"
- "{% if gitea_publish_web %}{{ gitea_short_name | default('gitea') }}.{{ domain }}{% else %}omitme{% endif %}"
- "{% if bitwarden_publish %}{{ bitwarden_short_name | default('bitwarden') }}.{{ domain }}{% else %}omitme{% endif %}"
- "{% if playmaker_publish %}{{ playmaker_short_name | default('playmaker') }}.{{ domain }}{% else %}omitme{% endif %}"
- "{% if pypiserver_publish %}{{ pypiserver_short_name | default('pip') }}.{{ domain }}{% else %}omitme{% endif %}"
- "{% if wikijs_publish %}{{ wikijs_short_name | default('wikijs') }}.{{ domain }}{% else %}omitme{% endif %}"
- "{% if chartmuseum_publish %}{{ chartsmuseum_short_name | default('charts') }}.{{ domain }}{% else %}omitme{% endif %}"
- "{% if registry_publish %}{{ registry_short_name | default('registry') }}.{{ domain }}{% else %}omitme{% endif %}"
- "{% if peertube_publish %}{{ peertube_short_name | default('peertube') }}.{{ domain }}{% else %}omitme{% endif %}"
- "{% if mastodon_publish %}{{ mastodon_short_name | default('mastodon') }}.{{ domain }}{% else %}omitme{% endif %}"
- "{% if harbor_publish %}{{ harbor_short_name | default('harbor') }}.{{ domain }}{% else %}omitme{% endif %}"
- "{% if roundcube_publish %}{{ roundcube_short_name | default('webmail') }}.{{ domain }}{% else %}omitme{% endif %}"
- "{{ harbor_readonly_ingress | default('omitme') }}"
- "{{ registry_readonly_ingress | default('omitme') }}"
- "{{ chartmuseum_readonly_ingress | default('omitme') }}"
- "{{ wikijs_readonly_ingress | default('omitme') }}"

View File

@ -1 +0,0 @@
chartmuseum_values: {}

View File

@ -1,2 +0,0 @@
drone_values: {}
drone_runner_kube_values: {}

View File

@ -0,0 +1 @@
gitea_act_runner_values: {}

View File

@ -60,18 +60,12 @@ nginx:
{% if wikijs_publish %}
{{ wikijs_short_name | default('wikijs') }}.{{ domain }} https_{{ namespace }};
{% endif %}
{% if drone_publish %}
{{ drone_short_name | default('drone') }}.{{ domain }} https_{{ namespace }};
{% endif %}
{% if nextcloud_publish %}
{{ nextcloud_short_name | default('nextcloud') }}.{{ domain }} https_{{ namespace }};
{% endif %}
{% if harbor_publish %}
{{ harbor_short_name | default('harbor') }}.{{ domain }} https_{{ namespace }};
{% endif %}
{% if registry_publish %}
{{ registry_short_name | default('registry') }}.{{ domain }} https_{{ namespace }};
{% endif %}
{% if peertube_publish %}
{{ peertube_short_name | default('peertube') }}.{{ domain }} https_{{ namespace }};
{% endif %}
@ -81,15 +75,6 @@ nginx:
{% if roundcube_publish %}
{{ roundcube_short_name | default('webmail') }}.{{ domain }} https_{{ namespace }};
{% endif %}
{% if chartmuseum_publish %}
{{ chartsmuseum_short_name | default('charts') }}.{{ domain }} https_{{ namespace }};
{% endif %}
{% if registry_readonly_ingress %}
{{ registry_readonly_ingress }} https_{{ namespace }};
{% endif %}
{% if chartmuseum_readonly_ingress %}
{{ chartmuseum_readonly_ingress }} https_{{ namespace }};
{% endif %}
{% if wikijs_readonly_ingress %}
{{ wikijs_readonly_ingress }} https_{{ namespace }};
{% endif %}