Merge pull request #52 from apigee/feat/1.14.0

Feat/1.14.0
apigee · Dec 18, 2024 · 5d82037 · 5d82037
2 parents 651e749 + 7250f53
commit 5d82037
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 43 deletions.
diff --git a/playbook.yaml b/playbook.yaml
@@ -35,15 +35,14 @@
     - { role: bootstrap-apigee-crds, tags: ['bootstrap-apigee-crds'] }
     - { role: apigee-hybrid-overrides, tags: ['generate-overrides'] }
     - { role: apigee-custom-sc, vars: { storageClassName: '{{ overrides.cassandra.storage.storageClass }}', storageClassType: '{{ overrides.cassandra.storage.storageClassProperties.provisionerType }}', scParameters: '{{ overrides.cassandra.storage.storageClassProperties.parameters }}' }, tags: ['create-custom-sc'] }
-    - { role: helm-ops, vars: { release_name: 'operator', chart_ref: 'apigee-operator', release_namespace: 'apigee-system', create_namespace: true}, tags: ['ao'] }
-    - { role: wait-for-k8s-resource, vars: { k8s_api_version: v1, k8s_kind: Deployment, k8s_namespace: apigee-system, k8s_resource_name: apigee-controller-manager}, tags: ['ao', 'wait_ao'] }
+    - { role: helm-ops, vars: { release_name: 'operator', chart_ref: 'apigee-operator', release_namespace: 'apigee', create_namespace: true}, tags: ['ao'] }
+    - { role: wait-for-k8s-resource, vars: { k8s_api_version: v1, k8s_kind: Deployment, k8s_namespace: apigee, k8s_resource_name: apigee-controller-manager}, tags: ['ao', 'wait_ao'] }
     - { role: helm-ops, vars: { release_name: 'datastore', chart_ref: 'apigee-datastore'}, tags: ['ds', 'apigeeds'] }
     - { role: wait-for-k8s-resource, vars: { k8s_api_version: apps/v1, k8s_kind: StatefulSet, k8s_namespace: apigee, k8s_resource_name: apigee-cassandra-default }, tags: ['ds', 'apigeeds', 'wait_ds'] }
     - { role: helm-ops, vars: { release_name: 'telemetry', chart_ref: 'apigee-telemetry' }, tags: ['at', 'apigeetelem'] }
     - { role: wait-for-k8s-resource, vars: { k8s_api_version: apigee.cloud.google.com/v1alpha2, k8s_kind: ApigeeTelemetry, k8s_namespace: apigee, k8s_resource_name: apigee-telemetry }, tags: ['at', 'apigeetelem', 'wait_at'] }
     - { role: wait-for-k8s-resource, vars: { k8s_api_version: apps/v1, k8s_kind: ReplicaSet, k8s_namespace: apigee, k8s_resource_name: null, label_selectors: ["com.apigee.apigeedeployment=apigee-metrics-adapter-apigee-telemetry"] }, tags: ['at', 'apigeetelem', 'wait_at'] }
     - { role: wait-for-k8s-resource, vars: { k8s_api_version: apps/v1, k8s_kind: ReplicaSet, k8s_namespace: apigee, k8s_resource_name: null, label_selectors: ["com.apigee.apigeedeployment=apigee-metrics-apigee-telemetry-app"] }, tags: ['at', 'apigeetelem', 'wait_at'] }
-    - { role: wait-for-k8s-resource, vars: { k8s_api_version: apps/v1, k8s_kind: ReplicaSet, k8s_namespace: apigee, k8s_resource_name: null, label_selectors: ["com.apigee.apigeedeployment=apigee-metrics-apigee-telemetry-proxy"] }, tags: ['at', 'apigeetelem', 'wait_at'] }
     - { role: helm-ops, vars: { release_name: 'redis', chart_ref: 'apigee-redis' }, tags: ['apigeeredis'] }
     - { role: wait-for-k8s-resource, vars: { k8s_api_version: apps/v1, k8s_kind: StatefulSet, k8s_namespace: apigee, k8s_resource_name: apigee-redis-default }, tags: ['apigeeredis', 'wait_apigeeredis'] }
     - { role: helm-ops, vars: { release_name: 'ingress-manager', chart_ref: 'apigee-ingress-manager' }, tags: ['apigeeingress'] }
