feat(kubernetes): makes internal DNS name configurable (#3495)

spinnaker · Apr 7, 2017 · 4ea7290 · 4ea7290
1 parent bbb6933
commit 4ea7290
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/app/scripts/modules/kubernetes/kubernetes.settings.ts b/app/scripts/modules/kubernetes/kubernetes.settings.ts
@@ -5,6 +5,7 @@ export interface IKubernetesProviderSettings extends IProviderSettings {
     account?: string;
     namespace?: string;
     proxy?: string;
+    internalDNSNameTemplate?: string;
   };
 }
 

diff --git a/app/scripts/modules/kubernetes/loadBalancer/details/details.controller.js b/app/scripts/modules/kubernetes/loadBalancer/details/details.controller.js
@@ -3,6 +3,7 @@
 import {ACCOUNT_SERVICE} from 'core/account/account.service';
 import {CONFIRMATION_MODAL_SERVICE} from 'core/confirmationModal/confirmationModal.service';
 import {LOAD_BALANCER_WRITE_SERVICE} from 'core/loadBalancer/loadBalancer.write.service';
+import {KubernetesProviderSettings} from 'kubernetes/kubernetes.settings';
 
 let angular = require('angular');
 import _ from 'lodash';
@@ -14,7 +15,7 @@ module.exports = angular.module('spinnaker.loadBalancer.kubernetes.details.contr
   LOAD_BALANCER_WRITE_SERVICE,
   require('core/utils/selectOnDblClick.directive.js'),
 ])
-  .controller('kubernetesLoadBalancerDetailsController', function ($scope, $state, $uibModal, loadBalancer, app,
+  .controller('kubernetesLoadBalancerDetailsController', function ($interpolate, $scope, $state, $uibModal, loadBalancer, app,
                                                                    confirmationModalService, accountService, loadBalancerWriter,
                                                                    kubernetesProxyUiService) {
 
@@ -38,6 +39,9 @@ module.exports = angular.module('spinnaker.loadBalancer.kubernetes.details.contr
             if (_.get($scope.loadBalancer, 'service.spec.ports', []).some(p => p.port === 443)) {
               this.ingressProtocol = 'https:';
             }
+            this.internalDNSName = $interpolate(
+              KubernetesProviderSettings.defaults.internalDNSNameTemplate || '{{name}}.{{namespace}}.svc.cluster.local'
+            )($scope.loadBalancer);
             $scope.state.loading = false;
           } else {
             autoClose();

diff --git a/app/scripts/modules/kubernetes/loadBalancer/details/details.html b/app/scripts/modules/kubernetes/loadBalancer/details/details.html
@@ -80,10 +80,10 @@ <h3 select-on-dbl-click>
       <dl>
         <dt>Internal DNS Name</dt>
         <dd>
-        {{loadBalancer.name}}.{{loadBalancer.namespace}}.svc.cluster.local
+        {{ctrl.internalDNSName}}
           <copy-to-clipboard
               class="copy-to-clipboard copy-to-clipboard-sm"
-              text="{{loadBalancer.name}}.{{loadBalancer.namespace}}.svc.cluster.local"
+              text="{{ctrl.internalDNSName}}"
               tool-tip="Copy Internal DNS Name to clipboard">
           </copy-to-clipboard>
         </dd>

diff --git a/halconfig/settings.js b/halconfig/settings.js
@@ -21,7 +21,8 @@ var kubernetes = {
   defaults: {
     account: '{%kubernetes.default.account%}',
     namespace: '{%kubernetes.default.namespace%}',
-    proxy: '{%kubernetes.default.proxy%}'
+    proxy: '{%kubernetes.default.proxy%}',
+    internalDNSNameTemplate: '{{name}}.{{namespace}}.svc.cluster.local',
   }
 };
 var appengine = {

diff --git a/settings.js b/settings.js
@@ -68,7 +68,8 @@ window.spinnakerSettings = {
       defaults: {
         account: 'my-kubernetes-account',
         namespace: 'default',
-        proxy: 'localhost:8001'
+        proxy: 'localhost:8001',
+        internalDNSNameTemplate: '{{name}}.{{namespace}}.svc.cluster.local',
       },
     },
     appengine: {