Releasing COE v1.7.001 (#159)

* Releasing COE v1.7.001 Signed-off-by: Subash Dangol <[email protected]>
netscaler · Jul 19, 2023 · a471517 · a471517
1 parent 46dc81e
commit a471517
Show file tree

Hide file tree

Showing 14 changed files with 84 additions and 36 deletions.
diff --git a/citrix-cloud-native/Chart.yaml b/citrix-cloud-native/Chart.yaml
@@ -30,7 +30,7 @@ dependencies:
     condition: cnc.enabled
     alias: cnc
   - name: citrix-observability-exporter
-    version: "1.6.001"
+    version: "1.7.001"
     condition: coe.enabled
     alias: coe
   - name: citrix-ipam-controller

diff --git a/citrix-cloud-native/charts/citrix-cpx-with-ingress-controller/templates/cic_crds.yaml b/citrix-cloud-native/charts/citrix-cpx-with-ingress-controller/templates/cic_crds.yaml
@@ -524,7 +524,7 @@ spec:
                         type: array
                         items:
                           type: string
-                          enum: ['GET', 'PUT', 'POST', 'DELETE', 'HEAD', 'OPTIONS', 'TRACE', 'CONNECT', 'UNKNOWN_METHOD']
+                          enum: ['GET', 'PUT', 'POST', 'DELETE', 'HEAD', 'OPTIONS', 'TRACE', 'CONNECT','PATCH', 'UNKNOWN_METHOD']
                       header_name:
                         description: "HTTP header that identifies the unique API client for e.g. X-apikey"
                         type: string
@@ -1089,7 +1089,7 @@ spec:
                             type: array
                             items:
                               type: string
-                              enum: ['GET', 'PUT', 'POST', 'DELETE', 'HEAD', 'OPTIONS', 'TRACE', 'CONNECT', 'UNKNOWN_METHOD']
+                              enum: ['GET', 'PUT', 'POST', 'DELETE', 'HEAD', 'OPTIONS', 'TRACE', 'CONNECT','PATCH', 'UNKNOWN_METHOD']
                         required:
                           - path
                     expression:
@@ -1129,7 +1129,7 @@ spec:
                             type: array
                             items:
                               type: string
-                              enum: ['GET', 'PUT', 'POST', 'DELETE', 'HEAD', 'OPTIONS', 'TRACE', 'CONNECT', 'UNKNOWN_METHOD']
+                              enum: ['GET', 'PUT', 'POST', 'DELETE', 'HEAD', 'OPTIONS', 'TRACE', 'CONNECT','PATCH', 'UNKNOWN_METHOD']
                           claims:
                             description: 'authorization scopes required for selected resource saved as claims or attributes'
                             type: array
@@ -1831,7 +1831,7 @@ spec:
                     description: "List of http methods to inspect"
                     items:
                       type: string
-                      enum: ['GET', 'PUT', 'POST', 'DELETE', 'HEAD', 'OPTIONS', 'TRACE', 'CONNECT', 'UNKNOWN_METHOD']
+                      enum: ['GET', 'PUT', 'POST', 'DELETE', 'HEAD', 'OPTIONS', 'TRACE', 'CONNECT','PATCH', 'UNKNOWN_METHOD']
                   header:
                     type: array
                     description: "List of http headers to inspect"
@@ -1978,7 +1978,7 @@ spec:
                     description: "List of http methods to inspect"
                     items:
                       type: string
-                      enum: ['GET', 'PUT', 'POST', 'DELETE', 'HEAD', 'OPTIONS', 'TRACE', 'CONNECT', 'UNKNOWN_METHOD']
+                      enum: ['GET', 'PUT', 'POST', 'DELETE', 'HEAD', 'OPTIONS', 'TRACE', 'CONNECT','PATCH', 'UNKNOWN_METHOD']
                   header:
                     type: array
                     description: "List of http headers to inspect"
@@ -1995,7 +1995,7 @@ spec:
                   block_list:
                     type: string
                     enum: ['ON', 'OFF']
-                  device_fingerprint: 
+                  device_fingerprint:
                     type: string
                     enum: ['ON', 'OFF']
                   device_fingerprint_action:
@@ -2040,6 +2040,7 @@ spec:
                         expression:
                           type: object
                           x-kubernetes-preserve-unknown-fields: true
+
                   block_list:
                     type: array
                     items:

diff --git a/citrix-cloud-native/charts/citrix-ingress-controller/templates/cic_crds.yaml b/citrix-cloud-native/charts/citrix-ingress-controller/templates/cic_crds.yaml
@@ -524,7 +524,7 @@ spec:
                         type: array
                         items:
                           type: string
-                          enum: ['GET', 'PUT', 'POST', 'DELETE', 'HEAD', 'OPTIONS', 'TRACE', 'CONNECT', 'UNKNOWN_METHOD']
+                          enum: ['GET', 'PUT', 'POST', 'DELETE', 'HEAD', 'OPTIONS', 'TRACE', 'CONNECT','PATCH', 'UNKNOWN_METHOD']
                       header_name:
                         description: "HTTP header that identifies the unique API client for e.g. X-apikey"
                         type: string
@@ -1089,7 +1089,7 @@ spec:
                             type: array
                             items:
                               type: string
-                              enum: ['GET', 'PUT', 'POST', 'DELETE', 'HEAD', 'OPTIONS', 'TRACE', 'CONNECT', 'UNKNOWN_METHOD']
+                              enum: ['GET', 'PUT', 'POST', 'DELETE', 'HEAD', 'OPTIONS', 'TRACE', 'CONNECT','PATCH', 'UNKNOWN_METHOD']
                         required:
                           - path
                     expression:
@@ -1129,7 +1129,7 @@ spec:
                             type: array
                             items:
                               type: string
-                              enum: ['GET', 'PUT', 'POST', 'DELETE', 'HEAD', 'OPTIONS', 'TRACE', 'CONNECT', 'UNKNOWN_METHOD']
+                              enum: ['GET', 'PUT', 'POST', 'DELETE', 'HEAD', 'OPTIONS', 'TRACE', 'CONNECT','PATCH', 'UNKNOWN_METHOD']
                           claims:
                             description: 'authorization scopes required for selected resource saved as claims or attributes'
                             type: array
@@ -1831,7 +1831,7 @@ spec:
                     description: "List of http methods to inspect"
                     items:
                       type: string
-                      enum: ['GET', 'PUT', 'POST', 'DELETE', 'HEAD', 'OPTIONS', 'TRACE', 'CONNECT', 'UNKNOWN_METHOD']
+                      enum: ['GET', 'PUT', 'POST', 'DELETE', 'HEAD', 'OPTIONS', 'TRACE', 'CONNECT','PATCH', 'UNKNOWN_METHOD']
                   header:
                     type: array
                     description: "List of http headers to inspect"
@@ -1978,7 +1978,7 @@ spec:
                     description: "List of http methods to inspect"
                     items:
                       type: string
-                      enum: ['GET', 'PUT', 'POST', 'DELETE', 'HEAD', 'OPTIONS', 'TRACE', 'CONNECT', 'UNKNOWN_METHOD']
+                      enum: ['GET', 'PUT', 'POST', 'DELETE', 'HEAD', 'OPTIONS', 'TRACE', 'CONNECT','PATCH', 'UNKNOWN_METHOD']
                   header:
                     type: array
                     description: "List of http headers to inspect"

diff --git a/citrix-cloud-native/charts/citrix-observability-exporter/Chart.yaml b/citrix-cloud-native/charts/citrix-observability-exporter/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "1.6.001"
+appVersion: "1.7.001"
 description: A Helm chart for Citrix Observability Exporter
 name: citrix-observability-exporter
-version: 1.6.001
+version: 1.7.001
 icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png 
 home: https://www.cloud.com
 sources:

diff --git a/citrix-cloud-native/charts/citrix-observability-exporter/README.md b/citrix-cloud-native/charts/citrix-observability-exporter/README.md
@@ -77,7 +77,7 @@ The following table lists the mandatory and optional parameters that you can con
 | coe.license.accept | Mandatory | no | Set `yes` to accept the CIC end user license agreement. |
 | coe.imageRegistry                   | Mandatory  |  `quay.io`               |  The COE image registry             |  
 | coe.imageRepository                 | Mandatory  |  `citrix/citrix-observability-exporter`              |   The COE image repository             | 
-| coe.imageTag                  | Mandatory  |  `1.5.001`               |   The COE image tag            | 
+| coe.imageTag                  | Mandatory  |  `1.7.001`               |   The COE image tag            | 
 | coe.pullPolicy | Mandatory | IfNotPresent | The COE image pull policy. |
 | coe.nodePortRequired | Optional | false | Set true to create a nodeport COE service. |
 | coe.headless | Optional | false | Set true to create Headless service. |
@@ -93,13 +93,17 @@ The following table lists the mandatory and optional parameters that you can con
 | coe.kafka.enabled | Optional | false | Set true to enable sending transaction data to kafka server. |
 | coe.kafka.broker | Optional |  | The kafka broker IP details. |
 | coe.kafka.topic | Optional | `HTTP` | The kafka topic details to upload data. |
-| kafka.dataFormat | Optional | `AVRO` | The format of the data exported to Kafka -- can be either JSON or AVRO, and defaults to AVRO
+| kafka.dataFormat | Optional | `AVRO` | The format of the data exported to Kafka -- can be either JSON or AVRO, and defaults to AVRO |
 | coe.timeseries.enabled | Optional | false | Set true to enable sending timeseries data to prometheus. |
 | coe.timeseries.nodePort | Optional | 30002 | Specify the port used to expose COE service outside cluster for timeseries endpoint. |
 | coe.json_trans_rate_limiting.enabled | Optional | false | Set true to enable rate-limiting of transactions for JSON-based endpoints: Splunk, ElasticSearch and Zipkin. |
 | coe.json_trans_rate_limiting.limit | Optional | 100 | Specify the rate-limit: 100 means approximately 800 TPS. |
 | coe.json_trans_rate_limiting.queuelimit | Optional | 1000 | The amount of transactional data that can pile up, before COE starts shedding them. For Zipkin, 1000 is approximately 64 MB of data; For Splunk and ElasticSearch, this is approximately 32 MB of data. |
-| coe.json_trans_rate_limiting.window | Optional | 5 | The recalculation window in seconds-  the lower the window size ( must be greater than 0), the more effective will be the rate-limiting but it will have CPU overhead |
+| coe.json_trans_rate_limiting.window | Optional | 5 | The recalculation window in seconds-the lower the window size ( must be greater than 0), the more effective will be the rate-limiting but it will have CPU overhead |
+| coe.podAnnotations | Optional | N/A | Map of annotations to add to the pods. |
+| coe.resources | Optional | N/A | CPU/Memory resource requests/limits for COE container. |
+| tolerations | Optional | N/A | Specify the tolerations for the COE deployment. |
+| affinity | Optional | N/A | Affinity labels for pod assignment. |
 
 Alternatively, you can define a YAML file with the values for the parameters and pass the values while installing the chart.
 

diff --git a/citrix-cloud-native/charts/citrix-observability-exporter/templates/deployment.yaml b/citrix-cloud-native/charts/citrix-observability-exporter/templates/deployment.yaml
@@ -18,6 +18,9 @@ spec:
       annotations:
         prometheus.io/scrape: "true"
         prometheus.io/port: "5563"
+{{- with .Values.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+{{- end }}
 {{- end}}
     spec:
       containers:
@@ -33,6 +36,8 @@ spec:
             - containerPort: 5563
               name: rest
 {{- end}}
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:
             - name: lstreamd-config
               mountPath: /var/logproxy/lstreamd/conf/lstreamd_default.conf
@@ -45,3 +50,10 @@ spec:
             name: coe-config
         - name: core-data
           emptyDir: {}
+{{- if .Values.tolerations }}
+      tolerations: {{ .Values.tolerations | toYaml | nindent 8 }}
+{{- end }}
+{{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+{{- end }}
diff --git a/citrix-cloud-native/charts/citrix-observability-exporter/values.yaml b/citrix-cloud-native/charts/citrix-observability-exporter/values.yaml
@@ -4,7 +4,7 @@
 
 imageRegistry: quay.io
 imageRepository: citrix/citrix-observability-exporter
-imageTag: 1.5.001
+imageTag: 1.7.001
 image: "{{ .Values.imageRegistry }}/{{ .Values.imageRepository }}:{{ .Values.imageTag }}"
 pullPolicy: IfNotPresent
 replicas: 1
@@ -40,3 +40,8 @@ json_trans_rate_limiting:
   limit: 100
   queuelimit: 1000
   window: 5
+
+podAnnotations: {}
+resources: {}
+tolerations: []
+affinity: {}
diff --git a/citrix-observability-exporter/Chart.yaml b/citrix-observability-exporter/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "1.6.001"
+appVersion: "1.7.001"
 description: A Helm chart for Citrix Observability Exporter
 name: citrix-observability-exporter
-version: 1.6.001
+version: 1.7.001
 icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png 
 home: https://www.cloud.com
 sources:

diff --git a/citrix-observability-exporter/README.md b/citrix-observability-exporter/README.md
@@ -15,7 +15,7 @@ We can configure Citrix Observability Exporter helm chart to export transactiona
    helm repo add citrix https://citrix.github.io/citrix-helm-charts/
 
    For streaming transactions to Kafka, timeseries to Prometheus and tracing to zipkin:
-     helm install coe citrix/citrix-observability-exporter --set kafka.enabled=true --set kafka.broker="X.X.X.X\,Y.Y.Y.Y" --set kafka.topic=HTTP --set timeseries.enabled=true --set ns_tracing.enabled=true --set ns_tracing.server="zipkin:9411/api/v1/spans"
+     helm install coe citrix/citrix-observability-exporter --set kafka.enabled=true --set kafka.broker="X.X.X.X\,Y.Y.Y.Y" --set kafka.topic=HTTP --set kafka.dataFormat=AVRO --set timeseries.enabled=true --set ns_tracing.enabled=true --set ns_tracing.server="zipkin:9411/api/v1/spans"
 
    For streaming transactions to Elasticsearch, timeseries to Prometheus and tracing to zipkin:
      helm install coe citrix/citrix-observability-exporter --set elasticsearch.enabled=true --set elasticsearch.server=elasticsearch:9200 --set timeseries.enabled=true --set ns_tracing.enabled=true --set ns_tracing.server="zipkin:9411/api/v1/spans"
@@ -75,7 +75,7 @@ The following table lists the mandatory and optional parameters that you can con
 | license.accept | Mandatory | no | Set `yes` to accept the CIC end user license agreement. |
 | imageRegistry                   | Mandatory  |  `quay.io`               |  The COE image registry             |  
 | imageRepository                 | Mandatory  |  `citrix/citrix-observability-exporter`              |   The COE image repository             | 
-| imageTag                  | Mandatory  |  `1.6.001`               |  The COE image tag            | 
+| imageTag                  | Mandatory  |  `1.7.001`               |  The COE image tag            | 
 | pullPolicy | Mandatory | IfNotPresent | The COE image pull policy. |
 | nodePortRequired | Optional | false | Set true to create a nodeport COE service. |
 | headless | Optional | false | Set true to create Headless service. |
@@ -91,13 +91,17 @@ The following table lists the mandatory and optional parameters that you can con
 | kafka.enabled | Optional | false | Set true to enable sending transaction data to kafka server. |
 | kafka.broker | Optional |  | The kafka broker IP details. |
 | kafka.topic | Optional | `HTTP` | The kafka topic details to upload data. |
-| kafka.dataFormat | Optional | `AVRO` | The format of the data exported to Kafka -- can be either JSON or AVRO, and defaults to AVRO
+| kafka.dataFormat | Optional | `AVRO` | The format of the data exported to Kafka -- can be either JSON or AVRO, and defaults to AVRO. |
 | timeseries.enabled | Optional | false | Set true to enable sending timeseries data to prometheus. |
 | timeseries.nodePort | Optional | 30002 | Specify the port used to expose COE service outside cluster for timeseries endpoint. |
 | json_trans_rate_limiting.enabled | Optional | false | Set true to enable rate-limiting of transactions for JSON-based endpoints: Splunk, ElasticSearch and Zipkin. |
 | json_trans_rate_limiting.limit | Optional | 100 | Specify the rate-limit: 100 means approximately 800 TPS. |
 | json_trans_rate_limiting.queuelimit | Optional | 1000 | The amount of transactional data that can pile up, before COE starts shedding them. For Zipkin, 1000 is approximately 64 MB of data; For Splunk and ElasticSearch, this is approximately 32 MB of data. |
 | json_trans_rate_limiting.window | Optional | 5 | The recalculation window in seconds-  the lower the window size ( must be greater than 0), the more effective will be the rate-limiting but it will have CPU overhead |
+| podAnnotations | Optional | N/A | Map of annotations to add to the pods. |
+| resources | Optional | N/A | CPU/Memory resource requests/limits for COE container. |
+| tolerations | Optional | N/A | Specify the tolerations for the COE deployment. |
+| affinity | Optional | N/A | Affinity labels for pod assignment. |
 
 Alternatively, you can define a YAML file with the values for the parameters and pass the values while installing the chart.
 

diff --git a/citrix-observability-exporter/templates/deployment.yaml b/citrix-observability-exporter/templates/deployment.yaml
@@ -18,6 +18,9 @@ spec:
       annotations:
         prometheus.io/scrape: "true"
         prometheus.io/port: "5563"
+{{- with .Values.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+{{- end }}
 {{- end}}
     spec:
       containers:
@@ -31,6 +34,8 @@ spec:
             - containerPort: 5563
               name: rest
 {{- end}}
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:
             - name: lstreamd-config
               mountPath: /var/logproxy/lstreamd/conf/lstreamd_default.conf
@@ -43,3 +48,10 @@ spec:
             name: coe-config
         - name: core-data
           emptyDir: {}
+{{- if .Values.tolerations }}
+      tolerations: {{ .Values.tolerations | toYaml | nindent 8 }}
+{{- end }}
+{{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+{{- end }}
diff --git a/citrix-observability-exporter/values.yaml b/citrix-observability-exporter/values.yaml
@@ -4,7 +4,7 @@
 
 imageRegistry: quay.io
 imageRepository: citrix/citrix-observability-exporter
-imageTag: 1.6.001
+imageTag: 1.7.001
 image: "{{ .Values.imageRegistry }}/{{ .Values.imageRepository }}:{{ .Values.imageTag }}"
 pullPolicy: IfNotPresent
 replicas: 1
@@ -40,3 +40,8 @@ json_trans_rate_limiting:
   limit: 100
   queuelimit: 1000
   window: 5
+
+podAnnotations: {}
+resources: {}
+tolerations: []
+affinity: {}
diff --git a/citrix_cloud_native_values.yaml b/citrix_cloud_native_values.yaml
@@ -640,7 +640,7 @@ coe:
   enabled: False
   imageRegistry: quay.io
   imageRepository: citrix/citrix-observability-exporter
-  imageTag: 1.6.001
+  imageTag: 1.7.001
   image: "{{ .Values.coe.imageRegistry }}/{{ .Values.coe.imageRepository }}:{{ .Values.coe.imageTag }}"
   pullPolicy: IfNotPresent
   replicas: 1
@@ -675,6 +675,10 @@ coe:
     limit: 100
     queuelimit: 1000
     window: 5
+  podAnnotations: {}
+  resources: {}
+  tolerations: []
+  affinity: {}
 
 ipam:
   enabled: False