Skip to content

Commit 39dce46

Browse files
Merge pull request #749 from codacy/fix/deploy-to-k8s-1.22
fix: deploy to k8s 1.22
2 parents d930d22 + c66fd59 commit 39dce46

6 files changed

Lines changed: 34 additions & 78 deletions

File tree

.circleci/config.yml

Lines changed: 24 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 2.1
22

33
orbs:
4-
codacy: codacy/base@6.1.4
4+
codacy: codacy/base@9.0.1
55
slack: circleci/slack@3.4.2
66

77
references:
@@ -515,11 +515,11 @@ workflows:
515515
requires:
516516
- validate_dev_cluster
517517
- codacy/microk8s_install:
518-
name: install_k8s-1.16_helm-3.2
518+
name: install_k8s-1.21_helm-3.9_unstable
519519
helm_repo: "https://charts.codacy.com/unstable"
520520
chart_version: $(cat .version)
521-
microk8s_channel: "1.16/stable"
522-
helm_version: "v3.2.1"
521+
microk8s_channel: "1.21/stable"
522+
helm_version: "v3.9.0"
523523
helm_timeout: 1200
524524
context: CodacyDocker
525525
docker_username: $DOCKER_USER
@@ -605,54 +605,13 @@ workflows:
605605
context: CodacyDO
606606
requires:
607607
- setup_release_db_values
608-
- codacy/microk8s_install:
609-
name: install_k8s-1.15_helm-3.2
610-
helm_repo: "https://charts.codacy.com/incubator"
611-
chart_version: $(cat .version)
612-
microk8s_channel: "1.15/stable"
613-
helm_version: "v3.2.1"
614-
helm_timeout: 1200
615-
context: CodacyDocker
616-
docker_username: $DOCKER_USER
617-
docker_password: $DOCKER_PASS
618-
<<: *helm_values
619-
requires:
620-
- helm_push_incubator
621608

622609
- codacy/microk8s_install:
623-
name: install_k8s-1.16_helm-3.2
610+
name: install_k8s-1.19_helm-3.9
624611
helm_repo: "https://charts.codacy.com/incubator"
625612
chart_version: $(cat .version)
626-
microk8s_channel: "1.16/stable"
627-
helm_version: "v3.2.1"
628-
helm_timeout: 1200
629-
context: CodacyDocker
630-
docker_username: $DOCKER_USER
631-
docker_password: $DOCKER_PASS
632-
<<: *helm_values
633-
requires:
634-
- helm_push_incubator
635-
636-
- codacy/microk8s_install:
637-
name: install_k8s-1.17_helm-3.2
638-
helm_repo: "https://charts.codacy.com/incubator"
639-
chart_version: $(cat .version)
640-
microk8s_channel: "1.17/stable"
641-
helm_version: "v3.2.1"
642-
helm_timeout: 1200
643-
context: CodacyDocker
644-
docker_username: $DOCKER_USER
645-
docker_password: $DOCKER_PASS
646-
<<: *helm_values
647-
requires:
648-
- helm_push_incubator
649-
650-
- codacy/microk8s_install:
651-
name: install_k8s-1.18_helm-3.2
652-
helm_repo: "https://charts.codacy.com/incubator"
653-
chart_version: $(cat .version)
654-
microk8s_channel: "1.18/stable"
655-
helm_version: "v3.2.1"
613+
microk8s_channel: "1.19/stable"
614+
helm_version: "v3.9.0"
656615
helm_timeout: 1200
657616
context: CodacyDocker
658617
docker_username: $DOCKER_USER
@@ -662,11 +621,11 @@ workflows:
662621
- helm_push_incubator
663622

664623
- codacy/microk8s_install:
665-
name: install_k8s-1.19_helm-3.2
624+
name: install_k8s-1.20_helm-3.9
666625
helm_repo: "https://charts.codacy.com/incubator"
667626
chart_version: $(cat .version)
668-
microk8s_channel: "1.19/stable"
669-
helm_version: "v3.2.1"
627+
microk8s_channel: "1.20/stable"
628+
helm_version: "v3.9.0"
670629
helm_timeout: 1200
671630
context: CodacyDocker
672631
docker_username: $DOCKER_USER
@@ -676,11 +635,11 @@ workflows:
676635
- helm_push_incubator
677636

678637
- codacy/microk8s_install:
679-
name: install_k8s-1.20_helm-3.2
638+
name: install_k8s-1.21_helm-3.9
680639
helm_repo: "https://charts.codacy.com/incubator"
681640
chart_version: $(cat .version)
682-
microk8s_channel: "1.20/stable"
683-
helm_version: "v3.2.1"
641+
microk8s_channel: "1.21/stable"
642+
helm_version: "v3.9.0"
684643
helm_timeout: 1200
685644
context: CodacyDocker
686645
docker_username: $DOCKER_USER
@@ -690,11 +649,11 @@ workflows:
690649
- helm_push_incubator
691650