@@ -82,6 +81,8 @@
         set_values:
           - value: "envgroup={{ item.name }}"
             value_type: string
+          - value: "apigeeChainingGateway.name={{ item.name }}"
+            value_type: string
       loop: "{{ overrides.virtualhosts }}"
       tags: ['apigee-virtualhost']
 
@@ -126,15 +127,14 @@
     - { role: get-cassandra-seed, vars: { kubeconfig: "{{ kubeconfigs.primary }}" }, tags: ['cass-seed'] }
     - { role: apigee-hybrid-overrides, vars: { cassandra_seed_host: "{{ cassandra_seed_data }}"}, tags: ['generate-overrides'] }
     - { role: apigee-custom-sc, vars: { storageClassName: '{{ overrides.cassandra.storage.storageClass }}', storageClassType: '{{ overrides.cassandra.storage.storageClassProperties.provisionerType }}', scParameters: '{{ overrides.cassandra.storage.storageClassProperties.parameters }}' }, tags: ['create-custom-sc'] }
-    - { role: helm-ops, vars: { release_name: 'operator', chart_ref: 'apigee-operator', release_namespace: 'apigee-system', create_namespace: true}, tags: ['ao'] }
-    - { role: wait-for-k8s-resource, vars: { k8s_api_version: v1, k8s_kind: Deployment, k8s_namespace: apigee-system, k8s_resource_name: apigee-controller-manager}, tags: ['ao', 'wait_ao'] }
+    - { role: helm-ops, vars: { release_name: 'operator', chart_ref: 'apigee-operator', release_namespace: 'apigee', create_namespace: true}, tags: ['ao'] }
+    - { role: wait-for-k8s-resource, vars: { k8s_api_version: v1, k8s_kind: Deployment, k8s_namespace: apigee, k8s_resource_name: apigee-controller-manager}, tags: ['ao', 'wait_ao'] }
     - { role: helm-ops, vars: { release_name: 'datastore', chart_ref: 'apigee-datastore'}, tags: ['ds', 'apigeeds'] }
     - { role: wait-for-k8s-resource, vars: { k8s_api_version: apps/v1, k8s_kind: StatefulSet, k8s_namespace: apigee, k8s_resource_name: apigee-cassandra-default }, tags: ['ds', 'apigeeds', 'wait_ds'] }
     - { role: helm-ops, vars: { release_name: 'telemetry', chart_ref: 'apigee-telemetry' }, tags: ['at', 'apigeetelem'] }
     - { role: wait-for-k8s-resource, vars: { k8s_api_version: apigee.cloud.google.com/v1alpha2, k8s_kind: ApigeeTelemetry, k8s_namespace: apigee, k8s_resource_name: apigee-telemetry }, tags: ['at', 'apigeetelem', 'wait_at'] }
     - { role: wait-for-k8s-resource, vars: { k8s_api_version: apps/v1, k8s_kind: ReplicaSet, k8s_namespace: apigee, k8s_resource_name: null, label_selectors: ["com.apigee.apigeedeployment=apigee-metrics-adapter-apigee-telemetry"] }, tags: ['at', 'apigeetelem', 'wait_at'] }
     - { role: wait-for-k8s-resource, vars: { k8s_api_version: apps/v1, k8s_kind: ReplicaSet, k8s_namespace: apigee, k8s_resource_name: null, label_selectors: ["com.apigee.apigeedeployment=apigee-metrics-apigee-telemetry-app"] }, tags: ['at', 'apigeetelem', 'wait_at'] }
