From b5df3fb60fae1878213671aa0435ac22921ccb9e Mon Sep 17 00:00:00 2001
From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com>
Date: Thu, 14 Sep 2023 16:21:35 +0530
Subject: [PATCH 01/14] updated zookeeper version

---
 ansible/roles/zookeeper-upgrade/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/zookeeper-upgrade/defaults/main.yml b/ansible/roles/zookeeper-upgrade/defaults/main.yml
index 6425d3340f..89f3839088 100644
--- a/ansible/roles/zookeeper-upgrade/defaults/main.yml
+++ b/ansible/roles/zookeeper-upgrade/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-zookeeper_version: 3.6.3
+zookeeper_version: 3.8.2
 zookeeper_url: "https://downloads.apache.org/zookeeper/stable/apache-zookeeper-{{ zookeeper_version }}-bin.tar.gz"
 zookeeper_port: 2181
 zk_jvm_opts: "-Xms128m -Xmx128m"

From 05240889c49d9d8c4d562432bddf0d57c4d5af83 Mon Sep 17 00:00:00 2001
From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com>
Date: Thu, 14 Sep 2023 18:16:41 +0530
Subject: [PATCH 02/14] Update main.yml

---
 ansible/roles/analytics-spark-provision/tasks/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/analytics-spark-provision/tasks/main.yml b/ansible/roles/analytics-spark-provision/tasks/main.yml
index 01eef6c9e1..16854e8884 100644
--- a/ansible/roles/analytics-spark-provision/tasks/main.yml
+++ b/ansible/roles/analytics-spark-provision/tasks/main.yml
@@ -143,7 +143,7 @@
 - name: Download Kafka-2.11
   become: yes
   become_user: "{{ analytics_user }}"
-  get_url: url=http://downloads.mesosphere.com/kafka/assets/kafka_2.11-0.10.1.0.tgz dest={{ analytics.home }}/kafka_2.11-0.10.1.0.tgz force=no owner={{ analytics_user }} group={{ analytics_group }}
+  get_url: url=https://archive.apache.org/dist/kafka/0.10.1.0/kafka_2.11-0.10.1.0.tgz dest={{ analytics.home }}/kafka_2.11-0.10.1.0.tgz force=no owner={{ analytics_user }} group={{ analytics_group }}
   tags:
     - kafka-provision
 

From f49c1a057fd295d9a6aa4e75478dacc8bb10b6e2 Mon Sep 17 00:00:00 2001
From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com>
Date: Thu, 14 Sep 2023 19:24:09 +0530
Subject: [PATCH 03/14] Update main.yml

---
 ansible/roles/analytics-spark-provision/tasks/main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ansible/roles/analytics-spark-provision/tasks/main.yml b/ansible/roles/analytics-spark-provision/tasks/main.yml
index 16854e8884..27f251793d 100644
--- a/ansible/roles/analytics-spark-provision/tasks/main.yml
+++ b/ansible/roles/analytics-spark-provision/tasks/main.yml
@@ -120,7 +120,7 @@
 - name: Install latest ruby
   become: yes
   become_user: "{{ analytics_user }}"
-  shell: "export PATH=$PATH:/home/analytics/.rvm/bin && rvm install ruby-2.2"
+  shell: "export PATH=$PATH:/home/analytics/.rvm/bin && rvm install ruby-2.6"
 
 - name: Add ruby repository
   become: yes
@@ -130,7 +130,7 @@
 - name: Install latest ruby-dev
   become: yes
   apt:
-    name: "ruby2.2-dev"
+    name: "ruby2.6-dev"
     state: installed
     update_cache: true
     cache_valid_time: 3600
@@ -138,7 +138,7 @@
 - name: Install ruby-kafka
   become: yes
   become_user: "{{ analytics_user }}"
-  shell: "bash -ilc 'export PATH=$PATH:/home/analytics/.rvm/bin && rvm --default use ruby-2.2 && gem install ruby-kafka'"
+  shell: "bash -ilc 'export PATH=$PATH:/home/analytics/.rvm/bin && rvm --default use ruby-2.6 && gem install ruby-kafka'"
 
 - name: Download Kafka-2.11
   become: yes

