fix

2023-11-28 14:04:25 +01:00
parent 4f92be9e2a
commit a4d07be358
4 changed files with 161 additions and 162 deletions
--- a/apps/gitea/apps_v1_Deployment_gitea.yaml
+++ b/apps/gitea/apps_v1_Deployment_gitea.yaml
@@ -27,7 +27,7 @@ spec:
    metadata:
      annotations:
        checksum/config: ad2ce0a245d17a13676e98bfc6d1833351e36e913af45f98b89299cc83f3fc11
-        checksum/oauth_0: f0f765c091d516960342092cbf7ed9ed3ef8de0ca140d33f6eadbec60df69d3b
+        checksum/oauth_0: 8082487c20cf56dc3aff5b15ecf79483bc184c497ffb48237cf48c1a8757fcf2
      labels:
        helm.sh/chart: gitea-9.5.0
        app: gitea
--- a/apps/gitea/index.yaml
+++ b/apps/gitea/index.yaml
@@ -14,41 +14,6 @@ options:
    examples:
    - letsencrypt-prod
    type: string
-  webhook:
-    default:
-      allowed-hosts: private
-      skip-tls-verify: false
-    examples:
-    - allowed-hosts: private
-      skip-tls-verify: false
-    properties:
-      allowed-hosts:
-        default: private
-        type: string
-      skip-tls-verify:
-        default: false
-        type: boolean
-    type: object
-  push-create:
-    default:
-      org: 'true'
-      private: 'false'
-      user: 'true'
-    examples:
-    - org: 'true'
-      private: 'false'
-      user: 'true'
-    properties:
-      org:
-        default: 'true'
-        type: string
-      private:
-        default: 'false'
-        type: string
-      user:
-        default: 'true'
-        type: string
-    type: object
  load-balancer:
    default:
      ip: ''
@@ -59,16 +24,26 @@ options:
        default: ''
        type: string
    type: object
-  ingress-class:
-    default: traefik
+  ssh-sub-domain:
+    default: git
    examples:
-    - traefik
+    - git
+    type: string
+  release:
+    default: 8.3.0
+    examples:
+    - 8.3.0
    type: string
  ssh-port:
    default: 2222
    examples:
    - 2222
    type: integer
+  timezone:
+    default: Europe/Paris
+    examples:
+    - Europe/Paris
+    type: string
  admin:
    default:
      email: git-admin@git.your_company.com
@@ -84,74 +59,30 @@ options:
        default: gitea_admin
        type: string
    type: object
-  ssh-sub-domain:
-    default: git
+  domain-name:
+    default: your_company.com
    examples:
-    - git
+    - your_company.com
    type: string
-  release:
-    default: 8.3.0
-    examples:
-    - 8.3.0
-    type: string
-  replicas:
-    default: 1
-    examples:
-    - 1
-    type: integer
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  images:
+  webhook:
    default:
-      gitea:
-        pullPolicy: IfNotPresent
-        registry: docker.io
-        repository: gitea/gitea
-        tag: 1.20.5-rootless
+      allowed-hosts: private
+      skip-tls-verify: false
    examples:
-    - gitea:
-        pullPolicy: IfNotPresent
-        registry: docker.io
-        repository: gitea/gitea
-        tag: 1.20.5-rootless
+    - allowed-hosts: private
+      skip-tls-verify: false
    properties:
-      gitea:
-        default:
-          pullPolicy: IfNotPresent
-          registry: docker.io
-          repository: gitea/gitea
-          tag: 1.20.5-rootless
-        properties:
-          pullPolicy:
-            default: IfNotPresent
-            enum:
-            - Always
-            - Never
-            - IfNotPresent
-            type: string
-          registry:
-            default: docker.io
-            type: string
-          repository:
-            default: gitea/gitea
-            type: string
-          tag:
-            default: 1.20.5-rootless
-            type: string
-        type: object
+      allowed-hosts:
+        default: private
+        type: string
+      skip-tls-verify:
+        default: false
+        type: boolean
    type: object
-  default-branch:
-    default: main
+  app-group:
+    default: dev
    examples:
-    - main
-    type: string
-  theme:
-    default: gitea-modern
-    examples:
-    - gitea-modern
+    - dev
    type: string
  postgres:
    default:
@@ -173,21 +104,93 @@ options:
        default: '14'
        type: string
    type: object
-  domain-name:
-    default: your_company.com
+  redis:
+    default:
+      exporter:
+        enabled: true
+        image: quay.io/opstree/redis-exporter:v1.44.0
+      image: quay.io/opstree/redis:v7.0.12
+      storage: 2Gi
    examples:
-    - your_company.com
-    type: string
+    - exporter:
+        enabled: true
+        image: quay.io/opstree/redis-exporter:v1.44.0
+      image: quay.io/opstree/redis:v7.0.12
+      storage: 2Gi
+    properties:
+      exporter:
+        default:
+          enabled: true
+          image: quay.io/opstree/redis-exporter:v1.44.0
+        properties:
+          enabled:
+            default: true
+            type: boolean
+          image:
+            default: quay.io/opstree/redis-exporter:v1.44.0
+            type: string
+        type: object
+      image:
+        default: quay.io/opstree/redis:v7.0.12
+        type: string
+      storage:
+        default: 2Gi
+        type: string
+    type: object
+  volume:
+    default:
+      accessMode: ReadWriteOnce
+      size: 10Gi
+    examples:
+    - accessMode: ReadWriteOnce
+      size: 10Gi
+    properties:
+      accessMode:
+        default: ReadWriteOnce
+        enum:
+        - ReadWriteOnce
+        - ReadOnlyMany
+        - ReadWriteMany
+        type: string
+      size:
+        default: 10Gi
+        type: string
+    type: object
  sub-domain:
    default: git
    examples:
    - git
    type: string
