diff options
| author | Ola Aunrønning <olaa@yahooinc.com> | 2023-04-26 09:57:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-26 09:57:56 +0200 |
| commit | 5f9d7d50216da4850c793a2a63f8da7eefb55056 (patch) | |
| tree | b41007ada3c803cc3282cc0556acbb13f3642e6a /config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | |
| parent | 9a4376dae10e986c7061633e5a02f18c24a951da (diff) | |
| parent | 48b7ffe757ffa25bc3ca1eeaab8153db30623fa3 (diff) | |
Merge pull request #26805 from vespa-engine/olaa/versioned-feature-flag
Write tenant service identity at same location as AthenzCredentialsService
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index 36d34b99223..f74c218a906 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -1,6 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.model.container.xml; +import com.yahoo.component.ComponentId; import com.yahoo.config.provision.ClusterInfo; import com.yahoo.config.provision.IntRange; import com.yahoo.component.ComponentSpecification; @@ -1169,6 +1170,9 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { ztsUrl, zoneDnsSuffix, zone); + + // Replace AthenzIdentityProviderProvider + cluster.removeComponent(ComponentId.fromString("com.yahoo.container.jdisc.AthenzIdentityProviderProvider")); cluster.addComponent(identityProvider); cluster.getContainers().forEach(container -> { |