From e60cda2f9cfc542bace9502d2f8f0ce42290bf9f Mon Sep 17 00:00:00 2001
From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com>
Date: Wed, 20 Sep 2023 16:57:21 +0530
Subject: [PATCH 04/14] Update role.yaml

---
 kubernetes/helm_charts/bootstrap/reloader/templates/role.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/helm_charts/bootstrap/reloader/templates/role.yaml b/kubernetes/helm_charts/bootstrap/reloader/templates/role.yaml
index 5827f5cdcb..cbd5979451 100755
--- a/kubernetes/helm_charts/bootstrap/reloader/templates/role.yaml
+++ b/kubernetes/helm_charts/bootstrap/reloader/templates/role.yaml
@@ -1,5 +1,5 @@
 {{- if and (not (.Values.reloader.watchGlobally)) (.Values.reloader.rbac.enabled) }}
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   labels:

From 5e260ff179357cdef397606c9bb3221c724d61f2 Mon Sep 17 00:00:00 2001
From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com>
Date: Wed, 20 Sep 2023 16:57:36 +0530
Subject: [PATCH 05/14] Update rolebinding.yaml

---
 .../helm_charts/bootstrap/reloader/templates/rolebinding.yaml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/helm_charts/bootstrap/reloader/templates/rolebinding.yaml b/kubernetes/helm_charts/bootstrap/reloader/templates/rolebinding.yaml
index 94fb1f838b..08868f0e06 100755
--- a/kubernetes/helm_charts/bootstrap/reloader/templates/rolebinding.yaml
+++ b/kubernetes/helm_charts/bootstrap/reloader/templates/rolebinding.yaml
@@ -1,5 +1,5 @@
 {{- if and (not (.Values.reloader.watchGlobally)) (.Values.reloader.rbac.enabled) }}
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   labels: 

From a856e549096121bec6a21e5589c82cb8094c37dc Mon Sep 17 00:00:00 2001
From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com>
Date: Thu, 21 Sep 2023 13:58:19 +0530
Subject: [PATCH 06/14] Update serviceMonitor.yaml

---
 .../datapipeline_jobs/templates/serviceMonitor.yaml           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kubernetes/helm_charts/datapipeline_jobs/templates/serviceMonitor.yaml b/kubernetes/helm_charts/datapipeline_jobs/templates/serviceMonitor.yaml
index 6b6d0c2dda..521e7724de 100644
--- a/kubernetes/helm_charts/datapipeline_jobs/templates/serviceMonitor.yaml
+++ b/kubernetes/helm_charts/datapipeline_jobs/templates/serviceMonitor.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.serviceMonitor.enabled }}
 ---
 apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
+kind: CustomResourceDefinition
 metadata:
   name: {{ .Release.Name }}-taskmanager
   namespace: {{ .Values.namespace }}
@@ -20,7 +20,7 @@ spec:
     - {{ .Values.namespace }}
 ---
 apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
+kind: CustomResourceDefinition
 metadata:
   name: {{ .Release.Name }}-jobmanager
   namespace: {{ .Values.namespace }}

From 13b8522073b3bb1bc8ce25d1673469c3607863a3 Mon Sep 17 00:00:00 2001
From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com>
Date: Thu, 21 Sep 2023 14:04:50 +0530
Subject: [PATCH 07/14] Update serviceMonitor.yaml

---
 .../datapipeline_jobs/templates/serviceMonitor.yaml           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kubernetes/helm_charts/datapipeline_jobs/templates/serviceMonitor.yaml b/kubernetes/helm_charts/datapipeline_jobs/templates/serviceMonitor.yaml
index 521e7724de..6b6d0c2dda 100644
--- a/kubernetes/helm_charts/datapipeline_jobs/templates/serviceMonitor.yaml
+++ b/kubernetes/helm_charts/datapipeline_jobs/templates/serviceMonitor.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.serviceMonitor.enabled }}
 ---
 apiVersion: monitoring.coreos.com/v1
-kind: CustomResourceDefinition
+kind: ServiceMonitor
 metadata:
   name: {{ .Release.Name }}-taskmanager
   namespace: {{ .Values.namespace }}
@@ -20,7 +20,7 @@ spec:
     - {{ .Values.namespace }}
 ---
 apiVersion: monitoring.coreos.com/v1
