From 397323fec0c6e2057105cafb43d8a7be55fa9e78 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 22 Jul 2025 11:10:28 +0000 Subject: [PATCH 1/8] feat(docker-image)!: Update nginx Docker tag to v21 --- templates/image-server/nginx/helmrelease.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/image-server/nginx/helmrelease.yaml b/templates/image-server/nginx/helmrelease.yaml index 0937d41..ecbc88f 100644 --- a/templates/image-server/nginx/helmrelease.yaml +++ b/templates/image-server/nginx/helmrelease.yaml @@ -9,7 +9,7 @@ spec: chart: spec: chart: nginx - version: 19.1.1 + version: 21.0.8 sourceRef: kind: HelmRepository name: bitnami From 5db658f6398818082127152d527e20d5cfe104cf Mon Sep 17 00:00:00 2001 From: Efstratios Kolovos Date: Tue, 22 Jul 2025 13:12:49 +0200 Subject: [PATCH 2/8] Add test-connectivity --- firewall-s3/ks-vm.yaml | 2 +- kustomization.yaml | 1 + .../loadbalancers/fortigate-wan.yaml | 0 .../network-definitions/lan.yaml | 0 .../network-definitions/mgmt.yaml | 0 .../app}/test-connectivity/vm/fortigate.yaml | 0 .../app}/test-connectivity/vm/strongswan.yaml | 0 test-connectivity/ks.yaml | 18 ++++++++++++++++++ 8 files changed, 20 insertions(+), 1 deletion(-) rename {firewall-s3 => test-connectivity/app}/test-connectivity/loadbalancers/fortigate-wan.yaml (100%) rename {firewall-s3 => test-connectivity/app}/test-connectivity/network-definitions/lan.yaml (100%) rename {firewall-s3 => test-connectivity/app}/test-connectivity/network-definitions/mgmt.yaml (100%) rename {firewall-s3 => test-connectivity/app}/test-connectivity/vm/fortigate.yaml (100%) rename {firewall-s3 => test-connectivity/app}/test-connectivity/vm/strongswan.yaml (100%) create mode 100644 test-connectivity/ks.yaml diff --git a/firewall-s3/ks-vm.yaml b/firewall-s3/ks-vm.yaml index 827133e..61e2924 100644 --- a/firewall-s3/ks-vm.yaml +++ b/firewall-s3/ks-vm.yaml @@ -7,7 +7,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./firewall-s3 + path: ./firewall-s3/vm/ksd prune: true sourceRef: kind: GitRepository diff --git a/kustomization.yaml b/kustomization.yaml index 8aec8be..56390ef 100644 --- a/kustomization.yaml +++ b/kustomization.yaml @@ -7,6 +7,7 @@ resources: - firewall/ks-vm.yaml - firewall-dev/ks-vm.yaml - firewall-s3/ks-vm.yaml + - test-connectivity/ks.yaml - windows-vm-standard/ks-vm.yaml - windows-vm-standard/ks-pvc.yaml - windows-vm-standard-dev/ks-vm.yaml diff --git a/firewall-s3/test-connectivity/loadbalancers/fortigate-wan.yaml b/test-connectivity/app/test-connectivity/loadbalancers/fortigate-wan.yaml similarity index 100% rename from firewall-s3/test-connectivity/loadbalancers/fortigate-wan.yaml rename to test-connectivity/app/test-connectivity/loadbalancers/fortigate-wan.yaml diff --git a/firewall-s3/test-connectivity/network-definitions/lan.yaml b/test-connectivity/app/test-connectivity/network-definitions/lan.yaml similarity index 100% rename from firewall-s3/test-connectivity/network-definitions/lan.yaml rename to test-connectivity/app/test-connectivity/network-definitions/lan.yaml diff --git a/firewall-s3/test-connectivity/network-definitions/mgmt.yaml b/test-connectivity/app/test-connectivity/network-definitions/mgmt.yaml similarity index 100% rename from firewall-s3/test-connectivity/network-definitions/mgmt.yaml rename to test-connectivity/app/test-connectivity/network-definitions/mgmt.yaml diff --git a/firewall-s3/test-connectivity/vm/fortigate.yaml b/test-connectivity/app/test-connectivity/vm/fortigate.yaml similarity index 100% rename from firewall-s3/test-connectivity/vm/fortigate.yaml rename to test-connectivity/app/test-connectivity/vm/fortigate.yaml diff --git a/firewall-s3/test-connectivity/vm/strongswan.yaml b/test-connectivity/app/test-connectivity/vm/strongswan.yaml similarity index 100% rename from firewall-s3/test-connectivity/vm/strongswan.yaml rename to test-connectivity/app/test-connectivity/vm/strongswan.yaml diff --git a/test-connectivity/ks.yaml b/test-connectivity/ks.yaml new file mode 100644 index 0000000..2093015 --- /dev/null +++ b/test-connectivity/ks.yaml @@ -0,0 +1,18 @@ +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: &app test-connectivity + namespace: ${TENANT_NAMESPACE} +spec: + commonMetadata: + labels: + app.kubernetes.io/name: *app + path: ./test-connectivity/app + prune: true + sourceRef: + kind: GitRepository + name: tenant-repos + wait: false + interval: 30m + retryInterval: 1m + timeout: 5m \ No newline at end of file From 46b01088281198da1dd37706599f40ad3002e489 Mon Sep 17 00:00:00 2001 From: Efstratios Kolovos Date: Tue, 22 Jul 2025 13:20:26 +0200 Subject: [PATCH 3/8] Remove obsolete apps --- kustomization.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/kustomization.yaml b/kustomization.yaml index 56390ef..b6c706e 100644 --- a/kustomization.yaml +++ b/kustomization.yaml @@ -4,8 +4,6 @@ resources: - vars/ks.yaml - repos/ks.yaml - network/ks-lb.yaml - - firewall/ks-vm.yaml - - firewall-dev/ks-vm.yaml - firewall-s3/ks-vm.yaml - test-connectivity/ks.yaml - windows-vm-standard/ks-vm.yaml From 7a9b3176e819a96d8a8b78faf41e32b51d3fc1f3 Mon Sep 17 00:00:00 2001 From: Efstratios Kolovos Date: Tue, 22 Jul 2025 14:21:11 +0200 Subject: [PATCH 4/8] Add overlay lan --- .../network-definitions/lan.yaml | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/test-connectivity/app/test-connectivity/network-definitions/lan.yaml b/test-connectivity/app/test-connectivity/network-definitions/lan.yaml index 1c32a21..e217374 100644 --- a/test-connectivity/app/test-connectivity/network-definitions/lan.yaml +++ b/test-connectivity/app/test-connectivity/network-definitions/lan.yaml @@ -1,20 +1,20 @@ -# apiVersion: "k8s.cni.cncf.io/v1" -# kind: NetworkAttachmentDefinition -# metadata: -# name: lan-net -# namespace: ${TENANT_NAMESPACE} -# spec: -# config: '{ -# "cniVersion": "0.3.1", -# "type": "bridge", -# "bridge": "br-lan", -# "ipam": { -# "type": "static", -# "addresses": [ -# { -# "address": "172.168.100.2/24", -# "gateway": "172.168.100.1" -# } -# ] -# } -# }' \ No newline at end of file +apiVersion: k8s.cni.cncf.io/v1 +kind: NetworkAttachmentDefinition +metadata: + name: lan-ovn-160 + namespace: net-demo +spec: + config: | + { + "cniVersion": "0.3.1", + "type": "ovn-k8s-cni-overlay", + "name": "lan-ovn-160", + "topology": "layer2", + "subnets": [ + {"cidr": "192.168.160.0/24"} + ], + "mtu": 1400, + "routes": [ + {"dst": "10.60.0.0/16", "gw": "192.168.10.1"}, + ] + } From 7a00f2dac7806dfd71fc91c58147c987ea827481 Mon Sep 17 00:00:00 2001 From: Efstratios Kolovos Date: Tue, 22 Jul 2025 14:22:17 +0200 Subject: [PATCH 5/8] Add overlay lan --- .../app/test-connectivity/network-definitions/lan.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-connectivity/app/test-connectivity/network-definitions/lan.yaml b/test-connectivity/app/test-connectivity/network-definitions/lan.yaml index e217374..21a7896 100644 --- a/test-connectivity/app/test-connectivity/network-definitions/lan.yaml +++ b/test-connectivity/app/test-connectivity/network-definitions/lan.yaml @@ -15,6 +15,6 @@ spec: ], "mtu": 1400, "routes": [ - {"dst": "10.60.0.0/16", "gw": "192.168.10.1"}, + {"dst": "10.60.0.0/16", "gw": "192.168.10.1"} ] } From 48fbc4531967040861602ad9f3bf33e866f77cc5 Mon Sep 17 00:00:00 2001 From: Efstratios Kolovos Date: Tue, 22 Jul 2025 14:37:22 +0200 Subject: [PATCH 6/8] Add overlay lan --- .../network-definitions/lan.yaml | 1 - .../app/test-connectivity/pod/pod.yaml | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 test-connectivity/app/test-connectivity/pod/pod.yaml diff --git a/test-connectivity/app/test-connectivity/network-definitions/lan.yaml b/test-connectivity/app/test-connectivity/network-definitions/lan.yaml index 21a7896..16d40cc 100644 --- a/test-connectivity/app/test-connectivity/network-definitions/lan.yaml +++ b/test-connectivity/app/test-connectivity/network-definitions/lan.yaml @@ -2,7 +2,6 @@ apiVersion: k8s.cni.cncf.io/v1 kind: NetworkAttachmentDefinition metadata: name: lan-ovn-160 - namespace: net-demo spec: config: | { diff --git a/test-connectivity/app/test-connectivity/pod/pod.yaml b/test-connectivity/app/test-connectivity/pod/pod.yaml new file mode 100644 index 0000000..2042753 --- /dev/null +++ b/test-connectivity/app/test-connectivity/pod/pod.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: Pod +metadata: + name: dualnet-pod-ovn + annotations: + k8s.v1.cni.cncf.io/networks: | + [ + { + "name": "lan-ovn-160", + "namespace": "${TENANT_NAMESPACE}", + "interface": "net1", + } + ] +spec: + containers: + - name: toolbox + image: quay.io/centos/centos:stream9 + command: [ "/bin/bash", "-c", "sleep infinity" ] + restartPolicy: Never \ No newline at end of file From 73ee627f99f5b08c882a1ccd6f7f92bb2315b955 Mon Sep 17 00:00:00 2001 From: Efstratios Kolovos Date: Tue, 22 Jul 2025 14:39:27 +0200 Subject: [PATCH 7/8] Add overlay lan --- test-connectivity/app/test-connectivity/pod/pod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-connectivity/app/test-connectivity/pod/pod.yaml b/test-connectivity/app/test-connectivity/pod/pod.yaml index 2042753..44792b8 100644 --- a/test-connectivity/app/test-connectivity/pod/pod.yaml +++ b/test-connectivity/app/test-connectivity/pod/pod.yaml @@ -8,7 +8,7 @@ metadata: { "name": "lan-ovn-160", "namespace": "${TENANT_NAMESPACE}", - "interface": "net1", + "interface": "net1" } ] spec: From b717090045d71b83e8d4d544e867afe861c7ad6c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 22 Jul 2025 13:12:22 +0000 Subject: [PATCH 8/8] feat(docker-image)!: Update nginx Docker tag to v21 --- templates/image-server/nginx/helmrelease.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/image-server/nginx/helmrelease.yaml b/templates/image-server/nginx/helmrelease.yaml index 0937d41..ecbc88f 100644 --- a/templates/image-server/nginx/helmrelease.yaml +++ b/templates/image-server/nginx/helmrelease.yaml @@ -9,7 +9,7 @@ spec: chart: spec: chart: nginx - version: 19.1.1 + version: 21.0.8 sourceRef: kind: HelmRepository name: bitnami