Merge pull request #820 from codacy/ls/bump-kubernetes-1.32

CallMeLeopoldo · web-flow · commit cbfe8750e962 · 2025-12-23T16:02:11.000Z
infra: upgrade Kubernetes version to 1.32
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  codacy: codacy/base@11.0.0
+  codacy: codacy/base@12.3.1
   slack: circleci/slack@3.4.2
 
 references:
@@ -557,11 +557,11 @@ workflows:
           requires:
             - plan_dev_cluster
       - codacy/microk8s_install:
-          name: install_k8s-1.30_helm-3.16.3_unstable
+          name: install-k8s-unstable
           helm_repo: "https://charts.codacy.com/unstable"
           chart_version: $(cat .version)
-          microk8s_channel: "1.30/stable"
-          helm_version: "v3.16.3"
+          microk8s_channel: "1.32/stable"
+          helm_version: "v3.19.0"
           helm_timeout: 1200
           context: CodacyDocker
           docker_username: $DOCKER_USER
@@ -810,7 +810,7 @@ workflows:
           <<: *helm_values
           requires:
             - helm_push_incubator
-      
+
       - codacy/microk8s_install:
           name: install_k8s-1.30_helm-3.16.3
           helm_repo: "https://charts.codacy.com/incubator"
@@ -825,6 +825,20 @@ workflows:
           requires:
             - helm_push_incubator
 
+      - codacy/microk8s_install:
+          name: install_k8s-1.32_helm-3.19.0
+          helm_repo: "https://charts.codacy.com/incubator"
+          chart_version: $(cat .version)
+          microk8s_channel: "1.32/stable"
+          helm_version: "v3.19.0"
+          helm_timeout: 1200
+          context: CodacyDocker
+          docker_username: $DOCKER_USER
+          docker_password: $DOCKER_PASS
+          <<: *helm_values
+          requires:
+            - helm_push_incubator
+
       - test_api:
           context: CodacyAWS
           requires:
@@ -870,6 +884,7 @@ workflows:
             - install_k8s-1.28_helm-3.9
             - install_k8s-1.29_helm-3.16.3
             - install_k8s-1.30_helm-3.16.3
+            - install_k8s-1.32_helm-3.19.0
       - manual_solutions_eng_hold:
           type: approval
           context: CodacyDO
@@ -890,6 +905,7 @@ workflows:
             - install_k8s-1.28_helm-3.9
             - install_k8s-1.29_helm-3.16.3
             - install_k8s-1.30_helm-3.16.3
+            - install_k8s-1.32_helm-3.19.0
       - set_chart_version_release:
           context: CodacyDO
           requires:
diff --git a/.do/Makefile b/.do/Makefile
@@ -31,6 +31,8 @@ define call_helm_install
 	--set global.features.cloneSubmodules=true \
 	--set global.workerManager.workers.config.imageVersion=${5} \
 	--set global.crow.config.passwordAuth.password=$${CROW_PASSWORD} \
+	--set rabbitmq.image.repository=bitnamilegacy/rabbitmq \
+
 	"$${extra_args[@]}"
 endef
 
diff --git a/.do/k8s-cluster/Makefile b/.do/k8s-cluster/Makefile
@@ -7,7 +7,7 @@ WORKSPACE ?= ${DO_TF_WORKSPACE}
 VARS_FILE ?= deploy.tfvars
 NGINX_INGRESS_VERSION ?= 4.11.3
 CERT_MANAGER_VERSION ?= v1.15.0
-K8S_VERSION ?= 1.30
+K8S_VERSION ?= 1.32
 DO_K8S_SLUG ?= $(shell doctl kubernetes options versions | grep $(K8S_VERSION) | awk '{print $$1}')
 NODE_TYPE ?= s-8vcpu-32gb
 NODES_MIN ?= 1