-    - { role: wait-for-k8s-resource, vars: { k8s_api_version: apps/v1, k8s_kind: ReplicaSet, k8s_namespace: apigee, k8s_resource_name: null, label_selectors: ["com.apigee.apigeedeployment=apigee-metrics-apigee-telemetry-proxy"] }, tags: ['at', 'apigeetelem', 'wait_at'] }
     - { role: helm-ops, vars: { release_name: 'redis', chart_ref: 'apigee-redis' }, tags: ['apigeeredis'] }
     - { role: wait-for-k8s-resource, vars: { k8s_api_version: apps/v1, k8s_kind: StatefulSet, k8s_namespace: apigee, k8s_resource_name: apigee-redis-default }, tags: ['apigeeredis', 'wait_apigeeredis'] }
     - { role: helm-ops, vars: { release_name: 'ingress-manager', chart_ref: 'apigee-ingress-manager' }, tags: ['apigeeingress'] }
@@ -172,6 +172,8 @@
         set_values:
           - value: "envgroup={{ item.name }}"
             value_type: string
+          - value: "apigeeChainingGateway.name={{ item.name }}"
+            value_type: string
       loop: "{{ overrides.virtualhosts }}"
       tags: ['apigee-virtualhost']
 

diff --git a/roles/apigee-hybrid-overrides/templates/overrides.yaml.j2 b/roles/apigee-hybrid-overrides/templates/overrides.yaml.j2
@@ -14,6 +14,7 @@ k8sCluster:
   region: "{{ overrides.k8sCluster.region }}"
 
 instanceID: "{{ overrides.instanceID }}"
+enhanceProxyLimits: "{{ overrides.enhanceProxyLimits }}"
 contractProvider: "{{ overrides.contractProvider}}"
 
 {% if overrides.imagePullSecrets -%}

diff --git a/roles/get-cassandra-seed/tasks/main.yml b/roles/get-cassandra-seed/tasks/main.yml
@@ -23,9 +23,9 @@
     kubeconfig: "{{ kubeconfig }}"
   register: cassandra_data
 
-- name: Example using fail and when together
+- name: Fail when no cassandra pods are found
   fail:
-    msg: "No Cassandra Pods  with label app=apigee-cassandra found in apigee namespace "
+    msg: "No cassandra pods  with label app=apigee-cassandra found in apigee namespace "
   when: "cassandra_data.resources| length == 0"
 
 - set_fact:

diff --git a/roles/validate-input/files/input.schema.json b/roles/validate-input/files/input.schema.json
@@ -1322,7 +1322,7 @@
           },
           "required": ["image", "resources", "accessLogFile", "accessLogFormat"]
         },
