fix(kubernetes): surface dockerRegistries to credentials endpoint (#4134

)
spinnaker · Oct 29, 2019 · 94e13e5 · 94e13e5
1 parent 36a1efe
commit 94e13e5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/...ava/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesV2Credentials.java b/...ava/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesV2Credentials.java
@@ -35,6 +35,7 @@
 import com.netflix.spinnaker.clouddriver.kubernetes.config.CustomKubernetesResource;
 import com.netflix.spinnaker.clouddriver.kubernetes.config.KubernetesCachingPolicy;
 import com.netflix.spinnaker.clouddriver.kubernetes.config.KubernetesConfigurationProperties;
+import com.netflix.spinnaker.clouddriver.kubernetes.config.LinkedDockerRegistryConfiguration;
 import com.netflix.spinnaker.clouddriver.kubernetes.security.KubeconfigFileHasher;
 import com.netflix.spinnaker.clouddriver.kubernetes.security.KubernetesCredentialFactory;
 import com.netflix.spinnaker.clouddriver.kubernetes.security.KubernetesCredentials;
@@ -400,6 +401,11 @@ public Map<String, String> getSpinnakerKindMap() {
     return kindMap;
   }
 
+  @Override
+  public List<LinkedDockerRegistryConfiguration> getDockerRegistries() {
+    return Collections.emptyList();
+  }
+
   public KubernetesManifest get(KubernetesKind kind, String namespace, String name) {
     return runAndRecordMetrics(
         "get", kind, namespace, () -> jobExecutor.get(this, kind, namespace, name));

diff --git a/...ain/java/com/netflix/spinnaker/clouddriver/kubernetes/security/KubernetesCredentials.java b/...ain/java/com/netflix/spinnaker/clouddriver/kubernetes/security/KubernetesCredentials.java
@@ -17,11 +17,14 @@
 
 package com.netflix.spinnaker.clouddriver.kubernetes.security;
 
+import com.netflix.spinnaker.clouddriver.kubernetes.config.LinkedDockerRegistryConfiguration;
 import java.util.List;
 import java.util.Map;
 
 public interface KubernetesCredentials {
   List<String> getDeclaredNamespaces();
 
   Map<String, String> getSpinnakerKindMap();
+
+  List<LinkedDockerRegistryConfiguration> getDockerRegistries();
 }
diff --git a/.../netflix/spinnaker/clouddriver/kubernetes/security/KubernetesNamedAccountCredentials.java b/.../netflix/spinnaker/clouddriver/kubernetes/security/KubernetesNamedAccountCredentials.java
@@ -19,6 +19,7 @@
 import static lombok.EqualsAndHashCode.Include;
 
 import com.netflix.spinnaker.clouddriver.kubernetes.config.KubernetesConfigurationProperties.ManagedAccount;
+import com.netflix.spinnaker.clouddriver.kubernetes.config.LinkedDockerRegistryConfiguration;
 import com.netflix.spinnaker.clouddriver.security.AccountCredentials;
 import com.netflix.spinnaker.clouddriver.security.ProviderVersion;
 import com.netflix.spinnaker.fiat.model.resources.Permissions;
@@ -87,4 +88,8 @@ public List<String> getNamespaces() {
   public Map<String, String> getSpinnakerKindMap() {
     return credentials.getSpinnakerKindMap();
   }
+
+  public List<LinkedDockerRegistryConfiguration> getDockerRegistries() {
+    return credentials.getDockerRegistries();
+  }
 }