-kind: CustomResourceDefinition
+kind: ServiceMonitor
 metadata:
   name: {{ .Release.Name }}-jobmanager
   namespace: {{ .Values.namespace }}

From 4151862f3d5c98477694df39b24c436c2987b89b Mon Sep 17 00:00:00 2001
From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com>
Date: Thu, 21 Sep 2023 15:28:08 +0530
Subject: [PATCH 08/14] release-5.2

---
 .../datapipeline_jobs/templates/flink_job_deployment.yaml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/helm_charts/datapipeline_jobs/templates/flink_job_deployment.yaml b/kubernetes/helm_charts/datapipeline_jobs/templates/flink_job_deployment.yaml
index 10e6b62181..b2b94c6f5b 100644
--- a/kubernetes/helm_charts/datapipeline_jobs/templates/flink_job_deployment.yaml
+++ b/kubernetes/helm_charts/datapipeline_jobs/templates/flink_job_deployment.yaml
@@ -225,7 +225,7 @@ spec:
 {{- $prop := (index .Values.scale_properties $name)}}
 {{- if $prop.enabled}}
 ---
-apiVersion: autoscaling/v2beta1
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ .Release.Name }}-taskmanager-hpa

From 481b32fb675e820401a568a4ef0315a87b8983a8 Mon Sep 17 00:00:00 2001
From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com>
Date: Thu, 21 Sep 2023 15:32:42 +0530
Subject: [PATCH 09/14] release-5

---
 .../datapipeline_jobs/templates/flink_job_deployment.yaml      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kubernetes/helm_charts/datapipeline_jobs/templates/flink_job_deployment.yaml b/kubernetes/helm_charts/datapipeline_jobs/templates/flink_job_deployment.yaml
index b2b94c6f5b..a3ae8f4ed6 100644
--- a/kubernetes/helm_charts/datapipeline_jobs/templates/flink_job_deployment.yaml
+++ b/kubernetes/helm_charts/datapipeline_jobs/templates/flink_job_deployment.yaml
@@ -241,5 +241,6 @@ spec:
     - type: External
       external:
         metricName: {{ .Release.Name }}_kafka_consumergroup_lag_sum
-        targetValue: "{{ $prop.scale_target_value }}"
+        target:
+          Value: "{{ $prop.scale_target_value }}"
 {{- end }}        
\ No newline at end of file

From e88d934388687477c52753077df708701b4aeb82 Mon Sep 17 00:00:00 2001
From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com>
Date: Thu, 21 Sep 2023 15:34:01 +0530
Subject: [PATCH 10/14] Update main.yml

---
 kubernetes/ansible/roles/flink-jobs-deploy/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/ansible/roles/flink-jobs-deploy/defaults/main.yml b/kubernetes/ansible/roles/flink-jobs-deploy/defaults/main.yml
index 633026b825..8b3675d08c 100644
--- a/kubernetes/ansible/roles/flink-jobs-deploy/defaults/main.yml
+++ b/kubernetes/ansible/roles/flink-jobs-deploy/defaults/main.yml
@@ -1,6 +1,6 @@
 flink_namespace: "flink-{{ env }}"
 imagepullsecrets: "{{ env }}-registry-secret"
-service_monitor_enabled: true
+service_monitor_enabled: false
 ### Job manager related vars
 jobmanager_rpc_port: 6123
 jobmanager_blob_port: 6124

From 177d389e4a4dc07415f6f6eb7b99d84124ec50b8 Mon Sep 17 00:00:00 2001
From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com>
Date: Thu, 21 Sep 2023 16:46:16 +0530
Subject: [PATCH 11/14] release-5.2.

---
 .../datapipeline_jobs/templates/flink_job_deployment.yaml        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kubernetes/helm_charts/datapipeline_jobs/templates/flink_job_deployment.yaml b/kubernetes/helm_charts/datapipeline_jobs/templates/flink_job_deployment.yaml
index a3ae8f4ed6..d7434e3bdb 100644
--- a/kubernetes/helm_charts/datapipeline_jobs/templates/flink_job_deployment.yaml
+++ b/kubernetes/helm_charts/datapipeline_jobs/templates/flink_job_deployment.yaml
@@ -242,5 +242,6 @@ spec:
       external:
         metricName: {{ .Release.Name }}_kafka_consumergroup_lag_sum
         target:
