Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update to start the switch to add kube-ovn and multus as the al… #50

Merged
merged 3 commits into from
Apr 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- https://raw.githubusercontent.com/argoproj/argo-cd/v2.10.0/manifests/install.yaml
- https://raw.githubusercontent.com/argoproj/argo-cd/v2.10.5/manifests/install.yaml

namespace: argocd
labels:
Expand Down
2 changes: 1 addition & 1 deletion gitops/base-install/argocd/ha-install/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- https://raw.githubusercontent.com/argoproj/argo-cd/v2.10.0/manifests/ha/install.yaml
- https://raw.githubusercontent.com/argoproj/argo-cd/v2.10.5/manifests/ha/install.yaml


namespace: argocd
Expand Down
3 changes: 2 additions & 1 deletion gitops/base-install/cert-manager/install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
source:
chart: cert-manager
repoURL: https://charts.jetstack.io
targetRevision: 1.13.2
targetRevision: 1.14.4
helm:
releaseName: cert-manager
valuesObject:
Expand All @@ -35,6 +35,7 @@ spec:
cpu: "15m"
memory: "105M"
webhook:
hostNetwork: true
resources:
requests:
cpu: "15m"
Expand Down
2 changes: 1 addition & 1 deletion gitops/base-install/ingress-controller/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
resources:
- ./resources.yaml
- https://raw.githubusercontent.com/kubernetes/ingress-nginx/helm-chart-4.8.3/deploy/static/provider/aws/deploy.yaml
- https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.10.0/deploy/static/provider/aws/deploy.yaml

patches:
- path: overlays/ingress-class-nginx-patch.yaml
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
- {op: add, path: /spec/template/spec/containers/0/args/-, value: --enable-ssl-passthrough}
- {op: replace, path: /spec/template/spec/containers/0/resources/requests/memory, value: 110M}
- {op: add, path: /spec/template/spec/hostNetwork, value: true}
#- {op: add, path: /spec/template/spec/containers/0/resources/limits/memory, value: 110M}
3 changes: 2 additions & 1 deletion gitops/base-install/ingress-controller/resources.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ spec:
source:
chart: aws-load-balancer-controller
repoURL: https://aws.github.io/eks-charts
targetRevision: 1.6.2
targetRevision: 1.7.1
helm:
releaseName: aws-load-balancer-controller
valuesObject:
hostNetwork: true
serviceAccount:
create: "true"
name: "aws-load-balancer-controller"
Expand Down
21 changes: 0 additions & 21 deletions gitops/components/cilium/kustomization.yaml

This file was deleted.

34 changes: 0 additions & 34 deletions gitops/components/cilium/resources.yaml

This file was deleted.

20 changes: 0 additions & 20 deletions gitops/components/image-updater/kustomization.yaml

This file was deleted.

53 changes: 0 additions & 53 deletions gitops/components/image-updater/resources.yaml

This file was deleted.

3 changes: 2 additions & 1 deletion gitops/components/karpenter/resources.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@ spec:
source:
chart: karpenter
repoURL: public.ecr.aws/karpenter
targetRevision: v0.34.0
targetRevision: v0.35.2
helm:
releaseName: karpenter
valuesObject:
hostNetwork: true
controller:
image:
repository: ghcr.io/pelotech/karpenter
Expand Down
23 changes: 23 additions & 0 deletions gitops/components/kube-ovn/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

helmCharts:
- name: kube-ovn
includeCRDs: true
valuesInline:
MASTER_NODES: "172.16.0.48,172.16.1.10" # sample options - do not use this except for future example
replicaCount: "2" # sample options - do not use this except for future example
releaseName: kube-ovn
version: v1.12.11
repo: https://kubeovn.github.io/kube-ovn

patches:
- target:
group: argoproj.io
version: v1alpha1
kind: AppProject
name: admins
patch: |-
- op: add
path: /spec/sourceRepos/-
value: https://kubeovn.github.io/kube-ovn
29 changes: 23 additions & 6 deletions gitops/components/multus/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,31 @@ apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component

resources:
- ./resources.yaml
- https://raw.githubusercontent.com/k8snetworkplumbingwg/multus-cni/v4.0.2/deployments/multus-daemonset.yml

images:
- name: ghcr.io/k8snetworkplumbingwg/multus-cni
newTag: v4.0.2

patches:
- target:
group: apps
version: v1
kind: DaemonSet
name: kube-multus-ds
path: ./overlays/multus-daemonset-tolerations.yaml
- target:
group: apps
version: v1
kind: DaemonSet
name: kube-multus-ds
path: ./overlays/multus-daemonset-readiness.yaml
- target:
group: apps
version: v1
kind: DaemonSet
name: kube-multus-ds
path: ./overlays/multus-daemonset-container-args.yaml
- target:
group: argoproj.io
version: v1alpha1
Expand All @@ -14,8 +36,3 @@ patches:
- op: add
path: /spec/sourceRepos/-
value: registry-1.docker.io/bitnamicharts
- op: add
path: /spec/destinations/-
value:
namespace: nidhogg-system
server: https://kubernetes.default.svc
29 changes: 0 additions & 29 deletions gitops/components/multus/kustomize/kustomization.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ spec:
template:
spec:
tolerations:
- key: nidhogg.uswitch.com/kube-system.kube-multus-ds
- effect: NoSchedule
operator: Exists
- key: pelo.tech/uki-labs
- effect: NoExecute
operator: Exists
nodeSelector:
pelo.tech/multi-home-networking: "true"
19 changes: 0 additions & 19 deletions gitops/components/multus/resources.yaml

This file was deleted.

12 changes: 11 additions & 1 deletion gitops/components/nidhogg/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,19 @@ apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component

resources:
- ./resources.yaml
- https://github.com/pelotech/nidhogg//kustomize?ref=v0.5.1

patches:
- path: overlays/nidhogg-controller-manager.yaml
target:
group: apps
kind: StatefulSet
name: nidhogg-controller-manager
version: v1
- path: overlays/nidhogg-config-patch.yaml
target:
kind: ConfigMap
name: nidhogg-config
- target:
group: argoproj.io
version: v1alpha1
Expand Down
19 changes: 0 additions & 19 deletions gitops/components/nidhogg/kustomize/kustomization.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ data:
"taintNamePrefix": "nidhogg.uswitch.com",
"taintRemovalDelayInSeconds": 10,
"nodeSelector": [
"pelo.tech/multi-home-networking"
"kubernetes.io/os=linux"
],
"daemonsets": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@
operator: Exists
- key: CriticalAddonsOnly
operator: Exists
- op: add
path: /spec/template/spec/hostNetwork
value: true
Loading