diff --git a/test/collabora/1.1.0/.helmignore b/test/collabora/1.2.0/.helmignore similarity index 100% rename from test/collabora/1.1.0/.helmignore rename to test/collabora/1.2.0/.helmignore diff --git a/test/collabora/1.1.0/Chart.yaml b/test/collabora/1.2.0/Chart.yaml similarity index 81% rename from test/collabora/1.1.0/Chart.yaml rename to test/collabora/1.2.0/Chart.yaml index 3e88f1bf93..05d5932031 100644 --- a/test/collabora/1.1.0/Chart.yaml +++ b/test/collabora/1.2.0/Chart.yaml @@ -1,10 +1,11 @@ apiVersion: v1 -appVersion: 6.4.10.10 +appVersion: 21.11.3.4.1 dependencies: - name: common repository: file://../../../library/common/2112.0.0 version: 2112.0.0 -description: "Collabora Online Development Edition \u2013 an awesome, Online Office \ suite image suitable for home use." +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: @@ -15,4 +16,4 @@ name: collabora sources: - https://github.com/CollaboraOnline/online.git - https://hub.docker.com/r/collabora/code -version: 1.1.0 +version: 1.2.0 diff --git a/test/collabora/1.1.0/README.md b/test/collabora/1.2.0/README.md similarity index 100% rename from test/collabora/1.1.0/README.md rename to test/collabora/1.2.0/README.md diff --git a/test/collabora/1.1.0/app-readme.md b/test/collabora/1.2.0/app-readme.md similarity index 100% rename from test/collabora/1.1.0/app-readme.md rename to test/collabora/1.2.0/app-readme.md diff --git a/test/collabora/1.1.0/charts/common-2112.0.0.tgz b/test/collabora/1.2.0/charts/common-2112.0.0.tgz similarity index 100% rename from test/collabora/1.1.0/charts/common-2112.0.0.tgz rename to test/collabora/1.2.0/charts/common-2112.0.0.tgz diff --git a/test/collabora/1.1.0/ix_values.yaml b/test/collabora/1.2.0/ix_values.yaml similarity index 90% rename from test/collabora/1.1.0/ix_values.yaml rename to test/collabora/1.2.0/ix_values.yaml index 4e07fa58fc..60a3bece67 100644 --- a/test/collabora/1.1.0/ix_values.yaml +++ b/test/collabora/1.2.0/ix_values.yaml @@ -1,7 +1,7 @@ image: pullPolicy: IfNotPresent repository: collabora/code - tag: 6.4.10.10 + tag: 21.11.3.4.1 nginx: image: pullPolicy: IfNotPresent diff --git a/test/collabora/1.1.0/questions.yaml b/test/collabora/1.2.0/questions.yaml similarity index 98% rename from test/collabora/1.1.0/questions.yaml rename to test/collabora/1.2.0/questions.yaml index 1d39680319..91fac3eb7b 100644 --- a/test/collabora/1.1.0/questions.yaml +++ b/test/collabora/1.2.0/questions.yaml @@ -16,7 +16,7 @@ portals: - "$variable-config.server_name" ports: - "$variable-nodePort" - path: "/loleaflet/dist/admin/admin.html" + path: "/browser/dist/admin/admin.html" questions: - variable: config diff --git a/test/collabora/1.1.0/requirements.lock b/test/collabora/1.2.0/requirements.lock similarity index 100% rename from test/collabora/1.1.0/requirements.lock rename to test/collabora/1.2.0/requirements.lock diff --git a/test/collabora/1.1.0/templates/_helpers.tpl b/test/collabora/1.2.0/templates/_helpers.tpl similarity index 100% rename from test/collabora/1.1.0/templates/_helpers.tpl rename to test/collabora/1.2.0/templates/_helpers.tpl diff --git a/test/collabora/1.1.0/templates/deployment.yaml b/test/collabora/1.2.0/templates/deployment.yaml similarity index 100% rename from test/collabora/1.1.0/templates/deployment.yaml rename to test/collabora/1.2.0/templates/deployment.yaml diff --git a/test/collabora/1.1.0/templates/nginx-conf.yaml b/test/collabora/1.2.0/templates/nginx-conf.yaml similarity index 96% rename from test/collabora/1.1.0/templates/nginx-conf.yaml rename to test/collabora/1.2.0/templates/nginx-conf.yaml index ec616892eb..e79e98253f 100644 --- a/test/collabora/1.1.0/templates/nginx-conf.yaml +++ b/test/collabora/1.2.0/templates/nginx-conf.yaml @@ -63,7 +63,7 @@ data: } # static files - location ^~ /loleaflet { + location ^~ /browser { proxy_pass http://{{ $serviceName }}:9980; proxy_set_header Host $host; # proxy_set_header Referer "http://nginx"; @@ -85,7 +85,7 @@ data: } # main websocket - location ~ ^/lool/(.*)/ws$ { + location ~ ^/cool/(.*)/ws$ { proxy_pass http://{{ $serviceName }}:9980; proxy_set_header Host $host; proxy_set_header Upgrade $http_upgrade; @@ -95,14 +95,14 @@ data: } # download, presentation and image upload - location ~ ^/lool { + location ~ ^/(c|l)ool { proxy_pass http://{{ $serviceName }}:9980; proxy_set_header Host $host; proxy_set_header Referer "http://nginx"; } # Admin Console websocket - location ^~ /lool/adminws { + location ^~ /cool/adminws { proxy_pass http://{{ $serviceName }}:9980; proxy_set_header Host $host; proxy_set_header Upgrade $http_upgrade; diff --git a/test/collabora/1.1.0/templates/nginx-service.yaml b/test/collabora/1.2.0/templates/nginx-service.yaml similarity index 100% rename from test/collabora/1.1.0/templates/nginx-service.yaml rename to test/collabora/1.2.0/templates/nginx-service.yaml diff --git a/test/collabora/1.1.0/templates/secrets.yaml b/test/collabora/1.2.0/templates/secrets.yaml similarity index 100% rename from test/collabora/1.1.0/templates/secrets.yaml rename to test/collabora/1.2.0/templates/secrets.yaml diff --git a/test/collabora/1.1.0/templates/tests/deployment-check.yaml b/test/collabora/1.2.0/templates/tests/deployment-check.yaml similarity index 91% rename from test/collabora/1.1.0/templates/tests/deployment-check.yaml rename to test/collabora/1.2.0/templates/tests/deployment-check.yaml index c8fb506367..8bbb4f30fd 100644 --- a/test/collabora/1.1.0/templates/tests/deployment-check.yaml +++ b/test/collabora/1.2.0/templates/tests/deployment-check.yaml @@ -17,5 +17,5 @@ spec: - /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 }}/loleaflet/dist/admin/admin.html + 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/test/collabora/1.1.0/test_values.yaml b/test/collabora/1.2.0/test_values.yaml similarity index 91% rename from test/collabora/1.1.0/test_values.yaml rename to test/collabora/1.2.0/test_values.yaml index 93506171df..9031eb9c42 100644 --- a/test/collabora/1.1.0/test_values.yaml +++ b/test/collabora/1.2.0/test_values.yaml @@ -1,9 +1,10 @@ certificate: 55 config: - DONT_GEN_SSL_CERT: "true" + DONT_GEN_SSL_CERT: 'true' dictionaries: de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru domain: nextcloud\.domain\.tld|othernextcloud\.domain\.tld - extra_params: --o:welcome.enable=false --o:user_interface.mode=notebookbar --o:ssl.termination=true --o:ssl.enable=false --o:net.proto=IPv4 --o:net.post_allow.host[0]=.+ --o:storage.wopi.host[0]=.+ + extra_params: --o:welcome.enable=false --o:user_interface.mode=notebookbar --o:ssl.termination=true + --o:ssl.enable=false --o:net.proto=IPv4 --o:net.post_allow.host[0]=.+ --o:storage.wopi.host[0]=.+ password: changeme server_name: ssh.sonicaj.com:49980 timezone: Asia/Karachi @@ -13,133 +14,235 @@ extraAppVolumeMounts: [] image: pullPolicy: IfNotPresent repository: collabora/code - tag: 6.4.10.10 + tag: 21.11.3.4.1 ixCertificateAuthorities: {} ixCertificates: - "55": + '55': CA_type_existing: false CA_type_intermediate: false CA_type_internal: false CSR: null - DN: /CN=ad/C=US/ST=asdf/L=asdf/O=adsf/OU=asdf/emailAddress=a@a.com/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 + DN: /CN=ad/C=US/ST=asdf/L=asdf/O=adsf/OU=asdf/emailAddress=a@a.com/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 can_be_revoked: false cert_type: CERTIFICATE 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----- + + -----END CERTIFICATE-----' city: asdf common: ad country: US @@ -147,19 +250,23 @@ 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, IP Address:192.168.0.129, IP Address:192.168.0.146 + 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 from: Tue Aug 31 04:23:54 2021 id: 55 - internal: "NO" + internal: 'NO' issuer: external key_length: 2048 key_type: RSA @@ -168,35 +275,61 @@ 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 diff --git a/test/collabora/upgrade_info.json b/test/collabora/upgrade_info.json new file mode 100644 index 0000000000..f22ddd1aee --- /dev/null +++ b/test/collabora/upgrade_info.json @@ -0,0 +1 @@ +{"filename": "ix_values.yaml", "keys": ["image"], "test_filename": "test_values.yaml"} diff --git a/test/collabora/upgrade_strategy b/test/collabora/upgrade_strategy new file mode 100755 index 0000000000..ef93561d04 --- /dev/null +++ b/test/collabora/upgrade_strategy @@ -0,0 +1,24 @@ +#!/usr/bin/python3 +import json +import sys + +from catalog_update.upgrade_strategy import semantic_versioning + + +def newer_mapping(image_tags): + key = list(image_tags.keys())[0] + version = semantic_versioning(sorted(image_tags[key], reverse=True)) + if not version: + return {} + + return { + 'tags': {key: version}, + 'app_version': version, + } + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + print(json.dumps(newer_mapping(json.loads(sys.argv[1]))))