Skip to content

Commit

Permalink
Merge pull request 'AWS related updates for ClusterAPI' (#361) from c…
Browse files Browse the repository at this point in the history
…lusterapi-aws-updates into master

Reviewed-on: https://gitea.obmondo.com/EnableIT/KubeAid/pulls/361
  • Loading branch information
Klavs Klavsen committed Aug 27, 2024
2 parents 7c970c3 + 9c22d85 commit 47683ae
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 32 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,19 @@ spec:
network:
vpc:
cidrBlock: {{ .Values.vpc.cidrBlock }}
cni:
cniIngressRules:
- description: Cilium
protocol: "tcp"
fromPort: 4240
toPort: 4240
- description: Cilium VXLAN overlay
protocol: "udp"
fromPort: 8472
toPort: 8472
- description: Cilium health checks
protocol: "icmp"
fromPort: 8
toPort: 8
controlPlaneLoadBalancer:
loadBalancerType: {{ .Values.controlPlane.loadBalancerType }}
5 changes: 4 additions & 1 deletion argocd-helm-charts/capi-cluster/templates/cert-manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,13 @@ spec:
chartName: cert-manager
namespace: cert-manager
releaseName: cert-manager
version: v1.14.3
version: v1.15.2
options:
waitForJobs: true
wait: true
timeout: 5m0s
install:
createNamespace: true
valuesTemplate: |
crds:
enabled: true
13 changes: 12 additions & 1 deletion argocd-helm-charts/capi-cluster/templates/cilium.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
chartName: cilium
namespace: cilium
releaseName: cilium
version: 1.15.3
version: 1.16.0
options:
waitForJobs: true
wait: true
Expand All @@ -30,6 +30,17 @@ spec:
mode: "kubernetes"
rollOutCiliumPods: true
priorityClassName: "system-node-critical"
# Uncomment to enable Cilium NetKit feature.
# NOTE : Works for Linux Kernel version 6.7 and above.
# routingMode: native
# bpf:
# masquerade: true
# datapathMode: netkit
# autoDirectNodeRoutes: true
# ipv4NativeRoutingCIDR: {{`{{ .AWSCluster.spec.network.vpc.cidrBlock }}`}}
# directRoutingSkipUnreachable: true
hubble:
metrics:
enabled:
Expand Down
30 changes: 0 additions & 30 deletions argocd-helm-charts/capi-cluster/templates/cluster-api.yaml

This file was deleted.

0 comments on commit 47683ae

Please sign in to comment.