Skip to content

Commit dbb14bd

Browse files
authored
feat: do not use tigera-operator for native network policies (#341)
1 parent 69dfd23 commit dbb14bd

File tree

6 files changed

+22
-140
lines changed

6 files changed

+22
-140
lines changed

docs/FAQ.md

Lines changed: 19 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
# Table of content
22

33
<!-- TOC -->
4-
* [EKS Upgrading](#eks-upgrading)
5-
* [K8S namespace features:](#k8s-namespace-features-)
6-
* [Gitlab-runner](#gitlab-runner)
7-
* [How to add more restrictions for Gitlab-Runner](#how-to-add-more-restrictions-for-gitlab-runner)
8-
* [Monitoring](#monitoring)
9-
* [Grafana: How to add GitHub/Gitlab OAuth2 Authentication:](#grafana--how-to-add-githubgitlab-oauth2-authentication-)
10-
* [Alertmanager](#alertmanager)
11-
* [If you want to receive alerts **via Slack**, then do next:](#if-you-want-to-receive-alerts-via-slack--then-do-next-)
12-
* [Deleting Tigera-operator](#deleting-tigera-operator)
13-
* [What if you don't want to use an aws-load-balancer controller in front of an ingress-nginx and want to use a cert-manager and terminate SSL on ingres-nginx side](#what-if-you-dont-want-to-use-an-aws-load-balancer-controller-in-front-of-an-ingress-nginx-and-want-to-use-a-cert-manager-and-terminate-ssl-on-ingres-nginx-side)
14-
* [Apply using terraform](#apply-using-terraform)
15-
* [S3 state backend](#s3-state-backend)
16-
* [Inputs](#inputs)
17-
* [init](#init)
18-
* [plan](#plan)
19-
* [apply](#apply)
20-
* [Update terraform version](#update-terraform-version)
21-
* [Update terraform providers](#update-terraform-providers)
22-
* [Update terragrunt version](#update-terragrunt-version)
4+
- [Table of content](#table-of-content)
5+
- [EKS Upgrading](#eks-upgrading)
6+
- [K8S namespace features:](#k8s-namespace-features)
7+
- [Gitlab-runner](#gitlab-runner)
8+
- [How to add more restrictions for Gitlab-Runner](#how-to-add-more-restrictions-for-gitlab-runner)
9+
- [Monitoring](#monitoring)
10+
- [Grafana: How to add GitHub/Gitlab OAuth2 Authentication:](#grafana-how-to-add-githubgitlab-oauth2-authentication)
11+
- [Alertmanager](#alertmanager)
12+
- [If you want to receive alerts **via Slack**, then do next:](#if-you-want-to-receive-alerts-via-slack-then-do-next)
13+
- [What if you don't want to use an aws-load-balancer controller in front of an ingress-nginx and want to use a cert-manager and terminate SSL on ingres-nginx side](#what-if-you-dont-want-to-use-an-aws-load-balancer-controller-in-front-of-an-ingress-nginx-and-want-to-use-a-cert-manager-and-terminate-ssl-on-ingres-nginx-side)
14+
- [Apply using terraform](#apply-using-terraform)
15+
- [S3 state backend](#s3-state-backend)
16+
- [Inputs](#inputs)
17+
- [init](#init)
18+
- [plan](#plan)
19+
- [apply](#apply)
20+
- [Update terraform version](#update-terraform-version)
21+
- [Update terraform providers](#update-terraform-providers)
22+
- [Update terragrunt version](#update-terragrunt-version)
2323
<!-- TOC -->
2424

2525
## EKS Upgrading
@@ -327,22 +327,6 @@ Alertmanager is disabled in default installation. If you want to enable it, then
327327
* See [this instruction](https://slack.com/help/articles/115005265063-Incoming-webhooks-for-Slack) and generate Slack Incoming Webhook
328328
* Set `alertmanager_slack_webhook`, `alertmanager_slack_channel` variables in [AWS Secrets Manager](https://console.aws.amazon.com/secretsmanager/home?region=us-east-1#!/home) secret with the pattern `/${local.name_wo_region}/infra/layer2-k8s`.
329329

330-
## Deleting Tigera-operator
331-
1. Run:
332-
333-
```bash
334-
$ kubectl delete installations.operator.tigera.io default
335-
```
336-
337-
2. Set `enabled: false` for `id: tigera-operator` in the file **helm-releases.yaml**
338-
3. Run `terraform apply` in the layer2-k8s folder
339-
4. Run:
340-
341-
```bash
342-
$ kubectl delete ns calico-apiserver calico-system
343-
```
344-
5. Restart all nodes
345-
346330
## What if you don't want to use an aws-load-balancer controller in front of an ingress-nginx and want to use a cert-manager and terminate SSL on ingres-nginx side
347331

348332
1. Set `nginx ` for a `nginx_ingress_ssl_terminator` variable in the layer2-k8s folder

terraform/layer1-aws/aws-eks.tf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ module "eks" {
4646
vpc-cni = {
4747
most_recent = true
4848
service_account_role_arn = module.vpc_cni_irsa.iam_role_arn
49+
configuration_values = jsonencode({
50+
enableNetworkPolicy = "true"
51+
})
4952
}
5053
aws-ebs-csi-driver = {
5154
most_recent = true

terraform/layer2-k8s/README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
| <a name="module_kube_prometheus_stack_namespace"></a> [kube\_prometheus\_stack\_namespace](#module\_kube\_prometheus\_stack\_namespace) | ../modules/eks-kubernetes-namespace | n/a |
5151
| <a name="module_loki_namespace"></a> [loki\_namespace](#module\_loki\_namespace) | ../modules/eks-kubernetes-namespace | n/a |
5252
| <a name="module_reloader_namespace"></a> [reloader\_namespace](#module\_reloader\_namespace) | ../modules/eks-kubernetes-namespace | n/a |
53-
| <a name="module_tigera_operator_namespace"></a> [tigera\_operator\_namespace](#module\_tigera\_operator\_namespace) | ../modules/eks-kubernetes-namespace | n/a |
5453
| <a name="module_victoria_metrics_k8s_stack_namespace"></a> [victoria\_metrics\_k8s\_stack\_namespace](#module\_victoria\_metrics\_k8s\_stack\_namespace) | ../modules/eks-kubernetes-namespace | n/a |
5554

5655
## Resources
@@ -85,9 +84,7 @@
8584
| [helm_release.loki_stack](https://registry.terraform.io/providers/hashicorp/helm/2.6.0/docs/resources/release) | resource |
8685
| [helm_release.prometheus_operator](https://registry.terraform.io/providers/hashicorp/helm/2.6.0/docs/resources/release) | resource |
8786
| [helm_release.reloader](https://registry.terraform.io/providers/hashicorp/helm/2.6.0/docs/resources/release) | resource |
88-
| [helm_release.tigera_operator](https://registry.terraform.io/providers/hashicorp/helm/2.6.0/docs/resources/release) | resource |
8987
| [helm_release.victoria_metrics_k8s_stack](https://registry.terraform.io/providers/hashicorp/helm/2.6.0/docs/resources/release) | resource |
90-
| [kubectl_manifest.calico_felix](https://registry.terraform.io/providers/gavinbunney/kubectl/1.14.0/docs/resources/manifest) | resource |
9188
| [kubectl_manifest.istio_prometheus_service_monitor_cp](https://registry.terraform.io/providers/gavinbunney/kubectl/1.14.0/docs/resources/manifest) | resource |
9289
| [kubectl_manifest.istio_prometheus_service_monitor_dp](https://registry.terraform.io/providers/gavinbunney/kubectl/1.14.0/docs/resources/manifest) | resource |
9390
| [kubectl_manifest.kube_prometheus_stack_operator_crds](https://registry.terraform.io/providers/gavinbunney/kubectl/1.14.0/docs/resources/manifest) | resource |

terraform/layer2-k8s/eks-tigera-operator.tf

Lines changed: 0 additions & 95 deletions
This file was deleted.

terraform/layer2-k8s/eks-victoria-metrics-k8s-stack.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,6 @@ resource "helm_release" "victoria_metrics_k8s_stack" {
531531

532532
depends_on = [
533533
kubectl_manifest.kube_prometheus_stack_operator_crds,
534-
helm_release.tigera_operator,
535534
helm_release.ingress_nginx
536535
]
537536

terraform/layer2-k8s/helm-releases.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,6 @@ releases:
101101
repository: https://stakater.github.io/stakater-charts
102102
chart_version: 1.0.22
103103
namespace: reloader
104-
- id: tigera-operator
105-
enabled: true
106-
chart: tigera-operator
107-
repository: https://projectcalico.docs.tigera.io/charts
108-
chart_version: v3.25.0
109-
namespace: tigera-operator
110104
- id: victoria-metrics-k8s-stack
111105
enabled: false
112106
chart: victoria-metrics-k8s-stack

0 commit comments

Comments
 (0)