diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 615eb5239e9863fd10a74040af4f4dc7ae3e8bfe..7597316c317fd4d08add52f4021d82e177ed3cc2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,8 +29,8 @@ stages: *kube-auth script: - 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 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 cert --from-file=sp_cert.pem --dry-run -o yaml | kubectl apply -f - + - 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" - foo=$(eval echo \$"$foo") - mv $foo ./sp_key.pem diff --git a/mellon/beta/sp-metadata.xml b/mellon/beta/sp-metadata.xml index 97923b8f94fc7bafea1fdffb43b8e0e249a3a66f..6ce43c65c71c2d369565277fcc5c1e85b6843285 100644 --- a/mellon/beta/sp-metadata.xml +++ b/mellon/beta/sp-metadata.xml @@ -1,28 +1,28 @@ - + - MIIC2TCCAcECFCPc1QW6FyBut5NMmX35XtDXuM0pMA0GCSqGSIb3DQEBCwUAMCkx -JzAlBgNVBAMMHmNiaW9vZC1iZXRhLmVkaXJleC5pY3MubXVuaS5jejAeFw0xOTA3 -MzAxMzM1MTVaFw0yOTA3MjkxMzM1MTVaMCkxJzAlBgNVBAMMHmNiaW9vZC1iZXRh + MIIC2TCCAcECFBIHF8qnxco26wmPvh2BrP46lK/KMA0GCSqGSIb3DQEBCwUAMCkx +JzAlBgNVBAMMHmNiaW9vZC1iZXRhLmVkaXJleC5pY3MubXVuaS5jejAeFw0xOTA5 +MzAxMDEyMDVaFw0yOTA5MjkxMDEyMDVaMCkxJzAlBgNVBAMMHmNiaW9vZC1iZXRh LmVkaXJleC5pY3MubXVuaS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC -ggEBAKQOWyME51yq66v/oFPXg+fD5Aguajd2FYrFS6wmmNFYI7bjtYF0HAInJQ1G -KgBQQb5oMmKFOtV5mA99sfo8ePNBpKyT+klesq7jLCRHeVFBPobv2SO9NIT502qk -5nQdEEWV6fKVd1/unhH/SnyxPKXXrkdCSa7uVqYYtyr2TNG+DhmiW9MNYm9TyJS9 -mJvoj0BMO24o3q+qCtMzln1bn/zZSrlV8HNAQ1R0Lq3xMevagF94LRNEXG4BId3q -Q29DN4GaPcd04z055Bomo9e/MV+xkg+bvLZYPnpaYOch2Lxw52bbuMV9OtFBF+9W -pbQ9a3pnpCTSkbDnOuPbtuwvyqUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAmloT -ZHZRsNV9rGhCxTJo/Xj7dg72H9OTDVwB3j+90JnCgjVVxywTwZP8W8hovxI9oPCn -EV/qu3qCJ4C3O0t/lpydKy+qFsKPRynEPte/CJof+6H40US51T7xpnQ7HntLBgjh -XXNKOrtlm4hYUZ0rgHnF5lF+cWoj7d8Qt2o65kV0PvG81P8Lo9tvONB3Jd1z58Re -P1NcR/ZzwI0UEhH5ZJ2M3HuNC727H2xFZwKWlqSWABZjjWTaPWJ6qALWdZPF4S9H -7rDQK7ng275fQj4zIAr8Ps8FLrM/fEAwOngxzpw0IbY5NLhRLemjtzigag/88AiQ -ZMW5kI3cdinOEezFGA== +ggEBALExJ1733itsr/bXRyR/hCKcpA8gROzwCuy4owf9EqIap1OkCzFc0jIIlF8J +4oP9l0dxnYGExeJ+Gr9h+VytH9LT/ZS+QoA2ROUMa+DxNSgw3/wSNKWd5YxR3ZxB +5d4jWNpv5uHuhNyJFnSWBAlTGnMW5RwfS3rgAz7qe3veJzmWcfsRim443eHcJDq+ +VZcIhy6DoVWP2mKt777w7lqoeNbpF80+vBJCpxohFWAHO74mqel5uu6shyN5h87y +5sq5eneJNtHfTaG2pppuH398KoHE+dJ3vWMl1j6AUvZFLQhSZCdn934ez5Sbrlf/ +mmw1l/CCtUiR1E0DpAM1YIbOFPcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAH6Tm +nPj1FxoK96G3BGen6FIUikeIgYiKAFmIcaG2AuUURu2BOdqghaw+JB6y9Q8lytve +nXznHi+/B7NxfqqaroIKp265h9lHJdk07TXxqE4UBtUVzNUlSN7nXOyMIOVKxIwU +Vie4vDoVSQjrMNgaVUX5ORojLhajAPDMDL9qIZkBh6j2TL2ZXG1vvTkdPhDk5W1R +A6BVDQvZ42Rt/p2NAV0eChi3/TXBCLT6UlvrI/6q8Cn8xuDNz80360WqWjtl8zxi +whjqOes6NR/RJNUJAIaTnms5RleLCbslZkZc8hvbBYRLZOEBQz4MUNsoJ5E4ih/N +UfudjCDRfld7Ri/dlg== - - + + diff --git a/mellon/beta/sp_cert.pem b/mellon/beta/sp_cert.pem index 6920d8e182a58a28419eeee6b33951a44dbd332f..05011e4788ee1511030092cb7b18bc9efb8c79d8 100644 --- a/mellon/beta/sp_cert.pem +++ b/mellon/beta/sp_cert.pem @@ -1,18 +1,18 @@ -----BEGIN CERTIFICATE----- -MIIC2TCCAcECFCPc1QW6FyBut5NMmX35XtDXuM0pMA0GCSqGSIb3DQEBCwUAMCkx -JzAlBgNVBAMMHmNiaW9vZC1iZXRhLmVkaXJleC5pY3MubXVuaS5jejAeFw0xOTA3 -MzAxMzM1MTVaFw0yOTA3MjkxMzM1MTVaMCkxJzAlBgNVBAMMHmNiaW9vZC1iZXRh +MIIC2TCCAcECFBIHF8qnxco26wmPvh2BrP46lK/KMA0GCSqGSIb3DQEBCwUAMCkx +JzAlBgNVBAMMHmNiaW9vZC1iZXRhLmVkaXJleC5pY3MubXVuaS5jejAeFw0xOTA5 +MzAxMDEyMDVaFw0yOTA5MjkxMDEyMDVaMCkxJzAlBgNVBAMMHmNiaW9vZC1iZXRh LmVkaXJleC5pY3MubXVuaS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC -ggEBAKQOWyME51yq66v/oFPXg+fD5Aguajd2FYrFS6wmmNFYI7bjtYF0HAInJQ1G -KgBQQb5oMmKFOtV5mA99sfo8ePNBpKyT+klesq7jLCRHeVFBPobv2SO9NIT502qk -5nQdEEWV6fKVd1/unhH/SnyxPKXXrkdCSa7uVqYYtyr2TNG+DhmiW9MNYm9TyJS9 -mJvoj0BMO24o3q+qCtMzln1bn/zZSrlV8HNAQ1R0Lq3xMevagF94LRNEXG4BId3q -Q29DN4GaPcd04z055Bomo9e/MV+xkg+bvLZYPnpaYOch2Lxw52bbuMV9OtFBF+9W -pbQ9a3pnpCTSkbDnOuPbtuwvyqUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAmloT -ZHZRsNV9rGhCxTJo/Xj7dg72H9OTDVwB3j+90JnCgjVVxywTwZP8W8hovxI9oPCn -EV/qu3qCJ4C3O0t/lpydKy+qFsKPRynEPte/CJof+6H40US51T7xpnQ7HntLBgjh -XXNKOrtlm4hYUZ0rgHnF5lF+cWoj7d8Qt2o65kV0PvG81P8Lo9tvONB3Jd1z58Re -P1NcR/ZzwI0UEhH5ZJ2M3HuNC727H2xFZwKWlqSWABZjjWTaPWJ6qALWdZPF4S9H -7rDQK7ng275fQj4zIAr8Ps8FLrM/fEAwOngxzpw0IbY5NLhRLemjtzigag/88AiQ -ZMW5kI3cdinOEezFGA== +ggEBALExJ1733itsr/bXRyR/hCKcpA8gROzwCuy4owf9EqIap1OkCzFc0jIIlF8J +4oP9l0dxnYGExeJ+Gr9h+VytH9LT/ZS+QoA2ROUMa+DxNSgw3/wSNKWd5YxR3ZxB +5d4jWNpv5uHuhNyJFnSWBAlTGnMW5RwfS3rgAz7qe3veJzmWcfsRim443eHcJDq+ +VZcIhy6DoVWP2mKt777w7lqoeNbpF80+vBJCpxohFWAHO74mqel5uu6shyN5h87y +5sq5eneJNtHfTaG2pppuH398KoHE+dJ3vWMl1j6AUvZFLQhSZCdn934ez5Sbrlf/ +mmw1l/CCtUiR1E0DpAM1YIbOFPcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAH6Tm +nPj1FxoK96G3BGen6FIUikeIgYiKAFmIcaG2AuUURu2BOdqghaw+JB6y9Q8lytve +nXznHi+/B7NxfqqaroIKp265h9lHJdk07TXxqE4UBtUVzNUlSN7nXOyMIOVKxIwU +Vie4vDoVSQjrMNgaVUX5ORojLhajAPDMDL9qIZkBh6j2TL2ZXG1vvTkdPhDk5W1R +A6BVDQvZ42Rt/p2NAV0eChi3/TXBCLT6UlvrI/6q8Cn8xuDNz80360WqWjtl8zxi +whjqOes6NR/RJNUJAIaTnms5RleLCbslZkZc8hvbBYRLZOEBQz4MUNsoJ5E4ih/N +UfudjCDRfld7Ri/dlg== -----END CERTIFICATE----- diff --git a/mellon/dev/sp-metadata.xml b/mellon/dev/sp-metadata.xml index 8285b69f12489b8d8f76187bb7c95e06bd940c09..46cb635a13bc35aae94ceb05fa8b6f8eadf84e54 100644 --- a/mellon/dev/sp-metadata.xml +++ b/mellon/dev/sp-metadata.xml @@ -1,28 +1,28 @@ - + - MIIC1zCCAb8CFBvN2gTmRsKVXfbQcb+RJfOFWLbDMA0GCSqGSIb3DQEBCwUAMCgx -JjAkBgNVBAMMHWNiaW9vZC1kZXYuZWRpcmV4Lmljcy5tdW5pLmN6MB4XDTE5MDcz -MDEzMzUxNVoXDTI5MDcyOTEzMzUxNVowKDEmMCQGA1UEAwwdY2Jpb29kLWRldi5l + MIIC1zCCAb8CFB0s0VwaoWp89LK8Xurrlg2nNld0MA0GCSqGSIb3DQEBCwUAMCgx +JjAkBgNVBAMMHWNiaW9vZC1kZXYuZWRpcmV4Lmljcy5tdW5pLmN6MB4XDTE5MDkz +MDEwMTI0NVoXDTI5MDkyOTEwMTI0NVowKDEmMCQGA1UEAwwdY2Jpb29kLWRldi5l ZGlyZXguaWNzLm11bmkuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB -AQCyVwHV89XPE4Wv/v/Yne3Gi8WgFX8KiZXxAtzjVraIj6SbIBu4Q5J8Pq1PEco3 -QmaPigaXptLi8X6r/khBSn6Svds0viybT83SGxGlaFqozqduaTUWQX6uvJa+U+wD -Z8z+9/i8f+Nhdk6C9N9r00/n7ux7HjhGxys10Etzb3g2UBe+A44F5W1GCwMWfX/B -yA0jyCaWQcxjFH2YqJRosO7WpiN7vdhWS2F6hhlUZdheHO7yJnPZ8uESS7IZPTNU -7LCiSGa7bcCeNqORaOuWpSpA/DpfQlev1edtIiE3wahn4+or6z4N2gg70qKkkscn -kb/289gr2Xe9Bb4HQhDYOPvtAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAF1jyKu+ -Vo1aozslyJPxbk69brxqY7bwNJFNKBMrD5PNfS/GH9SAq0qW2E2/xCX8RvFCd/7e -SMUqIrIPF29OTweJM32OiRemkcTHrGhogV5hOUR0Xn4mydKlsSywsodN69O/64+P -ED0zvKuOCsGZSRMPgIow9mC815sZv9LWSuZNVlXoGMQ7bEOmYrDMnUpNZ5RlRpnC -OeRsdjjSobBaPZFJiPoQ0bG71On6EqjPKwjr6Af70m7iYyFBwXKPEqi8IJBLoAIU -GgsiFSwDMDBhS4yDQf7SbUBGHUNd79q2zSK/nYLM6bYtMsN96CabCEOnYGdm+Bn0 -7MQ8fwwARxV5Uik= +AQDrPGJJWGVSVbvbjaOyYdb6s1cRPg0ygZ9ksmgVVEYjwmyudua/poaPyrsvdhnO +8Ec8Zr5qUyb6sj9MNHDhkhd7vLbayyBcRUbjb4bFA3g7rv3zyz7Oa4CYDdBrh57/ +o74pLNNYWeP+h8u8F1QpI+oVHWcZQ/0/Vg2G6IExk/APPnQWWPQpHH5K4rq+tLTa +z1/fC/Y24YaoDhoq1UbBToXOK0mau95EiIpC3CQPgbjATwgF3KD/Ji6egzLwW+Mh +poADxt8XYQ+LVbRGCtm5gtPzcBGlx7tLnpAobJNZXQ3EPAgXlJ8tFhK2QLYu50qx +BQP68GhAzM5eT3vjG5uet4znAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAGjBIgyX +Ri2wYqGzeX5tIgdqMhmmPvxVhAaOOT7enLlnp53gpq23fSUt7c+5lRZymnYKUlz2 +XR2fiBP1ZS2H0iJvsZqnihOe7lEjVhzK5QVcenv+KCrph9x4wIZoAABONO/DnFwn +/DKSlmbe1RpLLU0VFE2Ny9lmHAKGWPrYVV6XspXJRAsFs2wR8voizpyjgMkH/7h9 +XN96u3xdsAMAp5Kz9ZGpktcKVxYAHuvxOA/1qlXS419J9NCQzhHvLKBm0Pg0Hm0z +ionVDtYXgTtWIvvtirRnlAX7jmRKUOR9xLiw8d95wv/2X1TN6hMNPcl1nrgzSbrY +6O7m0xPEjKnsQis= - - + + diff --git a/mellon/dev/sp_cert.pem b/mellon/dev/sp_cert.pem index 3fc958b944d8fbf984a83c53b2049e9ed141eb94..2b63287535fdc09041075708da26aedfa89f55b8 100644 --- a/mellon/dev/sp_cert.pem +++ b/mellon/dev/sp_cert.pem @@ -1,18 +1,18 @@ -----BEGIN CERTIFICATE----- -MIIC1zCCAb8CFBvN2gTmRsKVXfbQcb+RJfOFWLbDMA0GCSqGSIb3DQEBCwUAMCgx -JjAkBgNVBAMMHWNiaW9vZC1kZXYuZWRpcmV4Lmljcy5tdW5pLmN6MB4XDTE5MDcz -MDEzMzUxNVoXDTI5MDcyOTEzMzUxNVowKDEmMCQGA1UEAwwdY2Jpb29kLWRldi5l +MIIC1zCCAb8CFB0s0VwaoWp89LK8Xurrlg2nNld0MA0GCSqGSIb3DQEBCwUAMCgx +JjAkBgNVBAMMHWNiaW9vZC1kZXYuZWRpcmV4Lmljcy5tdW5pLmN6MB4XDTE5MDkz +MDEwMTI0NVoXDTI5MDkyOTEwMTI0NVowKDEmMCQGA1UEAwwdY2Jpb29kLWRldi5l ZGlyZXguaWNzLm11bmkuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB -AQCyVwHV89XPE4Wv/v/Yne3Gi8WgFX8KiZXxAtzjVraIj6SbIBu4Q5J8Pq1PEco3 -QmaPigaXptLi8X6r/khBSn6Svds0viybT83SGxGlaFqozqduaTUWQX6uvJa+U+wD -Z8z+9/i8f+Nhdk6C9N9r00/n7ux7HjhGxys10Etzb3g2UBe+A44F5W1GCwMWfX/B -yA0jyCaWQcxjFH2YqJRosO7WpiN7vdhWS2F6hhlUZdheHO7yJnPZ8uESS7IZPTNU -7LCiSGa7bcCeNqORaOuWpSpA/DpfQlev1edtIiE3wahn4+or6z4N2gg70qKkkscn -kb/289gr2Xe9Bb4HQhDYOPvtAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAF1jyKu+ -Vo1aozslyJPxbk69brxqY7bwNJFNKBMrD5PNfS/GH9SAq0qW2E2/xCX8RvFCd/7e -SMUqIrIPF29OTweJM32OiRemkcTHrGhogV5hOUR0Xn4mydKlsSywsodN69O/64+P -ED0zvKuOCsGZSRMPgIow9mC815sZv9LWSuZNVlXoGMQ7bEOmYrDMnUpNZ5RlRpnC -OeRsdjjSobBaPZFJiPoQ0bG71On6EqjPKwjr6Af70m7iYyFBwXKPEqi8IJBLoAIU -GgsiFSwDMDBhS4yDQf7SbUBGHUNd79q2zSK/nYLM6bYtMsN96CabCEOnYGdm+Bn0 -7MQ8fwwARxV5Uik= +AQDrPGJJWGVSVbvbjaOyYdb6s1cRPg0ygZ9ksmgVVEYjwmyudua/poaPyrsvdhnO +8Ec8Zr5qUyb6sj9MNHDhkhd7vLbayyBcRUbjb4bFA3g7rv3zyz7Oa4CYDdBrh57/ +o74pLNNYWeP+h8u8F1QpI+oVHWcZQ/0/Vg2G6IExk/APPnQWWPQpHH5K4rq+tLTa +z1/fC/Y24YaoDhoq1UbBToXOK0mau95EiIpC3CQPgbjATwgF3KD/Ji6egzLwW+Mh +poADxt8XYQ+LVbRGCtm5gtPzcBGlx7tLnpAobJNZXQ3EPAgXlJ8tFhK2QLYu50qx +BQP68GhAzM5eT3vjG5uet4znAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAGjBIgyX +Ri2wYqGzeX5tIgdqMhmmPvxVhAaOOT7enLlnp53gpq23fSUt7c+5lRZymnYKUlz2 +XR2fiBP1ZS2H0iJvsZqnihOe7lEjVhzK5QVcenv+KCrph9x4wIZoAABONO/DnFwn +/DKSlmbe1RpLLU0VFE2Ny9lmHAKGWPrYVV6XspXJRAsFs2wR8voizpyjgMkH/7h9 +XN96u3xdsAMAp5Kz9ZGpktcKVxYAHuvxOA/1qlXS419J9NCQzhHvLKBm0Pg0Hm0z +ionVDtYXgTtWIvvtirRnlAX7jmRKUOR9xLiw8d95wv/2X1TN6hMNPcl1nrgzSbrY +6O7m0xPEjKnsQis= -----END CERTIFICATE-----