@spinnaker/google 2025.2.3 → 2025.4.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@spinnaker/google",
   "license": "Apache-2.0",
-  "version": "2025.2.3",
+  "version": "2025.4.0",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
   "publishConfig": {
@@ -41,5 +41,5 @@
     "shx": "0.3.3",
     "typescript": "5.0.4"
   },
-  "gitHead": "3d7358e1af26a8b81dfb7a4fc7774a05e30cbefc"
+  "gitHead": "5a87decae3d8b46a74bbc7fd579c1dff28e7bf99"
 }

package/src/loadBalancer/configure/common/healthCheck.component.html

@@ -22,7 +22,7 @@
         <select
           class="form-control input-sm"
           ng-change="$ctrl.onProtocolChange()"
-          ng-options="protocol as protocol for protocol in ['HTTP', 'HTTPS', 'TCP', 'SSL']"
+          ng-options="protocol as protocol for protocol in ['HTTP', 'HTTPS', 'TCP', 'SSL', 'HTTP2', 'GRPC']"
           ng-model="$ctrl.healthCheck.healthCheckType"
         ></select>
       </div>
@@ -75,7 +75,11 @@
 
     <div
       class="form-group"
-      ng-if="$ctrl.healthCheck.healthCheckType === 'HTTP' || $ctrl.healthCheck.healthCheckType === 'HTTPS'"
+      ng-if="
+        $ctrl.healthCheck.healthCheckType === 'HTTP' ||
+        $ctrl.healthCheck.healthCheckType === 'HTTPS' ||
+        $ctrl.healthCheck.healthCheckType === 'HTTP2'
+      "
     >
       <div class="col-md-4 sm-label-right">Request Path</div>
       <div class="col-md-4">
@@ -97,6 +101,17 @@
       </div>
     </div>
 
+    <div class="form-group" ng-if="$ctrl.healthCheck.healthCheckType === 'GRPC'">
+      <div class="col-md-4 sm-label-right">Service Name</div>
+      <div class="col-md-4">
+        <input
+          class="form-control input-sm"
+          ng-model="$ctrl.healthCheck.grpcServiceName"
+          placeholder="com.example.HealthService"
+        />
+      </div>
+    </div>
+
     <div class="form-group">
       <div class="col-md-4 sm-label-right">
         <b>Timeout</b><help-field key="loadBalancer.advancedSettings.healthTimeout"></help-field>

package/src/loadBalancer/configure/http/healthCheck/healthCheck.component.html

@@ -23,7 +23,7 @@
           class="form-control input-sm"
           ng-change="$ctrl.onProtocolChange()"
           ng-model="$ctrl.healthCheckType"
-          ng-options="protocol as protocol for protocol in ['HTTP', 'HTTPS', 'TCP', 'SSL']"
+          ng-options="protocol as protocol for protocol in ['HTTP', 'HTTPS', 'TCP', 'SSL', 'HTTP2', 'GRPC']"
         ></select>
       </div>
       <div class="col-md-2">
@@ -80,7 +80,11 @@
 
     <div
       class="form-group"
-      ng-if="$ctrl.healthCheck.healthCheckType === 'HTTP' || $ctrl.healthCheck.healthCheckType === 'HTTPS'"
+      ng-if="
+        $ctrl.healthCheck.healthCheckType === 'HTTP' ||
+        $ctrl.healthCheck.healthCheckType === 'HTTPS' ||
+        $ctrl.healthCheck.healthCheckType === 'HTTP2'
+      "
     >
       <div class="col-md-4 sm-label-right">Request Path</div>
       <div class="col-md-4">
@@ -102,6 +106,13 @@
       </div>
     </div>
 
+    <div class="form-group" ng-if="$ctrl.healthCheck.healthCheckType === 'GRPC'">
+      <div class="col-md-4 sm-label-right">Service Name</div>
+      <div class="col-md-4">
+        <input class="form-control input-sm" ng-model="$ctrl.healthCheck.grpcServiceName" />
+      </div>
+    </div>
+
     <div class="form-group">
       <div class="col-md-4 sm-label-right">
         <b>Timeout</b><help-field key="loadBalancer.advancedSettings.healthTimeout"></help-field>

package/src/loadBalancer/configure/network/createLoadBalancer.controller.spec.js

@@ -45,6 +45,12 @@ describe('Controller: gceCreateLoadBalancerCtrl', function () {
 
     loadBalancer.healthCheckProtocol = 'TCP';
     expect(this.ctrl.requiresHealthCheckPath()).toBe(false);
+
+    loadBalancer.healthCheckProtocol = 'HTTP2';
+    expect(this.ctrl.requiresHealthCheckPath()).toBe(true);
+
+    loadBalancer.healthCheckProtocol = 'GRPC';
+    expect(this.ctrl.requiresHealthCheckPath()).toBe(false);
   });
 
   it('should update name', function () {

package/src/serverGroup/configure/wizard/loadBalancingPolicy/loadBalancingPolicySelector.component.ts

@@ -57,8 +57,10 @@ class GceLoadBalancingPolicySelectorController implements IController {
 
       const hasSsl = selected.find((loadBalancer: any) => get(index[loadBalancer], 'loadBalancerType') === 'SSL');
       const hasTcp = selected.find((loadBalancer: any) => get(index[loadBalancer], 'loadBalancerType') === 'TCP');
-      const hasHttp = selected.find((loadBalancer: any) => get(index[loadBalancer], 'loadBalancerType') === 'HTTP');
-
+      const hasHttp =
+        selected.find((loadBalancer: any) => get(index[loadBalancer], 'loadBalancerType') === 'HTTP') ||
+        selected.find((loadBalancer: any) => get(index[loadBalancer], 'loadBalancerType') === 'HTTP2') ||
+        selected.find((loadBalancer: any) => get(index[loadBalancer], 'loadBalancerType') === 'GRPC');
       if ((hasSsl || hasTcp) && hasHttp) {
         balancingModes = ['UTILIZATION'];
       } else if (hasSsl || hasTcp) {
@@ -105,6 +107,8 @@ class GceLoadBalancingPolicySelectorController implements IController {
       switch (get(index[loadBalancer], 'loadBalancerType')) {
         case 'SSL':
         case 'TCP':
+        case 'GRPC':
+        case 'HTTP2':
         case 'HTTP': {
           const lbBackendServices: string[] = get(index[loadBalancer], 'backendServices');
           const filteredBackendServices = globalBackendServices.filter((service: IGceBackendService) =>