update expression as previous one causing install fails

Author: miyadav

Diff for: pkg/cloud/azure/assets/validating-admission-service-annotation-policy.yaml

@@ -10,15 +10,5 @@ spec:
         operations: ["CREATE", "UPDATE"]
         resources: ["services"]
   validations:
-    - expression: |
-        !('service.beta.kubernetes.io/azure-load-balancer-tcp-idle-timeout' in object.metadata.annotations) ||
-        (
-          object.metadata.annotations['service.beta.kubernetes.io/azure-load-balancer-tcp-idle-timeout'].matches('^[0-9]+$') &&
-          int(object.metadata.annotations['service.beta.kubernetes.io/azure-load-balancer-tcp-idle-timeout']) >= 4 &&
-          int(object.metadata.annotations['service.beta.kubernetes.io/azure-load-balancer-tcp-idle-timeout']) <= 100
-        ) ||
-        (
-          oldObject != null &&
-          oldObject.metadata.annotations['service.beta.kubernetes.io/azure-load-balancer-tcp-idle-timeout'] == object.metadata.annotations['service.beta.kubernetes.io/azure-load-balancer-tcp-idle-timeout']
-        )
+    - expression: ! (object.metadata?.annotations?.contains('service.beta.kubernetes.io/azure-load-balancer-tcp-idle-timeout') && (!object.metadata.annotations['service.beta.kubernetes.io/azure-load-balancer-tcp-idle-timeout'].matches('^[0-9]+$') || int(object.metadata.annotations['service.beta.kubernetes.io/azure-load-balancer-tcp-idle-timeout']) <= 4 || int(object.metadata.annotations['service.beta.kubernetes.io/azure-load-balancer-tcp-idle-timeout']) >= 100) || (oldObject != null && oldObject.metadata?.annotations?.contains('service.beta.kubernetes.io/azure-load-balancer-tcp-idle-timeout') && oldObject.metadata.annotations['service.beta.kubernetes.io/azure-load-balancer-tcp-idle-timeout'] != object.metadata.annotations['service.beta.kubernetes.io/azure-load-balancer-tcp-idle-timeout']))
       message: "The annotation 'service.beta.kubernetes.io/azure-load-balancer-tcp-idle-timeout', if specified, must have a value between 4 and 100. Changes to an invalid value are not allowed."

Diff for: pkg/cloud/gcp/assets/validating-admission-policy.yaml

@@ -10,13 +10,5 @@ spec:
         operations: ["CREATE", "UPDATE"]
         resources: ["services"]
   validations:
-    - expression: "!(
-                     has(object.metadata.annotations['cloud.google.com/network-tier']) &&
-                     !(object.metadata.annotations['cloud.google.com/network-tier'] in ['Standard', 'Premium']) &&
-                     (
-                       oldObject == null || 
-                       !has(oldObject.metadata.annotations['cloud.google.com/network-tier']) || 
-                       oldObject.metadata.annotations['cloud.google.com/network-tier'] != object.metadata.annotations['cloud.google.com/network-tier']
-                     )
-                   )"
+    - expression: ! (object.metadata?.annotations?.contains('cloud.google.com/network-tier') &&!(object.metadata.annotations['cloud.google.com/network-tier'] == 'Standard' || object.metadata.annotations['cloud.google.com/network-tier'] == 'Premium') && ( oldObject == null || !(oldObject.metadata?.annotations?.contains('cloud.google.com/network-tier')) || oldObject.metadata.annotations['cloud.google.com/network-tier'] != object.metadata.annotations['cloud.google.com/network-tier']))
       message: "The annotation 'cloud.google.com/network-tier', if specified, must be either 'Standard' or 'Premium', and changes to invalid values are not allowed."