Merge pull request #653 from Lakshanya-M-ML/master

Replacement of target field to targetAverageValue
snappyflow · May 23, 2024 · 648dd44 · 648dd44
2 parents 33adce7 + 8dd9653
commit 648dd44
Show file tree

Hide file tree

Showing 19 changed files with 20 additions and 35 deletions.
diff --git a/charts/sf-datapath/charts/archival-kafka-connect-0.1.1.tgz b/charts/sf-datapath/charts/archival-kafka-connect-0.1.1.tgz
diff --git a/charts/sf-datapath/charts/archival-kafka-connect-0.1.2.tgz b/charts/sf-datapath/charts/archival-kafka-connect-0.1.2.tgz
diff --git a/charts/sf-datapath/charts/authenticator-0.1.1.tgz b/charts/sf-datapath/charts/authenticator-0.1.1.tgz
diff --git a/charts/sf-datapath/charts/cp-kafka-rest-0.1.2.tgz b/charts/sf-datapath/charts/cp-kafka-rest-0.1.2.tgz
diff --git a/charts/sf-datapath/charts/cp-kafka-rest-0.1.3.tgz b/charts/sf-datapath/charts/cp-kafka-rest-0.1.3.tgz
diff --git a/charts/sf-datapath/charts/cp-schema-registry-0.1.1.tgz b/charts/sf-datapath/charts/cp-schema-registry-0.1.1.tgz
diff --git a/charts/sf-datapath/charts/es-kafka-connect-0.1.3.tgz b/charts/sf-datapath/charts/es-kafka-connect-0.1.3.tgz
diff --git a/charts/sf-datapath/charts/es-kafka-connect-0.1.4.tgz b/charts/sf-datapath/charts/es-kafka-connect-0.1.4.tgz
diff --git a/charts/sf-datapath/charts/minio-8.0.11.tgz b/charts/sf-datapath/charts/minio-8.0.11.tgz
diff --git a/charts/sf-datapath/charts/sfk-interface-0.1.2.tgz b/charts/sf-datapath/charts/sfk-interface-0.1.2.tgz
diff --git a/charts/sf-datapath/charts/signatures-and-kafka-apis-0.1.1.tgz b/charts/sf-datapath/charts/signatures-and-kafka-apis-0.1.1.tgz
diff --git a/charts/sf-datapath/requirements.lock b/charts/sf-datapath/requirements.lock
@@ -4,13 +4,13 @@ dependencies:
   version: 0.1.1
 - name: cp-kafka-rest
   repository: file://./sub_charts/cp-kafka-rest
-  version: 0.1.2
+  version: 0.1.3
 - name: archival-kafka-connect
   repository: file://./sub_charts/archival-kafka-connect
-  version: 0.1.1
+  version: 0.1.2
 - name: es-kafka-connect
   repository: file://./sub_charts/es-kafka-connect
-  version: 0.1.3
+  version: 0.1.4
 - name: authenticator
   repository: file://./sub_charts/authenticator
   version: 0.1.1
@@ -23,5 +23,5 @@ dependencies:
 - name: minio
   repository: file://./sub_charts/minio
   version: 8.0.11
-digest: sha256:c547916941c84368140ec67062435980b5c1d9cbb03671eeabf76447d8714c41
-generated: "2024-04-30T10:18:28.0263102+05:30"
+digest: sha256:b5d9ee6e95a0c26094060227f0303e34131aac6b282ae8f503e8442a44ccc47c
+generated: "2024-05-23T10:57:54.1648535+05:30"
diff --git a/charts/sf-datapath/requirements.yaml b/charts/sf-datapath/requirements.yaml
@@ -3,14 +3,14 @@ dependencies:
   version: 0.1.1
   repository: file://./sub_charts/cp-schema-registry
 - name: cp-kafka-rest
-  version: 0.1.2
+  version: 0.1.3
   repository: file://./sub_charts/cp-kafka-rest
 - name: archival-kafka-connect
-  version: 0.1.1
+  version: 0.1.2
   repository: file://./sub_charts/archival-kafka-connect
   condition: global.archival.enabled
 - name: es-kafka-connect
-  version: 0.1.3
+  version: 0.1.4
   repository: file://./sub_charts/es-kafka-connect
 - name: authenticator
   version: 0.1.1

diff --git a/charts/sf-datapath/sub_charts/archival-kafka-connect/Chart.yaml b/charts/sf-datapath/sub_charts/archival-kafka-connect/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart for Confluent Kafka Connect on Kubernetes which helps sinking to S3
 name: archival-kafka-connect
-version: 0.1.1
+version: 0.1.2
diff --git a/charts/sf-datapath/sub_charts/archival-kafka-connect/templates/hpa.yaml b/charts/sf-datapath/sub_charts/archival-kafka-connect/templates/hpa.yaml
@@ -15,14 +15,9 @@ spec:
   - type: Resource
     resource:
       name: cpu
-      target:
-        type: AverageValue
-        averageValue: "850m"
+      targetaverageValue: "850m"
   - type: External
     external:
-      metric:
-        name: kafka_bytesinpersec_oneminuterate_for_log_and_metric
-      target:
-        type: AverageValue
-        averageValue: {{ mul .Values.autoscaling.ingestRateGBPerDayPerPod 11575 }}
+      metricname: kafka_bytesinpersec_oneminuterate_for_log_and_metric
+      targetaverageValue: {{ mul .Values.autoscaling.ingestRateGBPerDayPerPod 11575 }}
 {{- end }}
diff --git a/charts/sf-datapath/sub_charts/cp-kafka-rest/Chart.yaml b/charts/sf-datapath/sub_charts/cp-kafka-rest/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart for Confluent Kafka REST Proxy on Kubernetes
 name: cp-kafka-rest
-version: 0.1.2
+version: 0.1.3
diff --git a/charts/sf-datapath/sub_charts/cp-kafka-rest/templates/hpa.yaml b/charts/sf-datapath/sub_charts/cp-kafka-rest/templates/hpa.yaml
@@ -14,15 +14,10 @@ spec:
   metrics:
   - type: Pods
     pods:
-      metric:
-        name: kafka_rest_heap_utilization_pcnt
-      target:
-        type: AverageValue
-        averageValue: 85
+      metricname: kafka_rest_heap_utilization_pcnt
+      targetaverageValue: 85
   - type: Resource
     resource:
       name: cpu
-      target:
-        type: AverageValue
-        averageValue: 450m
+      targetaverageValue: 450m
 {{- end }}
diff --git a/charts/sf-datapath/sub_charts/es-kafka-connect/Chart.yaml b/charts/sf-datapath/sub_charts/es-kafka-connect/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart for Confluent Kafka Connect on Kubernetes which helps sinking to Elasticsearch
 name: es-kafka-connect
-version: 0.1.3
+version: 0.1.4
diff --git a/charts/sf-datapath/sub_charts/es-kafka-connect/templates/hpa.yaml b/charts/sf-datapath/sub_charts/es-kafka-connect/templates/hpa.yaml
@@ -15,14 +15,9 @@ spec:
   - type: Resource
     resource:
       name: cpu
-      target:
-        type: AverageValue
-        averageValue: "850m"
+      targetaverageValue: "850m"
   - type: External
     external:
-      metric:
-        name: kafka_bytesinpersec_oneminuterate
-      target:
-        type: AverageValue
-        averageValue: {{ mul .Values.autoscaling.ingestRateGBPerDayPerPod 11575 }}
+      metricname: kafka_bytesinpersec_oneminuterate
+      targetaverageValue: {{ mul .Values.autoscaling.ingestRateGBPerDayPerPod 11575 }}
 {{- end }}