diff --git a/.do/k8s-cluster/variables.tf b/.do/k8s-cluster/variables.tf
@@ -5,7 +5,7 @@
 variable "k8s_version" {
   description = "Kubernetes version. See available versions with `doctl kubernetes options versions`"
   type        = string
-  default     = "1.30.5-do.5"
+  default     = "1.32.10-do.1"
 }
 
 variable "k8s_kubeconfig" {
diff --git a/.gitignore b/.gitignore
@@ -39,4 +39,7 @@ release-notes-tools
 .version
 
 *.log
-.*.swp
+.*.swp
+
+#Ignore vscode AI rules
+.github/instructions/codacy.instructions.md
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 .PHONY: setup_helm_repos
 setup_helm_repos:
-	helm repo add bitnami-pre-2022 https://raw.githubusercontent.com/bitnami/charts/defb094c658024e4aa8245622dab202874880cbc/bitnami # Github tag before bitnami truncated the index. Old link didn't work anymore
+	# Add legacy Bitnami snapshot repo used by requirements.yaml (apiVersion v1)
 	helm repo add stable https://charts.helm.sh/stable
 	helm repo add codacy-stable https://charts.codacy.com/stable
 	helm repo add codacy-unstable https://charts.codacy.com/unstable
@@ -53,3 +53,6 @@ get_release_notes:
 	git fetch --all --tags --force
 	# Generate release notes and create pull request on codacy/docs
 	release-notes-tools/run.sh selfhosted ${VERSION_NEW} ${VERSION_OLD} --push
+
+
+
diff --git a/codacy/requirements.yaml b/codacy/requirements.yaml
@@ -5,10 +5,9 @@ dependencies:
   condition: global.minio.create
   alias: minio
 
-  # Github tag before bitnami truncated the index. Old link didn't work anymore
 - name: rabbitmq
   version: 7.5.7
-  repository: https://raw.githubusercontent.com/bitnami/charts/defb094c658024e4aa8245622dab202874880cbc/bitnami
+  repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
   condition: global.rabbitmq.create
   alias: rabbitmq-ha
 
diff --git a/codacy/templates/rabbitmq-secret.yaml b/codacy/templates/rabbitmq-secret.yaml
@@ -40,5 +40,10 @@ stringData:
             "type": "classic",
             "vhost": "/"
         }
+      ],
+      "vhosts": [
+          {
+            "name": "/"
+          }
       ]
-    }
+    }
diff --git a/codacy/values-microk8s.yaml b/codacy/values-microk8s.yaml
@@ -55,6 +55,9 @@ crow:
 
 rabbitmq-ha:
   replicaCount: 1
+  image:
+    repository: bitnamilegacy/rabbitmq
+    tag: "3.8.35-debian-11-r5"
   resources:
     limits:
       cpu: 0.5
diff --git a/codacy/values.yaml b/codacy/values.yaml
@@ -140,8 +140,8 @@ global:
 
   rabbitmq:
     create: true
-    rabbitmqUsername: rabbitmq-codacy
-    rabbitmqPassword: rabbitmq-codacy
+    rabbitmqUsername: "rabbitmq-codacy"
+    rabbitmqPassword: "CHANGEME"
     rabbitmqvHost: "/"
     host: codacy-rabbitmq-ha
     port: 5672
@@ -278,16 +278,53 @@ fluentdoperator:
 crow:
   create: true
 
+codacy-api:
+  replicaCount: 2
+  resources:
+    limits:
+      cpu: 1000m
+      memory: 2000Mi
+    requests:
+      cpu: 500m
+      memory: 2000Mi
+
+engine:
+  replicaCount: 1
+  resources:
+    limits:
+      cpu: 2000m
+      memory: 3000Mi
+    requests:
+      cpu: 200m
+      memory: 3000Mi
+
+portal:
+  replicaCount: 1
+  resources:
+    limits:
+      cpu: 500m
+      memory: 1Gi
+    requests:
+      cpu: 200m
+      memory: 200Mi
+
 ## YOU ARE NOT ADVISED TO CHANGE BEYOND THIS POINT
+
 ## Defaults for Internal Storage coming from requirements
 ## These values are ignored if 'create: false' in the global variables
 
 rabbitmq-ha:
   rabbitmqErlangCookie: "PLEASE_CHANGE_ME_TO_A_RANDOM_STR" # Generate one with `cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`
   fullnameOverride: codacy-rabbitmq-ha
+  global:
+    imagePullSecrets:
+      - docker-credentials
+  image:
+    repository: bitnamilegacy/rabbitmq
+    tag: "3.8.35-debian-11-r5"
   auth:
-    username: "rabbitmq-codacy"
-    password: "rabbitmq-codacy"
+    username: rabbitmq-codacy
+    password: rabbitmq-codacy
   prometheus:
     operator:
       enabled: false
@@ -301,7 +338,9 @@ rabbitmq-ha:
 
 postgres:
   fullnameOverride: codacy-postgres
-  imageTag: "9.6.2"
+  image:
+    repository: bitnamilegacy/postgresql
+    tag: "11.7.0"
   persistence:
     enabled: false
     # storageClass:

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`variable "k8s_version" {`
`6`	`6`	description = "Kubernetes version. See available versions with `doctl kubernetes options versions`"
`7`	`7`	`type = string`
`8`		`- default = "1.30.5-do.5"`
	`8`	`+ default = "1.32.10-do.1"`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`variable "k8s_kubeconfig" {`
Original file line number	Diff line number	Diff line change
`@@ -40,5 +40,10 @@ stringData:`
`40`	`40`	`"type": "classic",`
`41`	`41`	`"vhost": "/"`
`42`	`42`	`}`
	`43`	`+ ],`
	`44`	`+ "vhosts": [`
	`45`	`+ {`
	`46`	`+ "name": "/"`
	`47`	`+ }`
`43`	`48`	`]`
`44`		`- }`
	`49`	`+ }`