add short names

add publish conditions for services

use official gitea helm chart

roles/gitea/defaults/main.yaml

@@ -2,86 +2,85 @@ gitea_enabled: true
 gitea_publish_web: false
 gitea_publish_ssh: false
 gitea_use_external_db: true
+gitea_short_name: "gitea"
 gitea_ingress_class: "{{ gitea_namespace | default(namespace) }}-{{ 'public' if gitea_publish_web else 'private' }}-gitea-ingress-nginx"
 gitea_default_values:
-  config:
-    disableInstaller: true
-    admin_user: "{{ gitea_admin_user | default('gitea') }}"
-    admin_pass: "{{ gitea_admin_pass | default(gitea_admin_password) }}"
-    mailer:
-      domain: "{{ mail_domain | default(domain) }}"
-      enabled: true
-      host: "mail.{{ mail_domain | default(domain) }}:465"
-      skip_verify: false
-      is_tls_enabled: true
-      from: "gitea@{{ mail_domain | default(domain) }}"
-      user: "{{ gitea_ldap_user | default('gitea') }}"
-      passwd: "{{ gitea_ldap_pass | default(gitea_ldap_password) }}"
+  service:
+    http:
+      clusterIP:
+    ssh:
+      clusterIP:
   ingress:
-    ## Set to true to enable ingress record generation
     enabled: true
-    ## When the ingress is enabled, a host pointing to this will be created
-    hostname: "gitea.{{ domain }}"
     annotations:
       cert-manager.io/cluster-issuer: "letsencrypt-prod"
       cert-manager.io/acme-dns01-provider: "rfc2136"
       cert-manager.io/acme-challenge-type: "dns01"
-      kubernetes.io/ingress.class: "{{ gitea_ingress_class }}"
       nginx.ingress.kubernetes.io/proxy-body-size: "0"
       nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
       nginx.ingress.kubernetes.io/proxy-send-timeout: "600"
+      kubernetes.io/ingress.class: "{{ gitea_ingress_class }}"
       kubernetes.io/tls-acme: "true"
-      #
-    ## The list of additional hostnames to be covered with this ingress record.
-    ## Most likely the hostname above will be enough, but in the event more hosts are needed, this is an array
-    # hosts:
-    # - name: git.example.com
-    #   path: /
-    tls:    
-     - hosts:    
-       - "gitea.{{ domain }}"
-       secretName: "gitea.{{ domain }}-tls" 
-  service:
-    type: ClusterIP
-    ## This can stay as ClusterIP as (by default) we use ingress
-    http:
-      port: 3000
-      ## Make the external port available
-      # externalPort: 8082
-      # externalHost: gitea.local
-    ## SSH is commonly on port 22
-    ssh:
-      port: 22
-      ## If serving on a different external port used for determining the ssh url in the gui
-      # externalPort: 22
-      # externalHost: gitea.local
-      # externalIPs: []
+    hosts:
+      - "{{ gitea_short_name }}.{{ domain }}"
+    tls:
+      - secretName: "{{ gitea_short_name }}.{{ domain }}-tls"
+        hosts:
+          - "{{ gitea_short_name }}.{{ domain }}"
+  
   persistence:
     enabled: true
-    # existingGiteaClaim: gitea-gitea
-    accessMode: "{{ gitea_storage_mode | default('ReadWriteMany') }}"
+    accessModes: 
+      - "{{ gitea_storage_mode | default('ReadWriteMany') }}"
     size: "{{ gitea_size | default('20Gi') }}"
     storageClass: "{{ gitea_storage | default('nfs-ssd') }}"
     ## addtional annotations for PVCs. Uncommenting will prevent the PVC from being deleted.
     annotations:
       "helm.sh/resource-policy": keep
