-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
4 changed files
with
0 additions
and
172 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5596,8 +5596,6 @@ spec: | |
| default: {} | ||
| description: Service contains Forgejo DBaaS specific properties | ||
| properties: | ||
| <<<<<<< HEAD | ||
| <<<<<<< HEAD | ||
| additionalConfigMapName: | ||
| description: |- | ||
| ConfigMapName containing the Forgejo configuration. | ||
|
|
@@ -5631,47 +5629,6 @@ spec: | |
| description: AdminEmail contains the email address of the | ||
| admin user. | ||
| pattern: ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$ | ||
| ======= | ||
| adminEmail: | ||
| description: |- | ||
| AdminEmail contains the email address of the admin user. | ||
| If it's not set, admin user is going to be: [email protected] | ||
| >>>>>>> 722a9328 (adding FQDN webhook checker) | ||
| ======= | ||
| additionalConfigMapName: | ||
| description: |- | ||
| ConfigMapName containing the Forgejo configuration. | ||
| It will be mounted to the ini container, as described in here: https://code.forgejo.org/forgejo-helm/forgejo-helm#additional-_app-ini_-settings | ||
| properties: | ||
| name: | ||
| description: |- | ||
| Name of the referent. | ||
| More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names | ||
| type: string | ||
| namespace: | ||
| type: string | ||
| type: object | ||
| x-kubernetes-map-type: atomic | ||
| additionalConfigSecretName: | ||
| description: |- | ||
| SecretName containing the Forgejo configuration. | ||
| It will be mounted to the ini container, as described in here: https://code.forgejo.org/forgejo-helm/forgejo-helm#additional-_app-ini_-settings | ||
| properties: | ||
| name: | ||
| description: |- | ||
| Name of the referent. | ||
| More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names | ||
| type: string | ||
| namespace: | ||
| type: string | ||
| type: object | ||
| x-kubernetes-map-type: atomic | ||
| adminEmail: | ||
| default: [email protected] | ||
| description: AdminEmail contains the email address of the | ||
| admin user. | ||
| pattern: ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$ | ||
| >>>>>>> fb99a7cb (adding FQDN webhook checker) | ||
| type: string | ||
| fqdn: | ||
| description: |- | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5596,8 +5596,6 @@ spec: | |
| default: {} | ||
| description: Service contains Forgejo DBaaS specific properties | ||
| properties: | ||
| <<<<<<< HEAD | ||
| <<<<<<< HEAD | ||
| additionalConfigMapName: | ||
| description: |- | ||
| ConfigMapName containing the Forgejo configuration. | ||
|
|
@@ -5631,47 +5629,6 @@ spec: | |
| description: AdminEmail contains the email address of the | ||
| admin user. | ||
| pattern: ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$ | ||
| ======= | ||
| adminEmail: | ||
| description: |- | ||
| AdminEmail contains the email address of the admin user. | ||
| If it's not set, admin user is going to be: [email protected] | ||
| >>>>>>> 722a9328 (adding FQDN webhook checker) | ||
| ======= | ||
| additionalConfigMapName: | ||
| description: |- | ||
| ConfigMapName containing the Forgejo configuration. | ||
| It will be mounted to the ini container, as described in here: https://code.forgejo.org/forgejo-helm/forgejo-helm#additional-_app-ini_-settings | ||
| properties: | ||
| name: | ||
| description: |- | ||
| Name of the referent. | ||
| More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names | ||
| type: string | ||
| namespace: | ||
| type: string | ||
| type: object | ||
| x-kubernetes-map-type: atomic | ||
| additionalConfigSecretName: | ||
| description: |- | ||
| SecretName containing the Forgejo configuration. | ||
| It will be mounted to the ini container, as described in here: https://code.forgejo.org/forgejo-helm/forgejo-helm#additional-_app-ini_-settings | ||
| properties: | ||
| name: | ||
| description: |- | ||
| Name of the referent. | ||
| More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names | ||
| type: string | ||
| namespace: | ||
| type: string | ||
| type: object | ||
| x-kubernetes-map-type: atomic | ||
| adminEmail: | ||
| default: [email protected] | ||
| description: AdminEmail contains the email address of the | ||
| admin user. | ||
| pattern: ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$ | ||
| >>>>>>> fb99a7cb (adding FQDN webhook checker) | ||
| type: string | ||
| fqdn: | ||
| description: |- | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5596,8 +5596,6 @@ spec: | |
| default: {} | ||
| description: Service contains Forgejo DBaaS specific properties | ||
| properties: | ||
| <<<<<<< HEAD | ||
| <<<<<<< HEAD | ||
| additionalConfigMapName: | ||
| description: |- | ||
| ConfigMapName containing the Forgejo configuration. | ||
|
|
@@ -5631,47 +5629,6 @@ spec: | |
| description: AdminEmail contains the email address of the | ||
| admin user. | ||
| pattern: ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$ | ||
| ======= | ||
| adminEmail: | ||
| description: |- | ||
| AdminEmail contains the email address of the admin user. | ||
| If it's not set, admin user is going to be: [email protected] | ||
| >>>>>>> 722a9328 (adding FQDN webhook checker) | ||
| ======= | ||
| additionalConfigMapName: | ||
| description: |- | ||
| ConfigMapName containing the Forgejo configuration. | ||
| It will be mounted to the ini container, as described in here: https://code.forgejo.org/forgejo-helm/forgejo-helm#additional-_app-ini_-settings | ||
| properties: | ||
| name: | ||
| description: |- | ||
| Name of the referent. | ||
| More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names | ||
| type: string | ||
| namespace: | ||
| type: string | ||
| type: object | ||
| x-kubernetes-map-type: atomic | ||
| additionalConfigSecretName: | ||
| description: |- | ||
| SecretName containing the Forgejo configuration. | ||
| It will be mounted to the ini container, as described in here: https://code.forgejo.org/forgejo-helm/forgejo-helm#additional-_app-ini_-settings | ||
| properties: | ||
| name: | ||
| description: |- | ||
| Name of the referent. | ||
| More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names | ||
| type: string | ||
| namespace: | ||
| type: string | ||
| type: object | ||
| x-kubernetes-map-type: atomic | ||
| adminEmail: | ||
| default: [email protected] | ||
| description: AdminEmail contains the email address of the | ||
| admin user. | ||
| pattern: ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$ | ||
| >>>>>>> fb99a7cb (adding FQDN webhook checker) | ||
| type: string | ||
| fqdn: | ||
| description: |- | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5596,8 +5596,6 @@ spec: | |
| default: {} | ||
| description: Service contains Forgejo DBaaS specific properties | ||
| properties: | ||
| <<<<<<< HEAD | ||
| <<<<<<< HEAD | ||
| additionalConfigMapName: | ||
| description: |- | ||
| ConfigMapName containing the Forgejo configuration. | ||
|
|
@@ -5631,47 +5629,6 @@ spec: | |
| description: AdminEmail contains the email address of the | ||
| admin user. | ||
| pattern: ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$ | ||
| ======= | ||
| adminEmail: | ||
| description: |- | ||
| AdminEmail contains the email address of the admin user. | ||
| If it's not set, admin user is going to be: [email protected] | ||
| >>>>>>> 722a9328 (adding FQDN webhook checker) | ||
| ======= | ||
| additionalConfigMapName: | ||
| description: |- | ||
| ConfigMapName containing the Forgejo configuration. | ||
| It will be mounted to the ini container, as described in here: https://code.forgejo.org/forgejo-helm/forgejo-helm#additional-_app-ini_-settings | ||
| properties: | ||
| name: | ||
| description: |- | ||
| Name of the referent. | ||
| More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names | ||
| type: string | ||
| namespace: | ||
| type: string | ||
| type: object | ||
| x-kubernetes-map-type: atomic | ||
| additionalConfigSecretName: | ||
| description: |- | ||
| SecretName containing the Forgejo configuration. | ||
| It will be mounted to the ini container, as described in here: https://code.forgejo.org/forgejo-helm/forgejo-helm#additional-_app-ini_-settings | ||
| properties: | ||
| name: | ||
| description: |- | ||
| Name of the referent. | ||
| More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names | ||
| type: string | ||
| namespace: | ||
| type: string | ||
| type: object | ||
| x-kubernetes-map-type: atomic | ||
| adminEmail: | ||
| default: [email protected] | ||
| description: AdminEmail contains the email address of the | ||
| admin user. | ||
| pattern: ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$ | ||
| >>>>>>> fb99a7cb (adding FQDN webhook checker) | ||
| type: string | ||
| fqdn: | ||
| description: |- | ||
|
|
||