692651
- codacy/microk8s_install:
693-
name: install_k8s-1.21_helm-3.2
652+
name: install_k8s-1.22_helm-3.9
694653
helm_repo: "https://charts.codacy.com/incubator"
695654
chart_version: $(cat .version)
696-
microk8s_channel: "1.21/stable"
697-
helm_version: "v3.2.1"
655+
microk8s_channel: "1.22/stable"
656+
helm_version: "v3.9.0"
698657
helm_timeout: 1200
699658
context: CodacyDocker
700659
docker_username: $DOCKER_USER
@@ -728,13 +687,10 @@ workflows:
728687
- test_e2e
729688
- test_api
730689
- test_apiv3
731-
- install_k8s-1.15_helm-3.2
732-
- install_k8s-1.16_helm-3.2
733-
- install_k8s-1.17_helm-3.2
734-
- install_k8s-1.18_helm-3.2
735-
- install_k8s-1.19_helm-3.2
736-
- install_k8s-1.20_helm-3.2
737-
- install_k8s-1.21_helm-3.2
690+
- install_k8s-1.19_helm-3.9
691+
- install_k8s-1.20_helm-3.9
692+
- install_k8s-1.21_helm-3.9
693+
- install_k8s-1.22_helm-3.9
738694
- manual_solutions_eng_hold:
739695
type: approval
740696
context: CodacyDO
@@ -743,13 +699,10 @@ workflows:
743699
- test_e2e
744700
- test_api
745701
- test_apiv3
746-
- install_k8s-1.15_helm-3.2
747-
- install_k8s-1.16_helm-3.2
748-
- install_k8s-1.17_helm-3.2
749-
- install_k8s-1.18_helm-3.2
750-
- install_k8s-1.19_helm-3.2
751-
- install_k8s-1.20_helm-3.2
752-
- install_k8s-1.21_helm-3.2
702+
- install_k8s-1.19_helm-3.9
703+
- install_k8s-1.20_helm-3.9
704+
- install_k8s-1.21_helm-3.9
705+
- install_k8s-1.22_helm-3.9
753706
- set_chart_version_release:
754707
context: CodacyDO
755708
requires:

codacy/requirements-dev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies:
1919
global.metricsdb.create, global.filestoredb.create, global.jobsdb.create
2020

2121
- name: log-router
22-
version: 0.6.3
22+
version: 0.6.4
2323
repository: https://charts.codacy.com/external
2424
condition: fluentdoperator.enabled
2525
alias: fluentdoperator

codacy/requirements.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies:
1919
global.metricsdb.create, global.filestoredb.create, global.jobsdb.create
2020

2121
- name: log-router
22-
version: 0.6.3
22+
version: 0.6.4
2323
repository: https://charts.codacy.com/external
2424
condition: fluentdoperator.enabled
2525
alias: fluentdoperator

codacy/values.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,9 +248,12 @@ codacy-ingress:
248248
nginx.ingress.kubernetes.io/use-regex: "true"
249249
extraPaths:
250250
- backend:
251-
serviceName: codacy-crow
252-
servicePort: http
251+
service:
252+
name: codacy-crow
253+
port:
254+
name: http
253255
path: /monitoring
256+
pathType: ImplementationSpecific
254257

255258
## If you set this to be enabled: true, you must clean up the fluentd job yourself
256259
fluentdoperator:

docs/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Install Codacy on an existing cluster using our Helm chart:
4949
!!! important
5050
**If you're using MicroK8s** you don't need to install kubectl because you will execute all `kubectl` commands as `microk8s.kubectl` commands instead. To simplify this, [check how to create an alias](infrastructure/microk8s-quickstart.md#notes-on-installing-codacy) for `kubectl`.
5151

52-
- [Helm](https://helm.sh/docs/intro/install/) version >= 3.2
52+
- [Helm](https://helm.sh/docs/intro/install/) version >= 3.9
5353

5454
2. Create a cluster namespace called `codacy` that will group all resources related to Codacy.
5555

docs/requirements.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ The cluster running Codacy must satisfy the following requirements:
2222

2323
- The infrastructure hosting the cluster must be provisioned with the hardware and networking requirements described below
2424
- The orchestration platform managing the cluster must be one of:
25-
- [Kubernetes](https://kubernetes.io/) **version 1.15.\*** to **1.20.\*** (1.20 recommended)
26-
- [MicroK8s](https://microk8s.io/) **version 1.15.\*** to **1.19.\*** (1.19 recommended)
25+
- [Kubernetes](https://kubernetes.io/) **version 1.19.\*** to **1.21.\*** (1.21 recommended)
26+
- [MicroK8s](https://microk8s.io/) **version 1.19.\*** to **1.21.\*** (1.19 recommended)
2727
- The [NGINX Ingress controller](https://github.com/kubernetes/ingress-nginx) must be installed and correctly set up in the cluster
2828

2929
### Cluster networking requirements

0 commit comments

Comments
 (0)