-        "ingressGateway": {
+        "apigeeIngressGateway": {
           "type": "object",
           "properties": {
             "image": {
@@ -1396,7 +1396,7 @@
         "ao",
         "kubeRBACProxy",
         "istiod",
-        "ingressGateway"
+        "apigeeIngressGateway"
       ]
     }
   },

diff --git a/test/terraform/runtime-plane-gke/terraform.tfvars b/test/terraform/runtime-plane-gke/terraform.tfvars
@@ -22,8 +22,8 @@ subnetwork             = "default"
 ip_range_pods          = "pods"
 ip_range_services      = "svc"
 service_account_name   = "apigee-gke-svc-account"
-kubernetes_version     = "1.28.9-gke.1069000"
-master_ipv4_cidr_block = "10.220.0.0/28"
+kubernetes_version     = "1.30.5-gke.1443001"
+master_ipv4_cidr_block = "10.127.0.0/28"
 master_authorized_networks = [
   { cidr_block = "10.132.0.0/20", display_name = "europe-west1-subnet" },
   { cidr_block = "172.17.0.0/16", display_name = "docker-gh-runner" },

diff --git a/vars/test.yaml b/vars/test.yaml
@@ -51,7 +51,7 @@ synchronizer_prod_svc_account: apigee-synchronizer
 # refer: https://cloud.google.com/apigee/docs/hybrid/preview/helm-install#pull-apigee-helm-charts
 
 helm_chart_repo: oci://us-docker.pkg.dev/apigee-release/apigee-hybrid-helm-charts
-helm_chart_version: 1.12.1
+helm_chart_version: 1.14.0
 helm_charts:
   - apigee-operator
   - apigee-datastore
@@ -106,6 +106,7 @@ overrides:
     projectID: _GCP_PROJECT_ID_
   revision: "1103"
   instanceID: "wwwwxxxxyyyyzzzz"
+  enhanceProxyLimits: "true"
   contractProvider: https://apigee.googleapis.com
   #
   # For Telemetry support for Multi-Org cluster. The feature is disabled by default.
@@ -175,7 +176,7 @@ overrides:
     replicaCountMax: 2
     image:
       url: "gcr.io/apigee-release/hybrid/apigee-mart-server"
-      tag: "1.12.1"
+      tag: "1.14.0"
       pullPolicy: IfNotPresent
     resources:
       requests:
@@ -185,7 +186,7 @@ overrides:
   mintTaskScheduler:
     image:
       url: "gcr.io/apigee-release/hybrid/apigee-mint-task-scheduler"
-      tag: "1.12.1"
+      tag: "1.14.0"
       pullPolicy: IfNotPresent
     resources:
       requests:
@@ -200,7 +201,7 @@ overrides:
     serviceAccountRef: apigee-hybrid-secret
     image:
       url: "gcr.io/apigee-release/hybrid/apigee-synchronizer"
-      tag: "1.12.1"
+      tag: "1.14.0"
       pullPolicy: IfNotPresent
     resources:
       requests:
@@ -215,7 +216,7 @@ overrides:
     replicaCountMax: 4
     image:
       url: "gcr.io/apigee-release/hybrid/apigee-runtime"
-      tag: "1.12.1"
+      tag: "1.14.0"
       pullPolicy: IfNotPresent
     resources:
       requests:
@@ -230,7 +231,7 @@ overrides:
       secret: ""
       image:
         url: "gcr.io/apigee-release/hybrid/apigee-hybrid-cassandra-client"
-        tag: "1.12.1"
+        tag: "1.14.0"
         pullPolicy: IfNotPresent
     replicaCount: 3
     # multiRegionSeedHost:
@@ -243,7 +244,7 @@ overrides:
       capacity: 10Gi
     image:
       url: "gcr.io/apigee-release/hybrid/apigee-hybrid-cassandra"
-      tag: "1.12.1"
+      tag: "1.14.0"
       pullPolicy: IfNotPresent
     resources:
       requests:
@@ -256,7 +257,7 @@ overrides:
       enabled: false
       image:
         url: "gcr.io/apigee-release/hybrid/apigee-cassandra-backup-utility"
-        tag: "1.12.1"
+        tag: "1.14.0"
         pullPolicy: IfNotPresent
       serviceAccountRef: apigee-hybrid-secret
       schedule: "0 2 * * *"
@@ -266,7 +267,7 @@ overrides:
       snapshotTimestamp:
       image:
         url: "gcr.io/apigee-release/hybrid/apigee-cassandra-backup-utility"
-        tag: "1.12.1"
+        tag: "1.14.0"
         pullPolicy: IfNotPresent
       serviceAccountRef: apigee-hybrid-secret
       dbStorageBucket: ""
@@ -279,7 +280,7 @@ overrides:
     replicaCountMax: 4
     image:
       url: "gcr.io/apigee-release/hybrid/apigee-udca"
-      tag: "1.12.1"
+      tag: "1.14.0"
       pullPolicy: IfNotPresent
     resources:
       requests:
@@ -361,7 +362,7 @@ overrides:
     serviceAccountRef: apigee-hybrid-secret
     image:
       url: "gcr.io/apigee-release/hybrid/apigee-connect-agent"
-      tag: "1.12.1"
+      tag: "1.14.0"
       pullPolicy: IfNotPresent
     replicaCountMin: 1
     replicaCountMax: 1
@@ -374,7 +375,7 @@ overrides:
     serviceAccountRef: apigee-hybrid-secret
     image:
       url: "gcr.io/apigee-release/hybrid/apigee-watcher"
-      tag: "1.12.1"
+      tag: "1.14.0"
       pullPolicy: IfNotPresent
     replicaCountMin: 1
     replicaCountMax: 1
@@ -386,7 +387,7 @@ overrides:
   redis:
     image:
       url: "gcr.io/apigee-release/hybrid/apigee-redis"
-      tag: "1.12.1"
+      tag: "1.14.0"
       pullPolicy: IfNotPresent
     replicaCount: 2
     resources:
@@ -406,7 +407,7 @@ overrides:
   ao:
     image:
       url: "gcr.io/apigee-release/hybrid/apigee-operators"
-      tag: "1.12.1"
+      tag: "1.14.0"
       pullPolicy: IfNotPresent
     resources:
       limits:
@@ -418,7 +419,7 @@ overrides:
     installer:
       image:
         url: "gcr.io/apigee-release/hybrid/apigee-installer"
-        tag: "1.12.1"
+        tag: "1.14.0"
         pullPolicy: IfNotPresent
   # kube rbac proxy
   kubeRBACProxy:
@@ -443,7 +444,7 @@ overrides:
     accessLogFile: '/dev/stdout'
     accessLogFormat: '{"start_time":"%START_TIME%","remote_address":"%DOWNSTREAM_DIRECT_REMOTE_ADDRESS%","user_agent":"%REQ(USER-AGENT)%","host":"%REQ(:AUTHORITY)%","request":"%REQ(:METHOD)% %REQ(X-ENVOY-ORIGINAL-PATH?:PATH)% %PROTOCOL%","request_time":"%DURATION%","status":"%RESPONSE_CODE%","status_details":"%RESPONSE_CODE_DETAILS%","bytes_received":"%BYTES_RECEIVED%","bytes_sent":"%BYTES_SENT%","upstream_address":"%UPSTREAM_HOST%","upstream_response_flags":"%RESPONSE_FLAGS%","upstream_response_time":"%RESPONSE_DURATION%","upstream_service_time":"%RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)%","upstream_cluster":"%UPSTREAM_CLUSTER%","x_forwarded_for":"%REQ(X-FORWARDED-FOR)%","request_method":"%REQ(:METHOD)%","request_path":"%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%","request_protocol":"%PROTOCOL%","tls_protocol":"%DOWNSTREAM_TLS_VERSION%","request_id":"%REQ(X-REQUEST-ID)%","sni_host":"%REQUESTED_SERVER_NAME%","apigee_dynamic_data":"%DYNAMIC_METADATA(envoy.lua)%"}'
   # Apigee Ingressgateway.
-  ingressGateway:
+  apigeeIngressGateway:
     image:
       url: "gcr.io/apigee-release/hybrid/apigee-asm-ingress"
       tag: "1.18.7-asm.4-distroless"

diff --git a/vars/vars.yaml b/vars/vars.yaml
@@ -51,7 +51,7 @@ synchronizer_prod_svc_account: apigee-hybrid-user
 # refer: https://cloud.google.com/apigee/docs/hybrid/preview/helm-install#pull-apigee-helm-charts
 
 helm_chart_repo: oci://us-docker.pkg.dev/apigee-release/apigee-hybrid-helm-charts
-helm_chart_version: 1.13.1
+helm_chart_version: 1.14.0
 helm_charts:
   - apigee-operator
   - apigee-datastore
@@ -187,7 +187,7 @@ overrides:
     replicaCountMax: 2
     image:
       url: "gcr.io/apigee-release/hybrid/apigee-mart-server"
-      tag: "1.13.1"
+      tag: "1.14.0"
       pullPolicy: IfNotPresent
     resources:
       requests:
@@ -197,7 +197,7 @@ overrides:
   mintTaskScheduler:
     image:
       url: "gcr.io/apigee-release/hybrid/apigee-mint-task-scheduler"
-      tag: "1.13.1"
+      tag: "1.14.0"
       pullPolicy: IfNotPresent
     resources:
       requests:
@@ -212,7 +212,7 @@ overrides:
     serviceAccountRef: apigee-hybrid-secret
     image:
       url: "gcr.io/apigee-release/hybrid/apigee-synchronizer"
-      tag: "1.13.1"
+      tag: "1.14.0"
       pullPolicy: IfNotPresent
     resources:
       requests:
@@ -227,7 +227,7 @@ overrides:
     replicaCountMax: 4
     image:
       url: "gcr.io/apigee-release/hybrid/apigee-runtime"
-      tag: "1.13.1"
+      tag: "1.14.0"
       pullPolicy: IfNotPresent
     resources:
       requests:
@@ -242,7 +242,7 @@ overrides:
       secret: ""
       image:
         url: "gcr.io/apigee-release/hybrid/apigee-hybrid-cassandra-client"
-        tag: "1.13.1"
+        tag: "1.14.0"
         pullPolicy: IfNotPresent
     replicaCount: 3
     # multiRegionSeedHost:
@@ -255,7 +255,7 @@ overrides:
       capacity: 10Gi
     image:
       url: "gcr.io/apigee-release/hybrid/apigee-hybrid-cassandra"
-      tag: "1.13.1"
+      tag: "1.14.0"
       pullPolicy: IfNotPresent
     resources:
       requests:
@@ -268,7 +268,7 @@ overrides:
       enabled: false
       image:
         url: "gcr.io/apigee-release/hybrid/apigee-cassandra-backup-utility"
-        tag: "1.13.1"
+        tag: "1.14.0"
         pullPolicy: IfNotPresent
       serviceAccountRef: apigee-hybrid-secret
       schedule: "0 2 * * *"
@@ -278,7 +278,7 @@ overrides:
       snapshotTimestamp:
       image:
         url: "gcr.io/apigee-release/hybrid/apigee-cassandra-backup-utility"
-        tag: "1.13.1"
+        tag: "1.14.0"
         pullPolicy: IfNotPresent
       serviceAccountRef: apigee-hybrid-secret
       dbStorageBucket: ""
@@ -291,7 +291,7 @@ overrides:
     replicaCountMax: 4
     image:
       url: "gcr.io/apigee-release/hybrid/apigee-udca"
-      tag: "1.13.1"
+      tag: "1.14.0"
       pullPolicy: IfNotPresent
     resources:
       requests:
@@ -371,7 +371,7 @@ overrides:
     serviceAccountRef: apigee-hybrid-secret
     image:
       url: "gcr.io/apigee-release/hybrid/apigee-connect-agent"
-      tag: "1.13.1"
+      tag: "1.14.0"
       pullPolicy: IfNotPresent
     replicaCountMin: 1
     replicaCountMax: 1
@@ -384,7 +384,7 @@ overrides:
     serviceAccountRef: apigee-hybrid-secret
     image:
       url: "gcr.io/apigee-release/hybrid/apigee-watcher"
-      tag: "1.13.1"
+      tag: "1.14.0"
       pullPolicy: IfNotPresent
     replicaCountMin: 1
     replicaCountMax: 1
@@ -396,7 +396,7 @@ overrides:
   redis:
     image:
       url: "gcr.io/apigee-release/hybrid/apigee-redis"
-      tag: "1.13.1"
+      tag: "1.14.0"
       pullPolicy: IfNotPresent
     replicaCount: 2
     resources:
@@ -416,7 +416,7 @@ overrides:
   ao:
     image:
       url: "gcr.io/apigee-release/hybrid/apigee-operators"
-      tag: "1.13.1"
+      tag: "1.14.0"
       pullPolicy: IfNotPresent
     resources:
       limits:
@@ -428,7 +428,7 @@ overrides:
     installer:
       image:
         url: "gcr.io/apigee-release/hybrid/apigee-installer"
-        tag: "1.13.1"
+        tag: "1.14.0"
         pullPolicy: IfNotPresent
   # kube rbac proxy
   kubeRBACProxy: