diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2022-06-09 10:24:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-09 10:24:42 +0200 |
| commit | 482e1ea949ac42b4af09e07fbc05280eb6d76d42 (patch) | |
| tree | 7a1beebba219b8f40d6fb72f1840950b7a7c28dc /controller-server | |
| parent | 0b2eb336d1d0376a55ee495ee91a50edd283a580 (diff) | |
| parent | 51a1192f8e8577effa957f6f0d45f37c81206414 (diff) | |
Merge pull request #22983 from vespa-engine/andreer/fix-gcp-cert-name
fix gcp cert name
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificates.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificates.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificates.java index 270cfba00c0..33aeda5e011 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificates.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificates.java @@ -67,12 +67,12 @@ public class EndpointCertificates { if(metadata.isPresent()) { var m = metadata.get(); GcpSecretStore gcpSecretStore = controller.serviceRegistry().gcpSecretStore(); - String mangledCertName = "endpointCert_" + m.certName().replace('.', '_'); // Google cloud does not accept dots in secrets, but they accept underscores - String mangledKeyName = "endpointCert_" + m.keyName().replace('.', '_'); // Google cloud does not accept dots in secrets, but they accept underscores + String mangledCertName = "endpointCert_" + m.certName().replace('.', '_') + "-v" + m.version(); // Google cloud does not accept dots in secrets, but they accept underscores + String mangledKeyName = "endpointCert_" + m.keyName().replace('.', '_') + "-v" + m.version(); // Google cloud does not accept dots in secrets, but they accept underscores if (gcpSecretStore.getSecret(mangledCertName, m.version()) == null) - gcpSecretStore.createSecret(mangledCertName + "-v" + m.version(), controller.secretStore().getSecret(m.certName(), m.version())); + gcpSecretStore.createSecret(mangledCertName, controller.secretStore().getSecret(m.certName(), m.version())); if (gcpSecretStore.getSecret(mangledKeyName, m.version()) == null) - gcpSecretStore.createSecret(mangledKeyName + "-v" + m.version(), controller.secretStore().getSecret(m.keyName(), m.version())); + gcpSecretStore.createSecret(mangledKeyName, controller.secretStore().getSecret(m.keyName(), m.version())); return Optional.of(m.withVersion(1).withKeyName(mangledKeyName).withCertName(mangledCertName)); } |