+          type: Percent
           Value: "{{ $prop.scale_target_value }}"
 {{- end }}        
\ No newline at end of file

From 34b15780474b76ecb634e701eabac856a07f2aef Mon Sep 17 00:00:00 2001
From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com>
Date: Thu, 21 Sep 2023 16:50:48 +0530
Subject: [PATCH 12/14] release

---
 .../templates/flink_job_deployment.yaml       | 23 +------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/kubernetes/helm_charts/datapipeline_jobs/templates/flink_job_deployment.yaml b/kubernetes/helm_charts/datapipeline_jobs/templates/flink_job_deployment.yaml
index d7434e3bdb..6a17d64be5 100644
--- a/kubernetes/helm_charts/datapipeline_jobs/templates/flink_job_deployment.yaml
+++ b/kubernetes/helm_charts/datapipeline_jobs/templates/flink_job_deployment.yaml
@@ -223,25 +223,4 @@ spec:
 
 {{- $name := .Release.Name }}
 {{- $prop := (index .Values.scale_properties $name)}}
-{{- if $prop.enabled}}
----
-apiVersion: autoscaling/v2
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ .Release.Name }}-taskmanager-hpa
-  namespace: {{ .Values.namespace }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ .Release.Name }}-taskmanager
-  minReplicas: {{ $prop.min_replica }}
-  maxReplicas: {{ $prop.max_replica }}
-  metrics:
-    - type: External
-      external:
-        metricName: {{ .Release.Name }}_kafka_consumergroup_lag_sum
-        target:
-          type: Percent
-          Value: "{{ $prop.scale_target_value }}"
-{{- end }}        
\ No newline at end of file
+{{- if $prop.enabled}}        
\ No newline at end of file

From 5f46e5835a69330406863157060d213948b94446 Mon Sep 17 00:00:00 2001
From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com>
Date: Thu, 21 Sep 2023 16:53:30 +0530
Subject: [PATCH 13/14] release

---
 .../datapipeline_jobs/templates/flink_job_deployment.yaml   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/kubernetes/helm_charts/datapipeline_jobs/templates/flink_job_deployment.yaml b/kubernetes/helm_charts/datapipeline_jobs/templates/flink_job_deployment.yaml
index 6a17d64be5..bc19d7a6d0 100644
--- a/kubernetes/helm_charts/datapipeline_jobs/templates/flink_job_deployment.yaml
+++ b/kubernetes/helm_charts/datapipeline_jobs/templates/flink_job_deployment.yaml
@@ -219,8 +219,4 @@ spec:
           subPath: flink-conf.yaml
         - name: flink-config-volume
           mountPath: /opt/flink/conf/log4j-console.properties
-          subPath: log4j-console.properties
-
-{{- $name := .Release.Name }}
-{{- $prop := (index .Values.scale_properties $name)}}
-{{- if $prop.enabled}}        
\ No newline at end of file
+          subPath: log4j-console.properties
\ No newline at end of file

From 5237d04bd11fedfdc3a2ec72d0930057f11c457e Mon Sep 17 00:00:00 2001
From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com>
Date: Fri, 29 Sep 2023 13:17:35 +0530
Subject: [PATCH 14/14] Update main.yml

---
 kubernetes/ansible/roles/flink-jobs-deploy/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/ansible/roles/flink-jobs-deploy/defaults/main.yml b/kubernetes/ansible/roles/flink-jobs-deploy/defaults/main.yml
index 8b3675d08c..633026b825 100644
--- a/kubernetes/ansible/roles/flink-jobs-deploy/defaults/main.yml
+++ b/kubernetes/ansible/roles/flink-jobs-deploy/defaults/main.yml
@@ -1,6 +1,6 @@
 flink_namespace: "flink-{{ env }}"
 imagepullsecrets: "{{ env }}-registry-secret"
-service_monitor_enabled: false
+service_monitor_enabled: true
 ### Job manager related vars
 jobmanager_rpc_port: 6123
 jobmanager_blob_port: 6124