-  app-group:
-    default: dev
+  disable-registration:
+    default: true
    examples:
-    - dev
+    - true
+    type: boolean
+  default-branch:
+    default: main
+    examples:
+    - main
    type: string
+  push-create:
+    default:
+      org: 'true'
+      private: 'false'
+      user: 'true'
+    examples:
+    - org: 'true'
+      private: 'false'
+      user: 'true'
+    properties:
+      org:
+        default: 'true'
+        type: string
+      private:
+        default: 'false'
+        type: string
+      user:
+        default: 'true'
+        type: string
+    type: object
  backups:
    default:
      enable: false
@@ -294,67 +297,64 @@ options:
        default: false
        type: boolean
    type: object
-  volume:
+  replicas:
+    default: 1
+    examples:
+    - 1
+    type: integer
+  theme:
+    default: gitea-modern
+    examples:
+    - gitea-modern
+    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  images:
    default:
-      accessMode: ReadWriteOnce
-      size: 10Gi
+      gitea:
+        pullPolicy: IfNotPresent
+        registry: docker.io
+        repository: gitea/gitea
+        tag: 1.20.5-rootless
    examples:
-    - accessMode: ReadWriteOnce
-      size: 10Gi
+    - gitea:
+        pullPolicy: IfNotPresent
+        registry: docker.io
+        repository: gitea/gitea
+        tag: 1.20.5-rootless
    properties:
-      accessMode:
-        default: ReadWriteOnce
-        enum:
-        - ReadWriteOnce
-        - ReadOnlyMany
-        - ReadWriteMany
-        type: string
-      size:
-        default: 10Gi
-        type: string
-    type: object
-  disable-registration:
-    default: true
-    examples:
-    - true
-    type: boolean
-  redis:
-    default:
-      exporter:
-        enabled: true
-        image: quay.io/opstree/redis-exporter:v1.44.0
-      image: quay.io/opstree/redis:v7.0.12
-      storage: 2Gi
-    examples:
-    - exporter:
-        enabled: true
-        image: quay.io/opstree/redis-exporter:v1.44.0
-      image: quay.io/opstree/redis:v7.0.12
-      storage: 2Gi
-    properties:
-      exporter:
+      gitea:
        default:
-          enabled: true
-          image: quay.io/opstree/redis-exporter:v1.44.0
+          pullPolicy: IfNotPresent
+          registry: docker.io
+          repository: gitea/gitea
+          tag: 1.20.5-rootless
        properties:
-          enabled:
-            default: true
-            type: boolean
-          image:
-            default: quay.io/opstree/redis-exporter:v1.44.0
+          pullPolicy:
+            default: IfNotPresent
+            enum:
+            - Always
+            - Never
+            - IfNotPresent
+            type: string
+          registry:
+            default: docker.io
+            type: string
+          repository:
+            default: gitea/gitea
+            type: string
+          tag:
+            default: 1.20.5-rootless
            type: string
        type: object
-      image:
-        default: quay.io/opstree/redis:v7.0.12
-        type: string
-      storage:
-        default: 2Gi
-        type: string
    type: object
-  timezone:
-    default: Europe/Paris
+  ingress-class:
+    default: traefik
    examples:
-    - Europe/Paris
+    - traefik
    type: string
 dependencies:
 - dist: null
--- a/apps/gitea/inline-config.tf
+++ b/apps/gitea/inline-config.tf
@@ -71,7 +71,6 @@ ENABLE_OPENID_SIGNUP=true
 REGISTER_EMAIL_CONFIRM=false
 ENABLE_AUTO_REGISTRATION=true
 ACCOUNT_LINKING=auto
-OPENID_CONNECT_SCOPES=openid,email,profile
    EOF
  }
 }
--- a/apps/gitea/v1_Secret_gitea-init.yaml
+++ b/apps/gitea/v1_Secret_gitea-init.yaml
@@ -74,11 +74,11 @@ stringData:

      if [[ -z "${AUTH_ID}" ]]; then
        echo "No oauth configuration found with name '${OAUTH_NAME}'. Installing it now..."
-        gitea admin auth add-oauth --auto-discover-url "${VYNIL_OAUTH_DISCOVERY}" --key "${GITEA_OAUTH_KEY_0}" --name "vynil" --provider "openidConnect" --secret "${GITEA_OAUTH_SECRET_0}" 
+        gitea admin auth add-oauth --auto-discover-url "${VYNIL_OAUTH_DISCOVERY}" --key "${GITEA_OAUTH_KEY_0}" --name "vynil" --provider "openidConnect" --scopes "email profile" --secret "${GITEA_OAUTH_SECRET_0}" 
        echo '...installed.'
      else
        echo "Existing oauth configuration with name '${OAUTH_NAME}': '${AUTH_ID}'. Running update to sync settings..."
-        gitea admin auth update-oauth --id "${AUTH_ID}" --auto-discover-url "${VYNIL_OAUTH_DISCOVERY}" --key "${GITEA_OAUTH_KEY_0}" --name "vynil" --provider "openidConnect" --secret "${GITEA_OAUTH_SECRET_0}" 
+        gitea admin auth update-oauth --id "${AUTH_ID}" --auto-discover-url "${VYNIL_OAUTH_DISCOVERY}" --key "${GITEA_OAUTH_KEY_0}" --name "vynil" --provider "openidConnect" --scopes "email profile" --secret "${GITEA_OAUTH_SECRET_0}" 
        echo '...sync settings done.'
      fi
    }