diff --git a/charts/collabora/1.2.6/Chart.yaml b/charts/collabora/1.2.6/Chart.yaml deleted file mode 100644 index baeb4d43f9..0000000000 --- a/charts/collabora/1.2.6/Chart.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -appVersion: 21.11.4.1.1 -dependencies: -- name: common - repository: file://../../../library/common/2207.0.0 - version: 2207.0.0 -description: "Collabora Online Development Edition \u2013 an awesome, Online Office\ - \ suite image suitable for home use." -home: https://github.com/CollaboraOnline/online -icon: https://avatars.githubusercontent.com/u/22418908?s=200&v=4 -keywords: -- office -- documents -- productivity -name: collabora -sources: -- https://github.com/CollaboraOnline/online.git -- https://hub.docker.com/r/collabora/code -version: 1.2.6 diff --git a/charts/collabora/1.2.6/charts/common-2207.0.0.tgz b/charts/collabora/1.2.6/charts/common-2207.0.0.tgz deleted file mode 100644 index 2adf94b438..0000000000 Binary files a/charts/collabora/1.2.6/charts/common-2207.0.0.tgz and /dev/null differ diff --git a/charts/collabora/1.2.6/requirements.lock b/charts/collabora/1.2.6/requirements.lock deleted file mode 100644 index 19014c3eba..0000000000 --- a/charts/collabora/1.2.6/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2207.0.0 - version: 2207.0.0 -digest: sha256:f17f3d458ca0210a52e39da0dce35034e900b36f2040d4b19bed46a7aae91506 -generated: "2022-07-25T00:20:48.244687333+05:00" diff --git a/charts/collabora/1.2.6/templates/tests/deployment-check.yaml b/charts/collabora/1.2.6/templates/tests/deployment-check.yaml deleted file mode 100644 index 8bbb4f30fd..0000000000 --- a/charts/collabora/1.2.6/templates/tests/deployment-check.yaml +++ /dev/null @@ -1,21 +0,0 @@ -{{- $serviceName := (include "common.names.fullname" .) -}} -apiVersion: v1 -kind: Pod -metadata: - name: "{{ .Release.Name }}-collabora-test" - labels: - app: {{ .Release.Name }} - release: {{ .Release.Name }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: test-curl - image: alpine/curl - imagePullPolicy: "IfNotPresent" - command: - - /bin/sh - - -ec - - | - curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 15 --retry-max-time 90 --retry-all-errors -ks https://{{ $serviceName }}/browser/dist/admin/admin.html - restartPolicy: Never diff --git a/charts/collabora/1.2.6/.helmignore b/library/ix-dev/charts/collabora/.helmignore similarity index 100% rename from charts/collabora/1.2.6/.helmignore rename to library/ix-dev/charts/collabora/.helmignore diff --git a/library/ix-dev/charts/collabora/Chart.lock b/library/ix-dev/charts/collabora/Chart.lock new file mode 100644 index 0000000000..018429fb60 --- /dev/null +++ b/library/ix-dev/charts/collabora/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../common/2207.0.0 + version: 2207.0.0 +digest: sha256:a301ba0f99ec1e08a60a7f0a0320aa02d225993572f2f056f09520f06df88b37 +generated: "2023-03-21T15:36:04.887192085+02:00" diff --git a/library/ix-dev/charts/collabora/Chart.yaml b/library/ix-dev/charts/collabora/Chart.yaml new file mode 100644 index 0000000000..0d1e5e0be8 --- /dev/null +++ b/library/ix-dev/charts/collabora/Chart.yaml @@ -0,0 +1,27 @@ +name: collabora +description: | + Collabora Online Development Edition \u2013 an awesome, Online Office + suite image suitable for home use. +annotations: + title: Collabora +type: application +version: 1.2.7 +apiVersion: v2 +appVersion: '21.11.4.1.1' +kubeVersion: '>=1.16.0-0' +maintainers: + - name: truenas + url: https://www.truenas.com/ +dependencies: + - name: common + repository: file://../../../common/2207.0.0 + version: 2207.0.0 +home: https://github.com/CollaboraOnline/online +icon: https://avatars.githubusercontent.com/u/22418908?s=200&v=4 +sources: + - https://github.com/CollaboraOnline/online.git + - https://hub.docker.com/r/collabora/code +keywords: + - office + - documents + - productivity diff --git a/charts/collabora/1.2.6/README.md b/library/ix-dev/charts/collabora/README.md similarity index 100% rename from charts/collabora/1.2.6/README.md rename to library/ix-dev/charts/collabora/README.md diff --git a/charts/collabora/1.2.6/app-readme.md b/library/ix-dev/charts/collabora/app-readme.md similarity index 100% rename from charts/collabora/1.2.6/app-readme.md rename to library/ix-dev/charts/collabora/app-readme.md diff --git a/library/ix-dev/charts/collabora/charts/common-2207.0.0.tgz b/library/ix-dev/charts/collabora/charts/common-2207.0.0.tgz new file mode 100644 index 0000000000..2f2b288ed1 Binary files /dev/null and b/library/ix-dev/charts/collabora/charts/common-2207.0.0.tgz differ diff --git a/charts/collabora/1.2.6/test_values.yaml b/library/ix-dev/charts/collabora/ci/test-values.yaml similarity index 93% rename from charts/collabora/1.2.6/test_values.yaml rename to library/ix-dev/charts/collabora/ci/test-values.yaml index bfb75f41a6..c568272d68 100644 --- a/charts/collabora/1.2.6/test_values.yaml +++ b/library/ix-dev/charts/collabora/ci/test-values.yaml @@ -1,4 +1,5 @@ certificate: 55 +nodePort: 31980 config: DONT_GEN_SSL_CERT: 'true' dictionaries: de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru @@ -9,12 +10,18 @@ config: server_name: ssh.sonicaj.com:49980 timezone: Asia/Karachi username: admin +ixChartContext: + isInstall: false + isUpdate: true + isUpgrade: false + operation: UPDATE + storageClassName: ix-storage-class-col + upgradeMetadata: {} +ixExternalInterfacesConfiguration: [] +ixExternalInterfacesConfigurationNames: [] +ixVolumes: [] environmentVariables: [] extraAppVolumeMounts: [] -image: - pullPolicy: IfNotPresent - repository: collabora/code - tag: 21.11.4.1.1 ixCertificateAuthorities: {} ixCertificates: '55': @@ -30,218 +37,118 @@ ixCertificates: cert_type_CSR: false cert_type_existing: true cert_type_internal: false - certificate: '-----BEGIN CERTIFICATE----- - + certificate: | + -----BEGIN CERTIFICATE----- MIIEdjCCA16gAwIBAgIDYFMYMA0GCSqGSIb3DQEBCwUAMGwxDDAKBgNVBAMMA2Fz - ZDELMAkGA1UEBhMCVVMxDTALBgNVBAgMBGFzZGYxCzAJBgNVBAcMAmFmMQ0wCwYD - VQQKDARhc2RmMQwwCgYDVQQLDANhc2QxFjAUBgkqhkiG9w0BCQEWB2FAYS5jb20w - HhcNMjEwODMwMjMyMzU0WhcNMjMxMjAzMjMyMzU0WjBuMQswCQYDVQQDDAJhZDEL - MAkGA1UEBhMCVVMxDTALBgNVBAgMBGFzZGYxDTALBgNVBAcMBGFzZGYxDTALBgNV - BAoMBGFkc2YxDTALBgNVBAsMBGFzZGYxFjAUBgkqhkiG9w0BCQEWB2FAYS5jb20w - ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7+1xOHRQyOnQTHFcrdasX - Zl0gzutVlA890a1wiQpdD5dOtCLo7+eqVYjqVKo9W8RUIArXWmBu/AbkH7oVFWC1 - P973W1+ArF5sA70f7BZgqRKJTIisuIFIlRETgfnP2pfQmHRZtGaIJRZI4vQCdYgW - 2g0KOvvNcZJCVq1OrhKiNiY1bWCp66DGg0ic6OEkZFHTm745zUNQaf2dNgsxKU0H - PGjVLJI//yrRFAOSBUqgD4c50krnMF7fU/Fqh+UyOu8t6Y/HsySh3urB+Zie331t - AzV6QV39KKxRflNx/yuWrtIEslGTm+xHKoCYJEk/nZ3mX8Y5hG6wWAb7A/FuDVg3 - AgMBAAGjggEdMIIBGTAnBgNVHREEIDAehwTAqAADhwTAqAAFhwTAqAC2hwTAqACB - hwTAqACSMB0GA1UdDgQWBBQ4G2ff4tgZl4vmo4xCfqmJhdqShzAMBgNVHRMBAf8E - AjAAMIGYBgNVHSMEgZAwgY2AFLlYf9L99nxJDcpCM/LT3V5hQ/a3oXCkbjBsMQww - CgYDVQQDDANhc2QxCzAJBgNVBAYTAlVTMQ0wCwYDVQQIDARhc2RmMQswCQYDVQQH - DAJhZjENMAsGA1UECgwEYXNkZjEMMAoGA1UECwwDYXNkMRYwFAYJKoZIhvcNAQkB - FgdhQGEuY29tggNgUxcwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwEwDgYDVR0PAQH/ - BAQDAgWgMA0GCSqGSIb3DQEBCwUAA4IBAQA6FpOInEHB5iVk3FP67GybJ29vHZTD - KQHbQgmg8s4L7qIsA1HQ+DMCbdylpA11x+t/eL/n48BvGw2FNXpN6uykhLHJjbKR - h8yITa2KeD3LjLYhScwIigXmTVYSP3km6s8jRL6UKT9zttnIHyXVpBDya6Q4WTMx - fmfC6O7t1PjQ5ZyVtzizIUP8ah9n4TKdXU4A3QIM6WsJXpHb+vqp1WDWJ7mKFtgj - x5TKv3wcPnktx0zMPfLb5BTSE9rc9djcBG0eIAsPT4FgiatCUChe7VhuMnqskxEz - MymJLoq8+mzucRwFkOkR2EIt1x+Irl2mJVMeBow63rVZfUQBD8h++LqB - -----END CERTIFICATE----- - -----BEGIN CERTIFICATE----- - MIIEhDCCA2ygAwIBAgIDYFMXMA0GCSqGSIb3DQEBCwUAMGwxDDAKBgNVBAMMA2Fz - ZDELMAkGA1UEBhMCVVMxDTALBgNVBAgMBGFzZGYxCzAJBgNVBAcMAmFmMQ0wCwYD - VQQKDARhc2RmMQwwCgYDVQQLDANhc2QxFjAUBgkqhkiG9w0BCQEWB2FAYS5jb20w - HhcNMjEwODMwMjMyMDQ1WhcNMzEwODI4MjMyMDQ1WjBsMQwwCgYDVQQDDANhc2Qx - CzAJBgNVBAYTAlVTMQ0wCwYDVQQIDARhc2RmMQswCQYDVQQHDAJhZjENMAsGA1UE - CgwEYXNkZjEMMAoGA1UECwwDYXNkMRYwFAYJKoZIhvcNAQkBFgdhQGEuY29tMIIB - IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq//c0hEEr83CS1pMgsHX50jt - 2MqIbcf63UUNJTiYpUUvUQSFJFc7m/dr+RTZvu97eDCnD5K2qkHHvTPaPZwY+Djf - iy7N641Sz6u/y3Yo3xxs1Aermsfedh48vusJpjbkT2XS44VjbkrpKcWDNVpp3Evd - M7oJotXeUsZ+imiyVCfr4YhoY5gbGh/r+KN9Wf9YKoUyfLLZGwdZkhtX2zIbidsL - Thqi9YTaUHttGinjiBBum234u/CfvKXsfG3yP2gvBGnlvZnM9ktv+lVffYNqlf7H - VmB1bKKk84HtzuW5X76SGAgOG8eHX4x5ZLI1WQUuoQOVRl1I0UCjBtbz8XhwvQID - AQABo4IBLTCCASkwLQYDVR0RBCYwJIcEwKgABYcEwKgAA4cEwKgAkocEwKgAtYcE - wKgAgYcEwKgAtjAdBgNVHQ4EFgQUuVh/0v32fEkNykIz8tPdXmFD9rcwDwYDVR0T - AQH/BAUwAwEB/zCBmAYDVR0jBIGQMIGNgBS5WH/S/fZ8SQ3KQjPy091eYUP2t6Fw - pG4wbDEMMAoGA1UEAwwDYXNkMQswCQYDVQQGEwJVUzENMAsGA1UECAwEYXNkZjEL - MAkGA1UEBwwCYWYxDTALBgNVBAoMBGFzZGYxDDAKBgNVBAsMA2FzZDEWMBQGCSqG - SIb3DQEJARYHYUBhLmNvbYIDYFMXMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF - BQcDAjAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAKEocOmVuWlr - zegtKYMe8NhHIkFY9oVn5ym6RHNOJpPH4QF8XYC3Z5+iC5yGh4P/jVe/4I4SF6Ql - PtofU0jNq5vzapt/y+m008eXqPQFmoUOvu+JavoRVcRx2LIP5AgBA1mF56CSREsX - TkuJAA9IUQ8EjnmAoAeKINuPaKxGDuU8BGCMqr/qd564MKNf9XYL+Fb2rlkA0O2d - 2No34DQLgqSmST/LAvPM7Cbp6knYgnKmGr1nETCXasg1cueHLnWWTvps2HiPp2D/ - +Fq0uqcZLu4Mdo0CPs4e5sHRyldEnRSKh0DVLprq9zr/GMipmPLJUsT5Jed3sj0w - M7Y3vwxshpo= - - -----END CERTIFICATE-----' + -----END CERTIFICATE----- certificate_path: /etc/certificates/slog3.crt chain: true chain_list: - - '-----BEGIN CERTIFICATE----- - + - | + -----BEGIN CERTIFICATE----- MIIEdjCCA16gAwIBAgIDYFMYMA0GCSqGSIb3DQEBCwUAMGwxDDAKBgNVBAMMA2Fz - ZDELMAkGA1UEBhMCVVMxDTALBgNVBAgMBGFzZGYxCzAJBgNVBAcMAmFmMQ0wCwYD - VQQKDARhc2RmMQwwCgYDVQQLDANhc2QxFjAUBgkqhkiG9w0BCQEWB2FAYS5jb20w - HhcNMjEwODMwMjMyMzU0WhcNMjMxMjAzMjMyMzU0WjBuMQswCQYDVQQDDAJhZDEL - MAkGA1UEBhMCVVMxDTALBgNVBAgMBGFzZGYxDTALBgNVBAcMBGFzZGYxDTALBgNV - BAoMBGFkc2YxDTALBgNVBAsMBGFzZGYxFjAUBgkqhkiG9w0BCQEWB2FAYS5jb20w - ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7+1xOHRQyOnQTHFcrdasX - Zl0gzutVlA890a1wiQpdD5dOtCLo7+eqVYjqVKo9W8RUIArXWmBu/AbkH7oVFWC1 - P973W1+ArF5sA70f7BZgqRKJTIisuIFIlRETgfnP2pfQmHRZtGaIJRZI4vQCdYgW - 2g0KOvvNcZJCVq1OrhKiNiY1bWCp66DGg0ic6OEkZFHTm745zUNQaf2dNgsxKU0H - PGjVLJI//yrRFAOSBUqgD4c50krnMF7fU/Fqh+UyOu8t6Y/HsySh3urB+Zie331t - AzV6QV39KKxRflNx/yuWrtIEslGTm+xHKoCYJEk/nZ3mX8Y5hG6wWAb7A/FuDVg3 - AgMBAAGjggEdMIIBGTAnBgNVHREEIDAehwTAqAADhwTAqAAFhwTAqAC2hwTAqACB - hwTAqACSMB0GA1UdDgQWBBQ4G2ff4tgZl4vmo4xCfqmJhdqShzAMBgNVHRMBAf8E - AjAAMIGYBgNVHSMEgZAwgY2AFLlYf9L99nxJDcpCM/LT3V5hQ/a3oXCkbjBsMQww - CgYDVQQDDANhc2QxCzAJBgNVBAYTAlVTMQ0wCwYDVQQIDARhc2RmMQswCQYDVQQH - DAJhZjENMAsGA1UECgwEYXNkZjEMMAoGA1UECwwDYXNkMRYwFAYJKoZIhvcNAQkB - FgdhQGEuY29tggNgUxcwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwEwDgYDVR0PAQH/ - BAQDAgWgMA0GCSqGSIb3DQEBCwUAA4IBAQA6FpOInEHB5iVk3FP67GybJ29vHZTD - KQHbQgmg8s4L7qIsA1HQ+DMCbdylpA11x+t/eL/n48BvGw2FNXpN6uykhLHJjbKR - h8yITa2KeD3LjLYhScwIigXmTVYSP3km6s8jRL6UKT9zttnIHyXVpBDya6Q4WTMx - fmfC6O7t1PjQ5ZyVtzizIUP8ah9n4TKdXU4A3QIM6WsJXpHb+vqp1WDWJ7mKFtgj - x5TKv3wcPnktx0zMPfLb5BTSE9rc9djcBG0eIAsPT4FgiatCUChe7VhuMnqskxEz - MymJLoq8+mzucRwFkOkR2EIt1x+Irl2mJVMeBow63rVZfUQBD8h++LqB - - -----END CERTIFICATE-----' - - '-----BEGIN CERTIFICATE----- - + -----END CERTIFICATE----- + - | + -----BEGIN CERTIFICATE----- MIIEhDCCA2ygAwIBAgIDYFMXMA0GCSqGSIb3DQEBCwUAMGwxDDAKBgNVBAMMA2Fz - ZDELMAkGA1UEBhMCVVMxDTALBgNVBAgMBGFzZGYxCzAJBgNVBAcMAmFmMQ0wCwYD - VQQKDARhc2RmMQwwCgYDVQQLDANhc2QxFjAUBgkqhkiG9w0BCQEWB2FAYS5jb20w - HhcNMjEwODMwMjMyMDQ1WhcNMzEwODI4MjMyMDQ1WjBsMQwwCgYDVQQDDANhc2Qx - CzAJBgNVBAYTAlVTMQ0wCwYDVQQIDARhc2RmMQswCQYDVQQHDAJhZjENMAsGA1UE - CgwEYXNkZjEMMAoGA1UECwwDYXNkMRYwFAYJKoZIhvcNAQkBFgdhQGEuY29tMIIB - IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq//c0hEEr83CS1pMgsHX50jt - 2MqIbcf63UUNJTiYpUUvUQSFJFc7m/dr+RTZvu97eDCnD5K2qkHHvTPaPZwY+Djf - iy7N641Sz6u/y3Yo3xxs1Aermsfedh48vusJpjbkT2XS44VjbkrpKcWDNVpp3Evd - M7oJotXeUsZ+imiyVCfr4YhoY5gbGh/r+KN9Wf9YKoUyfLLZGwdZkhtX2zIbidsL - Thqi9YTaUHttGinjiBBum234u/CfvKXsfG3yP2gvBGnlvZnM9ktv+lVffYNqlf7H - VmB1bKKk84HtzuW5X76SGAgOG8eHX4x5ZLI1WQUuoQOVRl1I0UCjBtbz8XhwvQID - AQABo4IBLTCCASkwLQYDVR0RBCYwJIcEwKgABYcEwKgAA4cEwKgAkocEwKgAtYcE - wKgAgYcEwKgAtjAdBgNVHQ4EFgQUuVh/0v32fEkNykIz8tPdXmFD9rcwDwYDVR0T - AQH/BAUwAwEB/zCBmAYDVR0jBIGQMIGNgBS5WH/S/fZ8SQ3KQjPy091eYUP2t6Fw - pG4wbDEMMAoGA1UEAwwDYXNkMQswCQYDVQQGEwJVUzENMAsGA1UECAwEYXNkZjEL - MAkGA1UEBwwCYWYxDTALBgNVBAoMBGFzZGYxDDAKBgNVBAsMA2FzZDEWMBQGCSqG - SIb3DQEJARYHYUBhLmNvbYIDYFMXMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF - BQcDAjAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAKEocOmVuWlr - zegtKYMe8NhHIkFY9oVn5ym6RHNOJpPH4QF8XYC3Z5+iC5yGh4P/jVe/4I4SF6Ql - PtofU0jNq5vzapt/y+m008eXqPQFmoUOvu+JavoRVcRx2LIP5AgBA1mF56CSREsX - TkuJAA9IUQ8EjnmAoAeKINuPaKxGDuU8BGCMqr/qd564MKNf9XYL+Fb2rlkA0O2d - 2No34DQLgqSmST/LAvPM7Cbp6knYgnKmGr1nETCXasg1cueHLnWWTvps2HiPp2D/ - +Fq0uqcZLu4Mdo0CPs4e5sHRyldEnRSKh0DVLprq9zr/GMipmPLJUsT5Jed3sj0w - M7Y3vwxshpo= - -----END CERTIFICATE-----' city: asdf common: ad @@ -250,17 +157,15 @@ ixCertificates: digest_algorithm: SHA256 email: a@a.com extensions: - AuthorityKeyIdentifier: 'keyid:B9:58:7F:D2:FD:F6:7C:49:0D:CA:42:33:F2:D3:DD:5E:61:43:F6:B7 - + AuthorityKeyIdentifier: | + keyid:B9:58:7F:D2:FD:F6:7C:49:0D:CA:42:33:F2:D3:DD:5E:61:43:F6:B7 DirName:/CN=asd/C=US/ST=asdf/L=af/O=asdf/OU=asd/emailAddress=a@a.com - serial:60:53:17 - - ' BasicConstraints: CA:FALSE ExtendedKeyUsage: TLS Web Server Authentication KeyUsage: Digital Signature, Key Encipherment - SubjectAltName: IP Address:192.168.0.3, IP Address:192.168.0.5, IP Address:192.168.0.182, + SubjectAltName: | + IP Address:192.168.0.3, IP Address:192.168.0.5, IP Address:192.168.0.182, IP Address:192.168.0.129, IP Address:192.168.0.146 SubjectKeyIdentifier: 38:1B:67:DF:E2:D8:19:97:8B:E6:A3:8C:42:7E:A9:89:85:DA:92:87 fingerprint: 59:7A:49:6D:04:CE:70:E5:AF:9A:FB:75:3C:26:58:7D:B7:8E:A6:9D @@ -275,61 +180,35 @@ ixCertificates: organization: adsf organizational_unit: asdf parsed: true - privatekey: '-----BEGIN PRIVATE KEY----- - + privatekey: | + -----BEGIN PRIVATE KEY----- MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC7+1xOHRQyOnQT - HFcrdasXZl0gzutVlA890a1wiQpdD5dOtCLo7+eqVYjqVKo9W8RUIArXWmBu/Abk - H7oVFWC1P973W1+ArF5sA70f7BZgqRKJTIisuIFIlRETgfnP2pfQmHRZtGaIJRZI - 4vQCdYgW2g0KOvvNcZJCVq1OrhKiNiY1bWCp66DGg0ic6OEkZFHTm745zUNQaf2d - NgsxKU0HPGjVLJI//yrRFAOSBUqgD4c50krnMF7fU/Fqh+UyOu8t6Y/HsySh3urB - +Zie331tAzV6QV39KKxRflNx/yuWrtIEslGTm+xHKoCYJEk/nZ3mX8Y5hG6wWAb7 - A/FuDVg3AgMBAAECggEAapt30rj9DitGTtxAt13pJMEhyYxvvD3WkvmJwguF/Bbu - eW0Ba1c668fMeRCA54FWi1sMqusPS4HUqqUvk+tmyAOsAF4qgD/A4MMSC7uJSVI5 - N/JWhJWyhCY94/FPakiO1nbPbVw41bcqtzU2qvparpME2CtxSCbDiqm7aaag3Kqe - EF0fGSUdZ+TYl9JM05+eIyiX+UY19Fg0OjTHMn8nGpxcNTfDBdQ68TKvdo/dtIKL - PLKzJUNNdM8odC4CvQtfGMqaslwZwXkiOl5VJcW21ncj/Y0ngEMKeD/i65ZoqGdR - 0FKCQYEAGtM2FvJcZQ92Wsw7yj2bK2MSegVUyLK32QKBgQDe8syVCepPzRsfjfxA - 6TZlWcGuTZLhwIx97Ktw3VcQ1f4rLoEYlv0xC2VWBORpzIsJo4I/OLmgp8a+Ga8z - FkVRnq90dV3t4NP9uJlHgcODHnOardC2UUka4olBSCG6zmK4Jxi34lOxhGRkshOo - L4IBeOIB5g+ZrEEXkzfYJHESRQKBgQDX2YhFhGIrT8BAnC5BbXbhm8h6Bhjz8DYL - d+qhVJjef7L/aJxViU0hX9Ba2O8CLK3FZeREFE3hJPiJ4TZSlN4evxs5p+bbNDcA - 0mhRI/o3X4ac6IxdRebyYnCOB/Cu94/MzppcZcotlCekKNike7eorCcX4Qavm7Pu - MUuQ+ifmSwKBgEnchoqZzlbBzMqXb4rRuIO7SL9GU/MWp3TQg7vQmJerTZlgvsQ2 - wYsOC3SECmhCq4117iCj2luvOdihCboTFsQDnn0mpQe6BIF6Ns3J38wAuqv0CcFd - DKsrge1uyD3rQilgSoAhKzkUc24o0PpXQurZ8YZPgbuXpbj5vPaOnCdBAoGACYc7 - wb3XS4wos3FxhUfcwJbM4b4VKeeHqzfu7pI6cU/3ydiHVitKcVe2bdw3qMPqI9Wc - nvi6e17Tbdq4OCsEJx1OiVwFD9YdO3cOTc6lw/3+hjypvZBRYo+/4jUthbu96E+S - dtOzehGZMmDvN0uSzupSi3ZOgkAAUFpyuIKickMCgYAId0PCRjonO2thn/R0rZ7P - //L852uyzYhXKw5/fjFGhQ6LbaLgIRFaCZ0L2809u0HFnNvJjHv4AKP6j+vFQYYY - qQ+66XnfsA9G/bu4MDS9AX83iahD9IdLXQAy8I19prAbpVumKegPbMnNYNB/TYEc - 3G15AKCXo7jjOUtHY01DCQ== - - -----END PRIVATE KEY-----' + -----END PRIVATE KEY----- privatekey_path: /etc/certificates/slog3.key revoked: false revoked_date: null @@ -346,19 +225,3 @@ ixCertificates: subject_name_hash: 1673640987 type: 8 until: Mon Dec 4 04:23:54 2023 -ixChartContext: - isInstall: false - isUpdate: true - isUpgrade: false - operation: UPDATE - storageClassName: ix-storage-class-col - upgradeMetadata: {} -ixExternalInterfacesConfiguration: [] -ixExternalInterfacesConfigurationNames: [] -ixVolumes: [] -nginx: - image: - pullPolicy: IfNotPresent - repository: nginx - tag: 1.21.3 -nodePort: 31980 diff --git a/charts/collabora/item.yaml b/library/ix-dev/charts/collabora/item.yaml similarity index 100% rename from charts/collabora/item.yaml rename to library/ix-dev/charts/collabora/item.yaml diff --git a/charts/collabora/1.2.6/questions.yaml b/library/ix-dev/charts/collabora/questions.yaml similarity index 100% rename from charts/collabora/1.2.6/questions.yaml rename to library/ix-dev/charts/collabora/questions.yaml diff --git a/charts/collabora/1.2.6/templates/_helpers.tpl b/library/ix-dev/charts/collabora/templates/_helpers.tpl similarity index 100% rename from charts/collabora/1.2.6/templates/_helpers.tpl rename to library/ix-dev/charts/collabora/templates/_helpers.tpl diff --git a/charts/collabora/1.2.6/templates/deployment.yaml b/library/ix-dev/charts/collabora/templates/deployment.yaml similarity index 67% rename from charts/collabora/1.2.6/templates/deployment.yaml rename to library/ix-dev/charts/collabora/templates/deployment.yaml index 4e19a1caee..8576aea01e 100644 --- a/charts/collabora/1.2.6/templates/deployment.yaml +++ b/library/ix-dev/charts/collabora/templates/deployment.yaml @@ -36,6 +36,36 @@ spec: - name: https containerPort: 443 protocol: TCP + livenessProbe: + httpGet: + scheme: HTTPS + path: /robots.txt + port: 443 + initialDelaySeconds: 10 + periodSeconds: 10 + timeoutSeconds: 5 + failureThreshold: 5 + successThreshold: 1 + readinessProbe: + httpGet: + scheme: HTTPS + path: /robots.txt + port: 443 + initialDelaySeconds: 10 + periodSeconds: 10 + timeoutSeconds: 5 + failureThreshold: 5 + successThreshold: 2 + startupProbe: + httpGet: + scheme: HTTPS + path: /robots.txt + port: 443 + initialDelaySeconds: 10 + periodSeconds: 5 + timeoutSeconds: 2 + failureThreshold: 60 + successThreshold: 1 - name: {{ .Chart.Name }} {{ include "common.resources.limitation" . | nindent 10 }} {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} @@ -46,6 +76,33 @@ spec: mountPath: {{ $hostPathConfiguration.mountPath }} {{ end }} {{ end }} + livenessProbe: + httpGet: + path: / + port: 9980 + initialDelaySeconds: 10 + periodSeconds: 10 + timeoutSeconds: 5 + failureThreshold: 5 + successThreshold: 1 + readinessProbe: + httpGet: + path: / + port: 9980 + initialDelaySeconds: 10 + periodSeconds: 10 + timeoutSeconds: 5 + failureThreshold: 5 + successThreshold: 1 + startupProbe: + httpGet: + path: / + port: 9980 + initialDelaySeconds: 10 + periodSeconds: 10 + timeoutSeconds: 5 + failureThreshold: 5 + successThreshold: 1 ports: - name: collabora protocol: TCP @@ -54,7 +111,7 @@ spec: {{ $secretName := (include "secretName" .) }} {{ $envConfig := .Values.config }} {{ $envList = mustAppend $envList (dict "name" "timezone" "value" $envConfig.timezone) }} - {{ $envList = mustAppend $envList (dict "name" "domain" "value" $envConfig.domain) }} + {{ $envList = mustAppend $envList (dict "name" "aliasgroup1" "value" $envConfig.domain) }} {{ $envList = mustAppend $envList (dict "name" "dictionaries" "value" $envConfig.dictionaries) }} {{ $envList = mustAppend $envList (dict "name" "extra_params" "value" $envConfig.extra_params) }} {{ $envList = mustAppend $envList (dict "name" "DONT_GEN_SSL_CERT" "value" "true") }} diff --git a/charts/collabora/1.2.6/templates/nginx-conf.yaml b/library/ix-dev/charts/collabora/templates/nginx-conf.yaml similarity index 100% rename from charts/collabora/1.2.6/templates/nginx-conf.yaml rename to library/ix-dev/charts/collabora/templates/nginx-conf.yaml diff --git a/charts/collabora/1.2.6/templates/nginx-service.yaml b/library/ix-dev/charts/collabora/templates/nginx-service.yaml similarity index 100% rename from charts/collabora/1.2.6/templates/nginx-service.yaml rename to library/ix-dev/charts/collabora/templates/nginx-service.yaml diff --git a/charts/collabora/1.2.6/templates/secrets.yaml b/library/ix-dev/charts/collabora/templates/secrets.yaml similarity index 100% rename from charts/collabora/1.2.6/templates/secrets.yaml rename to library/ix-dev/charts/collabora/templates/secrets.yaml diff --git a/charts/collabora/upgrade_info.json b/library/ix-dev/charts/collabora/upgrade_info.json similarity index 100% rename from charts/collabora/upgrade_info.json rename to library/ix-dev/charts/collabora/upgrade_info.json diff --git a/charts/collabora/upgrade_strategy_disabled b/library/ix-dev/charts/collabora/upgrade_strategy_disabled similarity index 100% rename from charts/collabora/upgrade_strategy_disabled rename to library/ix-dev/charts/collabora/upgrade_strategy_disabled diff --git a/charts/collabora/1.2.6/ix_values.yaml b/library/ix-dev/charts/collabora/values.yaml similarity index 81% rename from charts/collabora/1.2.6/ix_values.yaml rename to library/ix-dev/charts/collabora/values.yaml index 94d9bbe79d..816c73e939 100644 --- a/charts/collabora/1.2.6/ix_values.yaml +++ b/library/ix-dev/charts/collabora/values.yaml @@ -1,10 +1,10 @@ image: pullPolicy: IfNotPresent repository: collabora/code - tag: 21.11.4.1.1 + tag: 22.05.12.2.1 nginx: image: pullPolicy: IfNotPresent repository: nginx - tag: 1.21.3 + tag: 1.23.3 updateStrategy: Recreate