Commit f25ca877 authored by Ľuboslav Pivarč's avatar Ľuboslav Pivarč
Browse files

Merge branch 'beta' into 'dev'

Dev <- Beta

See merge request !4
parents 632a05ff 1a11e9af
Pipeline #25626 waiting for manual action with stages
in 13 seconds
...@@ -29,8 +29,8 @@ stages: ...@@ -29,8 +29,8 @@ stages:
*kube-auth *kube-auth
script: script:
- cd mellon/${CI_COMMIT_REF_NAME} - cd mellon/${CI_COMMIT_REF_NAME}
- kubectl get -n cbio-on-demand${NAMESPACE} configmaps cert || kubectl -n cbio-on-demand${NAMESPACE} create configmap cert --from-file=sp_cert.pem - kubectl -n cbio-on-demand${NAMESPACE} create configmap cert --from-file=sp_cert.pem --dry-run -o yaml | kubectl apply -f -
- kubectl get -n cbio-on-demand${NAMESPACE} configmaps xml || kubectl -n cbio-on-demand${NAMESPACE} create configmap xml --from-file=sp-metadata.xml - kubectl -n cbio-on-demand${NAMESPACE} create configmap xml --from-file=sp-metadata.xml --dry-run -o yaml | kubectl apply -f -
- export foo="${CI_COMMIT_REF_NAME}_KEY" - export foo="${CI_COMMIT_REF_NAME}_KEY"
- foo=$(eval echo \$"$foo") - foo=$(eval echo \$"$foo")
- mv $foo ./sp_key.pem - mv $foo ./sp_key.pem
......
<EntityDescriptor entityID="http://cbiood-beta.edirex.ics.muni.cz" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <EntityDescriptor entityID="http://cbiood-beta.edirex.ics.muni.cz/mellon" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<KeyDescriptor use="signing"> <KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data> <ds:X509Data>
<ds:X509Certificate>MIIC2TCCAcECFCPc1QW6FyBut5NMmX35XtDXuM0pMA0GCSqGSIb3DQEBCwUAMCkx <ds:X509Certificate>MIIC2TCCAcECFBIHF8qnxco26wmPvh2BrP46lK/KMA0GCSqGSIb3DQEBCwUAMCkx
JzAlBgNVBAMMHmNiaW9vZC1iZXRhLmVkaXJleC5pY3MubXVuaS5jejAeFw0xOTA3 JzAlBgNVBAMMHmNiaW9vZC1iZXRhLmVkaXJleC5pY3MubXVuaS5jejAeFw0xOTA5
MzAxMzM1MTVaFw0yOTA3MjkxMzM1MTVaMCkxJzAlBgNVBAMMHmNiaW9vZC1iZXRh MzAxMDEyMDVaFw0yOTA5MjkxMDEyMDVaMCkxJzAlBgNVBAMMHmNiaW9vZC1iZXRh
LmVkaXJleC5pY3MubXVuaS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC LmVkaXJleC5pY3MubXVuaS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
ggEBAKQOWyME51yq66v/oFPXg+fD5Aguajd2FYrFS6wmmNFYI7bjtYF0HAInJQ1G ggEBALExJ1733itsr/bXRyR/hCKcpA8gROzwCuy4owf9EqIap1OkCzFc0jIIlF8J
KgBQQb5oMmKFOtV5mA99sfo8ePNBpKyT+klesq7jLCRHeVFBPobv2SO9NIT502qk 4oP9l0dxnYGExeJ+Gr9h+VytH9LT/ZS+QoA2ROUMa+DxNSgw3/wSNKWd5YxR3ZxB
5nQdEEWV6fKVd1/unhH/SnyxPKXXrkdCSa7uVqYYtyr2TNG+DhmiW9MNYm9TyJS9 5d4jWNpv5uHuhNyJFnSWBAlTGnMW5RwfS3rgAz7qe3veJzmWcfsRim443eHcJDq+
mJvoj0BMO24o3q+qCtMzln1bn/zZSrlV8HNAQ1R0Lq3xMevagF94LRNEXG4BId3q VZcIhy6DoVWP2mKt777w7lqoeNbpF80+vBJCpxohFWAHO74mqel5uu6shyN5h87y
Q29DN4GaPcd04z055Bomo9e/MV+xkg+bvLZYPnpaYOch2Lxw52bbuMV9OtFBF+9W 5sq5eneJNtHfTaG2pppuH398KoHE+dJ3vWMl1j6AUvZFLQhSZCdn934ez5Sbrlf/
pbQ9a3pnpCTSkbDnOuPbtuwvyqUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAmloT mmw1l/CCtUiR1E0DpAM1YIbOFPcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAH6Tm
ZHZRsNV9rGhCxTJo/Xj7dg72H9OTDVwB3j+90JnCgjVVxywTwZP8W8hovxI9oPCn nPj1FxoK96G3BGen6FIUikeIgYiKAFmIcaG2AuUURu2BOdqghaw+JB6y9Q8lytve
EV/qu3qCJ4C3O0t/lpydKy+qFsKPRynEPte/CJof+6H40US51T7xpnQ7HntLBgjh nXznHi+/B7NxfqqaroIKp265h9lHJdk07TXxqE4UBtUVzNUlSN7nXOyMIOVKxIwU
XXNKOrtlm4hYUZ0rgHnF5lF+cWoj7d8Qt2o65kV0PvG81P8Lo9tvONB3Jd1z58Re Vie4vDoVSQjrMNgaVUX5ORojLhajAPDMDL9qIZkBh6j2TL2ZXG1vvTkdPhDk5W1R
P1NcR/ZzwI0UEhH5ZJ2M3HuNC727H2xFZwKWlqSWABZjjWTaPWJ6qALWdZPF4S9H A6BVDQvZ42Rt/p2NAV0eChi3/TXBCLT6UlvrI/6q8Cn8xuDNz80360WqWjtl8zxi
7rDQK7ng275fQj4zIAr8Ps8FLrM/fEAwOngxzpw0IbY5NLhRLemjtzigag/88AiQ whjqOes6NR/RJNUJAIaTnms5RleLCbslZkZc8hvbBYRLZOEBQz4MUNsoJ5E4ih/N
ZMW5kI3cdinOEezFGA==</ds:X509Certificate> UfudjCDRfld7Ri/dlg==</ds:X509Certificate>
</ds:X509Data> </ds:X509Data>
</ds:KeyInfo> </ds:KeyInfo>
</KeyDescriptor> </KeyDescriptor>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://cbiood-beta.edirex.ics.muni.cz/logout"/> <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://cbiood-beta.edirex.ics.muni.cz/mellon/logout"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://cbiood-beta.edirex.ics.muni.cz/postResponse" index="0"/> <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://cbiood-beta.edirex.ics.muni.cz/mellon/postResponse" index="0"/>
</SPSSODescriptor> </SPSSODescriptor>
</EntityDescriptor> </EntityDescriptor>
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIC2TCCAcECFCPc1QW6FyBut5NMmX35XtDXuM0pMA0GCSqGSIb3DQEBCwUAMCkx MIIC2TCCAcECFBIHF8qnxco26wmPvh2BrP46lK/KMA0GCSqGSIb3DQEBCwUAMCkx
JzAlBgNVBAMMHmNiaW9vZC1iZXRhLmVkaXJleC5pY3MubXVuaS5jejAeFw0xOTA3 JzAlBgNVBAMMHmNiaW9vZC1iZXRhLmVkaXJleC5pY3MubXVuaS5jejAeFw0xOTA5
MzAxMzM1MTVaFw0yOTA3MjkxMzM1MTVaMCkxJzAlBgNVBAMMHmNiaW9vZC1iZXRh MzAxMDEyMDVaFw0yOTA5MjkxMDEyMDVaMCkxJzAlBgNVBAMMHmNiaW9vZC1iZXRh
LmVkaXJleC5pY3MubXVuaS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC LmVkaXJleC5pY3MubXVuaS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
ggEBAKQOWyME51yq66v/oFPXg+fD5Aguajd2FYrFS6wmmNFYI7bjtYF0HAInJQ1G ggEBALExJ1733itsr/bXRyR/hCKcpA8gROzwCuy4owf9EqIap1OkCzFc0jIIlF8J
KgBQQb5oMmKFOtV5mA99sfo8ePNBpKyT+klesq7jLCRHeVFBPobv2SO9NIT502qk 4oP9l0dxnYGExeJ+Gr9h+VytH9LT/ZS+QoA2ROUMa+DxNSgw3/wSNKWd5YxR3ZxB
5nQdEEWV6fKVd1/unhH/SnyxPKXXrkdCSa7uVqYYtyr2TNG+DhmiW9MNYm9TyJS9 5d4jWNpv5uHuhNyJFnSWBAlTGnMW5RwfS3rgAz7qe3veJzmWcfsRim443eHcJDq+
mJvoj0BMO24o3q+qCtMzln1bn/zZSrlV8HNAQ1R0Lq3xMevagF94LRNEXG4BId3q VZcIhy6DoVWP2mKt777w7lqoeNbpF80+vBJCpxohFWAHO74mqel5uu6shyN5h87y
Q29DN4GaPcd04z055Bomo9e/MV+xkg+bvLZYPnpaYOch2Lxw52bbuMV9OtFBF+9W 5sq5eneJNtHfTaG2pppuH398KoHE+dJ3vWMl1j6AUvZFLQhSZCdn934ez5Sbrlf/
pbQ9a3pnpCTSkbDnOuPbtuwvyqUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAmloT mmw1l/CCtUiR1E0DpAM1YIbOFPcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAH6Tm
ZHZRsNV9rGhCxTJo/Xj7dg72H9OTDVwB3j+90JnCgjVVxywTwZP8W8hovxI9oPCn nPj1FxoK96G3BGen6FIUikeIgYiKAFmIcaG2AuUURu2BOdqghaw+JB6y9Q8lytve
EV/qu3qCJ4C3O0t/lpydKy+qFsKPRynEPte/CJof+6H40US51T7xpnQ7HntLBgjh nXznHi+/B7NxfqqaroIKp265h9lHJdk07TXxqE4UBtUVzNUlSN7nXOyMIOVKxIwU
XXNKOrtlm4hYUZ0rgHnF5lF+cWoj7d8Qt2o65kV0PvG81P8Lo9tvONB3Jd1z58Re Vie4vDoVSQjrMNgaVUX5ORojLhajAPDMDL9qIZkBh6j2TL2ZXG1vvTkdPhDk5W1R
P1NcR/ZzwI0UEhH5ZJ2M3HuNC727H2xFZwKWlqSWABZjjWTaPWJ6qALWdZPF4S9H A6BVDQvZ42Rt/p2NAV0eChi3/TXBCLT6UlvrI/6q8Cn8xuDNz80360WqWjtl8zxi
7rDQK7ng275fQj4zIAr8Ps8FLrM/fEAwOngxzpw0IbY5NLhRLemjtzigag/88AiQ whjqOes6NR/RJNUJAIaTnms5RleLCbslZkZc8hvbBYRLZOEBQz4MUNsoJ5E4ih/N
ZMW5kI3cdinOEezFGA== UfudjCDRfld7Ri/dlg==
-----END CERTIFICATE----- -----END CERTIFICATE-----
<EntityDescriptor entityID="http://cbiood-dev.edirex.ics.muni.cz" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <EntityDescriptor entityID="http://cbiood-dev.edirex.ics.muni.cz/mellon" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<KeyDescriptor use="signing"> <KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data> <ds:X509Data>
<ds:X509Certificate>MIIC1zCCAb8CFBvN2gTmRsKVXfbQcb+RJfOFWLbDMA0GCSqGSIb3DQEBCwUAMCgx <ds:X509Certificate>MIIC1zCCAb8CFB0s0VwaoWp89LK8Xurrlg2nNld0MA0GCSqGSIb3DQEBCwUAMCgx
JjAkBgNVBAMMHWNiaW9vZC1kZXYuZWRpcmV4Lmljcy5tdW5pLmN6MB4XDTE5MDcz JjAkBgNVBAMMHWNiaW9vZC1kZXYuZWRpcmV4Lmljcy5tdW5pLmN6MB4XDTE5MDkz
MDEzMzUxNVoXDTI5MDcyOTEzMzUxNVowKDEmMCQGA1UEAwwdY2Jpb29kLWRldi5l MDEwMTI0NVoXDTI5MDkyOTEwMTI0NVowKDEmMCQGA1UEAwwdY2Jpb29kLWRldi5l
ZGlyZXguaWNzLm11bmkuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB ZGlyZXguaWNzLm11bmkuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
AQCyVwHV89XPE4Wv/v/Yne3Gi8WgFX8KiZXxAtzjVraIj6SbIBu4Q5J8Pq1PEco3 AQDrPGJJWGVSVbvbjaOyYdb6s1cRPg0ygZ9ksmgVVEYjwmyudua/poaPyrsvdhnO
QmaPigaXptLi8X6r/khBSn6Svds0viybT83SGxGlaFqozqduaTUWQX6uvJa+U+wD 8Ec8Zr5qUyb6sj9MNHDhkhd7vLbayyBcRUbjb4bFA3g7rv3zyz7Oa4CYDdBrh57/
Z8z+9/i8f+Nhdk6C9N9r00/n7ux7HjhGxys10Etzb3g2UBe+A44F5W1GCwMWfX/B o74pLNNYWeP+h8u8F1QpI+oVHWcZQ/0/Vg2G6IExk/APPnQWWPQpHH5K4rq+tLTa
yA0jyCaWQcxjFH2YqJRosO7WpiN7vdhWS2F6hhlUZdheHO7yJnPZ8uESS7IZPTNU z1/fC/Y24YaoDhoq1UbBToXOK0mau95EiIpC3CQPgbjATwgF3KD/Ji6egzLwW+Mh
7LCiSGa7bcCeNqORaOuWpSpA/DpfQlev1edtIiE3wahn4+or6z4N2gg70qKkkscn poADxt8XYQ+LVbRGCtm5gtPzcBGlx7tLnpAobJNZXQ3EPAgXlJ8tFhK2QLYu50qx
kb/289gr2Xe9Bb4HQhDYOPvtAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAF1jyKu+ BQP68GhAzM5eT3vjG5uet4znAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAGjBIgyX
Vo1aozslyJPxbk69brxqY7bwNJFNKBMrD5PNfS/GH9SAq0qW2E2/xCX8RvFCd/7e Ri2wYqGzeX5tIgdqMhmmPvxVhAaOOT7enLlnp53gpq23fSUt7c+5lRZymnYKUlz2
SMUqIrIPF29OTweJM32OiRemkcTHrGhogV5hOUR0Xn4mydKlsSywsodN69O/64+P XR2fiBP1ZS2H0iJvsZqnihOe7lEjVhzK5QVcenv+KCrph9x4wIZoAABONO/DnFwn
ED0zvKuOCsGZSRMPgIow9mC815sZv9LWSuZNVlXoGMQ7bEOmYrDMnUpNZ5RlRpnC /DKSlmbe1RpLLU0VFE2Ny9lmHAKGWPrYVV6XspXJRAsFs2wR8voizpyjgMkH/7h9
OeRsdjjSobBaPZFJiPoQ0bG71On6EqjPKwjr6Af70m7iYyFBwXKPEqi8IJBLoAIU XN96u3xdsAMAp5Kz9ZGpktcKVxYAHuvxOA/1qlXS419J9NCQzhHvLKBm0Pg0Hm0z
GgsiFSwDMDBhS4yDQf7SbUBGHUNd79q2zSK/nYLM6bYtMsN96CabCEOnYGdm+Bn0 ionVDtYXgTtWIvvtirRnlAX7jmRKUOR9xLiw8d95wv/2X1TN6hMNPcl1nrgzSbrY
7MQ8fwwARxV5Uik=</ds:X509Certificate> 6O7m0xPEjKnsQis=</ds:X509Certificate>
</ds:X509Data> </ds:X509Data>
</ds:KeyInfo> </ds:KeyInfo>
</KeyDescriptor> </KeyDescriptor>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://cbiood-dev.edirex.ics.muni.cz/logout"/> <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://cbiood-dev.edirex.ics.muni.cz/mellon/logout"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://cbiood-dev.edirex.ics.muni.cz/postResponse" index="0"/> <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://cbiood-dev.edirex.ics.muni.cz/mellon/postResponse" index="0"/>
</SPSSODescriptor> </SPSSODescriptor>
</EntityDescriptor> </EntityDescriptor>
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIC1zCCAb8CFBvN2gTmRsKVXfbQcb+RJfOFWLbDMA0GCSqGSIb3DQEBCwUAMCgx MIIC1zCCAb8CFB0s0VwaoWp89LK8Xurrlg2nNld0MA0GCSqGSIb3DQEBCwUAMCgx
JjAkBgNVBAMMHWNiaW9vZC1kZXYuZWRpcmV4Lmljcy5tdW5pLmN6MB4XDTE5MDcz JjAkBgNVBAMMHWNiaW9vZC1kZXYuZWRpcmV4Lmljcy5tdW5pLmN6MB4XDTE5MDkz
MDEzMzUxNVoXDTI5MDcyOTEzMzUxNVowKDEmMCQGA1UEAwwdY2Jpb29kLWRldi5l MDEwMTI0NVoXDTI5MDkyOTEwMTI0NVowKDEmMCQGA1UEAwwdY2Jpb29kLWRldi5l
ZGlyZXguaWNzLm11bmkuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB ZGlyZXguaWNzLm11bmkuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
AQCyVwHV89XPE4Wv/v/Yne3Gi8WgFX8KiZXxAtzjVraIj6SbIBu4Q5J8Pq1PEco3 AQDrPGJJWGVSVbvbjaOyYdb6s1cRPg0ygZ9ksmgVVEYjwmyudua/poaPyrsvdhnO
QmaPigaXptLi8X6r/khBSn6Svds0viybT83SGxGlaFqozqduaTUWQX6uvJa+U+wD 8Ec8Zr5qUyb6sj9MNHDhkhd7vLbayyBcRUbjb4bFA3g7rv3zyz7Oa4CYDdBrh57/
Z8z+9/i8f+Nhdk6C9N9r00/n7ux7HjhGxys10Etzb3g2UBe+A44F5W1GCwMWfX/B o74pLNNYWeP+h8u8F1QpI+oVHWcZQ/0/Vg2G6IExk/APPnQWWPQpHH5K4rq+tLTa
yA0jyCaWQcxjFH2YqJRosO7WpiN7vdhWS2F6hhlUZdheHO7yJnPZ8uESS7IZPTNU z1/fC/Y24YaoDhoq1UbBToXOK0mau95EiIpC3CQPgbjATwgF3KD/Ji6egzLwW+Mh
7LCiSGa7bcCeNqORaOuWpSpA/DpfQlev1edtIiE3wahn4+or6z4N2gg70qKkkscn poADxt8XYQ+LVbRGCtm5gtPzcBGlx7tLnpAobJNZXQ3EPAgXlJ8tFhK2QLYu50qx
kb/289gr2Xe9Bb4HQhDYOPvtAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAF1jyKu+ BQP68GhAzM5eT3vjG5uet4znAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAGjBIgyX
Vo1aozslyJPxbk69brxqY7bwNJFNKBMrD5PNfS/GH9SAq0qW2E2/xCX8RvFCd/7e Ri2wYqGzeX5tIgdqMhmmPvxVhAaOOT7enLlnp53gpq23fSUt7c+5lRZymnYKUlz2
SMUqIrIPF29OTweJM32OiRemkcTHrGhogV5hOUR0Xn4mydKlsSywsodN69O/64+P XR2fiBP1ZS2H0iJvsZqnihOe7lEjVhzK5QVcenv+KCrph9x4wIZoAABONO/DnFwn
ED0zvKuOCsGZSRMPgIow9mC815sZv9LWSuZNVlXoGMQ7bEOmYrDMnUpNZ5RlRpnC /DKSlmbe1RpLLU0VFE2Ny9lmHAKGWPrYVV6XspXJRAsFs2wR8voizpyjgMkH/7h9
OeRsdjjSobBaPZFJiPoQ0bG71On6EqjPKwjr6Af70m7iYyFBwXKPEqi8IJBLoAIU XN96u3xdsAMAp5Kz9ZGpktcKVxYAHuvxOA/1qlXS419J9NCQzhHvLKBm0Pg0Hm0z
GgsiFSwDMDBhS4yDQf7SbUBGHUNd79q2zSK/nYLM6bYtMsN96CabCEOnYGdm+Bn0 ionVDtYXgTtWIvvtirRnlAX7jmRKUOR9xLiw8d95wv/2X1TN6hMNPcl1nrgzSbrY
7MQ8fwwARxV5Uik= 6O7m0xPEjKnsQis=
-----END CERTIFICATE----- -----END CERTIFICATE-----
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment