Replace node controller with machine controller (#554)

kubermatic · Apr 15, 2018 · 49a2950 · 49a2950
1 parent eebee98
commit 49a2950
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 18 deletions.
diff --git a/src/app/cluster/cluster-details/cluster-secrets/cluster-secrets.component.html b/src/app/cluster/cluster-details/cluster-secrets/cluster-secrets.component.html
@@ -75,11 +75,11 @@
         </mat-card-content>
         <mat-card-content class="km-card-list-content" fxLayout >
           <div fxFlex="50%">
-            <strong>Node Controller</strong>
+            <strong>Machine Controller</strong>
           </div>
           <div fxFlex="50%">
-            <span [ngClass]="getIcon('nodeController')"></span>
-            {{ getStatus('nodeController') }}
+            <span [ngClass]="getIcon('machineController')"></span>
+            {{ getStatus('machineController') }}
           </div>
           <!-- <div class="clickable" fxFlex="33%">
             <span class="iconLogs"></span>
@@ -165,4 +165,4 @@
     </mat-expansion-panel-header>
   </mat-action-row>
 
-</mat-expansion-panel>
+</mat-expansion-panel>
diff --git a/src/app/cluster/cluster-details/cluster-secrets/cluster-secrets.component.ts b/src/app/cluster/cluster-details/cluster-secrets/cluster-secrets.component.ts
@@ -73,8 +73,8 @@ export class ClusterSecretsComponent implements OnInit {
           return this.getIconClass(this.cluster.status.health.etcd);
         case 'scheduler':
           return this.getIconClass(this.cluster.status.health.scheduler);
-        case 'nodeController':
-          return this.getIconClass(this.cluster.status.health.nodeController);
+        case 'machineController':
+          return this.getIconClass(this.cluster.status.health.machineController);
         default:
           return '';
       }
@@ -108,8 +108,8 @@ export class ClusterSecretsComponent implements OnInit {
           return this.getHealthStatus(this.cluster.status.health.etcd);
         case 'scheduler':
           return this.getHealthStatus(this.cluster.status.health.scheduler);
-        case 'nodeController':
-          return this.getHealthStatus(this.cluster.status.health.nodeController);
+        case 'machineController':
+          return this.getHealthStatus(this.cluster.status.health.machineController);
         default:
           return '';
       }

diff --git a/src/app/cluster/cluster-health-status/cluster-health-status.component.ts b/src/app/cluster/cluster-health-status/cluster-health-status.component.ts
@@ -17,9 +17,9 @@ export class ClusterHealthStatusComponent {
 
   public getHealthStatusColor(): string {
     if (this.health) {
-      if (this.health.apiserver && this.health.controller && this.health.etcd && this.health.scheduler && this.health.nodeController) {
+      if (this.health.apiserver && this.health.controller && this.health.etcd && this.health.scheduler && this.health.machineController) {
         return this.green;
-      } else if ((!this.health.apiserver || !this.health.controller || !this.health.etcd || !this.health.scheduler || !this.health.nodeController) && this.phase === 'Failed') {
+      } else if ((!this.health.apiserver || !this.health.controller || !this.health.etcd || !this.health.scheduler || !this.health.machineController) && this.phase === 'Failed') {
         return this.red;
       } else {
         return this.orange;

diff --git a/src/app/cluster/cluster-list/cluster-item/cluster-item.component.ts b/src/app/cluster/cluster-list/cluster-item/cluster-item.component.ts
@@ -48,7 +48,7 @@ export class ClusterItemComponent implements OnInit, OnDestroy {
   public statusRunning(): boolean {
     if (this.cluster.status.phase === 'Running') {
       if (this.health) {
-        if (!this.health.apiserver || !this.health.controller || !this.health.etcd || !this.health.nodeController || !this.health.scheduler) {
+        if (!this.health.apiserver || !this.health.controller || !this.health.etcd || !this.health.machineController || !this.health.scheduler) {
           return false;
         } else {
           return true;
@@ -74,7 +74,7 @@ export class ClusterItemComponent implements OnInit, OnDestroy {
       return true;
     } else {
       if (this.health) {
-        if ((!this.health.apiserver || !this.health.controller || !this.health.etcd || !this.health.nodeController || !this.health.scheduler) && this.cluster.status.phase === 'Running') {
+        if ((!this.health.apiserver || !this.health.controller || !this.health.etcd || !this.health.machineController || !this.health.scheduler) && this.cluster.status.phase === 'Running') {
           return true;
         } else {
           return false;

diff --git a/src/app/shared/entity/ClusterEntity.ts b/src/app/shared/entity/ClusterEntity.ts
@@ -142,7 +142,6 @@ export class Health {
   controller: boolean;
   etcd: boolean;
   machineController: boolean;
-  nodeController: boolean;
   scheduler: boolean;
   lastTransitionTime: string;
 }

diff --git a/src/app/testing/fake-data/cluster.fake.ts b/src/app/testing/fake-data/cluster.fake.ts
@@ -58,7 +58,6 @@ export const fakeDigitaloceanCluster: ClusterEntity = {
       apiserver: true,
       scheduler: true,
       controller: true,
-      nodeController: true,
       machineController: true,
       etcd: true,
       lastTransitionTime: '2018-01-15T07:43:57Z'
@@ -125,7 +124,6 @@ export const fakeHetznerCluster: ClusterEntity = {
       apiserver: true,
       scheduler: true,
       controller: true,
-      nodeController: true,
       machineController: true,
       etcd: true,
       lastTransitionTime: '2018-01-15T07:43:57Z'
@@ -193,7 +191,6 @@ export const fakeVSphereCluster: ClusterEntity = {
       apiserver: true,
       scheduler: true,
       controller: true,
-      nodeController: true,
       machineController: true,
       etcd: true,
       lastTransitionTime: '2018-01-15T07:43:57Z'
@@ -263,7 +260,6 @@ export const fakeAWSCluster: ClusterEntity = {
       apiserver: true,
       scheduler: true,
       controller: true,
-      nodeController: true,
       machineController: true,
       etcd: true,
       lastTransitionTime: '2018-01-15T07:43:57Z'
@@ -333,7 +329,6 @@ export const fakeOpenstackCluster: ClusterEntity = {
       apiserver: true,
       scheduler: true,
       controller: true,
-      nodeController: true,
       machineController: true,
       etcd: true,
       lastTransitionTime: '2018-01-15T07:43:57Z'