-  lfs:
-    enabled: "{{ gitea_lfs | default(true) }}"
-    accessMode: "{{ gitea_lfs_storage_mode | default('ReadWriteMany') }}"
-    size: "{{ gitea_lfs_size | default('50Gi') }}"
-    storageClass: "{{ gitea_lfs_storage | default('nfs-hdd') }}"
-    annotations:
-      "helm.sh/resource-policy": keep
-  mariadb:
-    enabled: false
-  externalDB:
-    enabled: true
-    dbType: "postgres"
-    dbHost: "{{ postgres_db_team | default(namespace) }}-postgres.{{ postgres_db_namespace | default(namespace) }}.svc.cluster.local"
-    dbPort: "5432"
-    dbDatabase: "gitea"
-    dbUser: "{{ gitea_db_username | default(omit)}}"
-    dbPassword: "{{ gitea_db_password | default(omit) }}"
+  
+  gitea:
+    admin:
+      username: "{{ gitea_admin_user | default('gitea') }}"
+      password: "{{ gitea_admin_pass | default(gitea_admin_password) }}"
+      email: "gitea@{{ mail_domain | default(domain) }}"
+  
+    ldap:
+      enabled: true
+      name: OpenLDAP
+      securityProtocol: ldaps
+      host: "{{ openldap_short_name | default('openldap')}}.{{ domain }}"
+      port: "636"
+      userSearchBase: "ou=users,{{ openldap_domain }}"
+      userFilter: "(&(objectClass=posixAccount)(uid=%s))"
+      emailAttribute: mail
+      bindDn: "uid=ldapbind,ou=services,{{ openldap_domain }}"
+      bindPassword: "{{ ldapbind_pass | default(ldapbind_password) }}"
+  
+    config: 
+    #  APP_NAME: "Gitea: Git with a cup of tea"
+      RUN_MODE: prod
+      service:
+        DISABLE_REGISTRATION: true
+      mailer:
+        ENABLED: "true"
+        HOST: "{{ mail_short_name | default('mail') }}.{{ mail_domain | default(domain) }}:465"
+        IS_TLS_ENABLED: "true"
+        FROM: "gitea@{{ mail_domain | default(domain) }}"
+        USER: "{{ gitea_ldap_user | default('gitea') }}"
+        PASSWD: "{{ gitea_ldap_pass | default(gitea_ldap_password) }}"
+        MAILER_TYPE: "smtp"
+  
+      database:
+        DB_TYPE: postgres
+        HOST: "{{ postgres_db_team | default(namespace) }}-postgres.{{ postgres_db_namespace | default(namespace) }}.svc.cluster.local:5432"
+        NAME: gitea
+        USER: "{{ gitea_db_username | default(omit) }}"
+        PASSWD: "{{ gitea_db_password | default(omit) }}"
+
+    database:
+      builtIn:
+        postgresql:
+          enabled: false
 
 gitea_publish_ingress_nginx_values:
   controller:
@@ -118,7 +117,7 @@ gitea_ingress_nginx_default_values:
         https: https
     ingressClass: "{{ gitea_ingress_class }}"
   tcp: 
-    22: "{{ gitea_namespace | default(namespace) }}/gitea-gitea-svc:22"
+    22: "{{ gitea_namespace | default(namespace) }}/{{ namespace }}-gitea-ssh:22"
 
 gitea_dns_default_values:
   fullnameOverride: "{{ gitea_dns_name | default(namespace + '-gitea-internal-dns') }}"

roles/gitea/tasks/main.yaml

@@ -21,7 +21,7 @@
   community.kubernetes.helm:
     create_namespace: true
     release_namespace: "{{ gitea_ingress_nginx_namespace | default(namespace) }}"
-    release_name: "{{ gitea_ingress_nginx_name | default(namespace + '-gitea-ingress-nginx') }}"
+    release_name: "{{ gitea_ingress_nginx_release_name | default(namespace + '-gitea-ingress-nginx') }}"
     chart_ref: "{{ gitea_ingress_nginx_chart | default('ingress-nginx/ingress-nginx') }}"
     chart_version: "{{ gitea_ingress_nginx_version | default(omit) }}"
     release_values: "{{ gitea_ingress_nginx_combined_values | from_yaml }}"
@@ -31,7 +31,7 @@
   community.kubernetes.helm:
     create_namespace: true
     release_namespace: "{{ gitea_dns_namespace | default(namespace) }}"
-    release_name: "{{ gitea_dns_name | default('gitea-internal-dns') }}"
+    release_name: "{{ gitea_dns_relase_name | default(namespace + '-gitea-internal-dns') }}"
     chart_ref: "{{ gitea_dns_chart | default('bitnami/external-dns') }}"
     chart_version: "{{ gitea_dns_version | default(omit) }}"
     release_values: "{{ gitea_dns_combined_values | from_yaml }}"
@@ -42,9 +42,9 @@
   community.kubernetes.helm:
     create_namespace: true
     release_namespace: "{{ gitea_namespace | default(namespace) }}"
-    release_name: "{{ gitea_name | default('gitea') }}"
-    chart_ref: "{{ gitea_chart | default('ghp/gitea') }}"
+    release_name: "{{ gitea_release_name | default(namespace + '-gitea') }}"
+    chart_ref: "{{ gitea_chart | default('gitea-charts/gitea') }}"
     chart_version: "{{ gitea_version | default(omit) }}"
     release_values: "{{ gitea_combined_values | from_yaml }}"
-    wait: true
+    #wait: true