Граф коммитов

2468 Коммитов

Автор SHA1 Сообщение Дата
QxBytes 6463342435
ci: enable state validation in linux cni v1 (#2898) 2024-08-07 16:24:56 +00:00
QxBytes fc4da42d66
refactor: create safer command execution method (#2899)
* rename ExecuteCommand to ExecuteRawCommand

* add safer execute command method

* fix windows platform command test

* add uts and comments

* address feedback

* add parent context to execute command
2024-08-06 21:36:55 +00:00
dependabot[bot] 277aad594e
deps: bump golang.org/x/time from 0.5.0 to 0.6.0 (#2897)
Bumps [golang.org/x/time](https://github.com/golang/time) from 0.5.0 to 0.6.0.
- [Commits](https://github.com/golang/time/compare/v0.5.0...v0.6.0)

---
updated-dependencies:
- dependency-name: golang.org/x/time
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-06 21:04:27 +00:00
dependabot[bot] 9843736bfd
deps: bump golang.org/x/sync from 0.7.0 to 0.8.0 (#2896)
Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.7.0 to 0.8.0.
- [Commits](https://github.com/golang/sync/compare/v0.7.0...v0.8.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sync
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-06 21:04:18 +00:00
dependabot[bot] c4b38d4fea
deps: bump golang.org/x/sys from 0.22.0 to 0.23.0 (#2895)
Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.22.0 to 0.23.0.
- [Commits](https://github.com/golang/sys/compare/v0.22.0...v0.23.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sys
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-06 16:07:45 +00:00
sivakami-projects b70d041de2
feat: Create win 2025 images for CNI and CNS using windows servercore insider tags. (#2878)
Squashed commit of all changes for win-ltsc2025
2024-08-02 23:57:50 +00:00
Kshitija Murudi 6e3d2ff6f5
fetch primary mac for hns accelnet (#2857)
* fetch primary mac for hns accelnet

* downgrade winio module

* revert winio to 0.6.2

* remove replace winio old version & separate hns call into windows-only file

* fix lint errors

* rename files

* go fmt locally

* add build tags

* moving method to platform package

* refactor files to restserver
fix fmt issues, linter

* minor comment edit

* undo azure-ipam go.mod, edit minor comments

* add log line & format better main.go

* address review comments, change ctx todo

* undo temp pipeline changes

* fix: gofumpt the file linter error
2024-07-31 01:36:38 +00:00
sheylatrudo 8fd638c11a
Add Initial Compliant Pipeline Files (#2870)
Add Minimum Required Yaml for OneBranch

Co-authored-by: Sheyla Trudo <shtrudo@microsoft.com>
2024-07-30 23:36:26 +00:00
dependabot[bot] ee4cbac1ec
deps: bump github.com/docker/docker from 24.0.9+incompatible to 26.1.4+incompatible (#2891)
deps: bump github.com/docker/docker

Bumps [github.com/docker/docker](https://github.com/docker/docker) from 24.0.9+incompatible to 26.1.4+incompatible.
- [Release notes](https://github.com/docker/docker/releases)
- [Commits](https://github.com/docker/docker/compare/v24.0.9...v26.1.4)

---
updated-dependencies:
- dependency-name: github.com/docker/docker
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-30 22:37:40 +00:00
Paul Yu c9b99ed978
Return error if hns network exists for transparent network (#2877)
* do not ignore network exist if network type is transparent

* fix the logic

* enhance log

* add log

* fix comments
2024-07-26 16:44:30 +00:00
QxBytes faac1788ea
fix: add ipv6 port policy in addition to ipv4 policy if no host ip and ipv6 enabled (#2852)
* add ipv6 port policy in addition to ipv4 policy if no host ip and ipv6 enabled

* address feedback
2024-07-26 00:38:22 +00:00
Hunter Gregory 9181fa67d0
ci: [NPM] add bash directive to scale scripts (#2876)
ci: add bash directive to scale scripts

Signed-off-by: Hunter Gregory <42728408+huntergregory@users.noreply.github.com>
2024-07-25 17:43:27 +00:00
dependabot[bot] dc80647496
deps: bump github.com/Microsoft/hcsshim from 0.12.0 to 0.12.5 (#2854)
Bumps [github.com/Microsoft/hcsshim](https://github.com/Microsoft/hcsshim) from 0.12.0 to 0.12.5.
- [Release notes](https://github.com/Microsoft/hcsshim/releases)
- [Commits](https://github.com/Microsoft/hcsshim/compare/v0.12.0...v0.12.5)

---
updated-dependencies:
- dependency-name: github.com/Microsoft/hcsshim
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-25 00:17:38 +00:00
Hunter Gregory 2688c59684
fix: [NPM] [Linux] race condition when editing NetPol with "except" CIDR (#2841)
* fix: syntax error when deleting nomatch CIDR ipset

Signed-off-by: Hunter Gregory <42728408+huntergregory@users.noreply.github.com>

* test: ut members with nomatch

Signed-off-by: Hunter Gregory <42728408+huntergregory@users.noreply.github.com>

---------

Signed-off-by: Hunter Gregory <42728408+huntergregory@users.noreply.github.com>
2024-07-24 19:22:14 +00:00
John Payne 0bdb3ab76a
ci: [NPM] NPM Conformance Test improvements (#2875)
* ci: Always delete npm conformance clusters

* test: pin k8s suite version

* ci: comment out updated cyclonus

* chore: cleanup yaml
2024-07-24 19:03:36 +00:00
dependabot[bot] 99d0f25a24
deps: bump github.com/prometheus/common from 0.46.0 to 0.55.0 (#2816)
Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.46.0 to 0.55.0.
- [Release notes](https://github.com/prometheus/common/releases)
- [Changelog](https://github.com/prometheus/common/blob/main/RELEASE.md)
- [Commits](https://github.com/prometheus/common/compare/v0.46.0...v0.55.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/common
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-24 17:28:35 +00:00
dependabot[bot] ff168d3215
deps: bump github.com/containernetworking/cni from 1.2.2 to 1.2.3 in /azure-ipam (#2873)
deps: bump github.com/containernetworking/cni in /azure-ipam

Bumps [github.com/containernetworking/cni](https://github.com/containernetworking/cni) from 1.2.2 to 1.2.3.
- [Release notes](https://github.com/containernetworking/cni/releases)
- [Commits](https://github.com/containernetworking/cni/compare/v1.2.2...v1.2.3)

---
updated-dependencies:
- dependency-name: github.com/containernetworking/cni
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-24 17:10:21 +00:00
John Payne d03edd6d88
ci: Remove winio from replace( ) (#2864)
* ci: remove winio from replace

* chore: go mod tidy
2024-07-24 16:34:58 +00:00
Jaeryn 9d83ac3a37
chore: add enable k8s device plugin to cns config (#2869)
* chore: add enable k8s device plugin to cns config

* regroup EnableK8sDevicePlugin flag with other enable bools

---------

Co-authored-by: Jaeryn <tsch@microsoft.com>
2024-07-24 14:48:50 +00:00
Hunter Gregory c561c895fe
ci: [NPM] speed up Windows conformance and disable Windows Cyclonus/Scale (#2874)
* ci: comment out windows cyclonus and windows scale test

Signed-off-by: Hunter Gregory <42728408+huntergregory@users.noreply.github.com>

* ci: slim down windows conformance to 14 tests

Signed-off-by: Hunter Gregory <42728408+huntergregory@users.noreply.github.com>

* ci: make sure conformance skips "Linux Only"

Signed-off-by: Hunter Gregory <42728408+huntergregory@users.noreply.github.com>

* ci: conformance was not running test cases due to formatting

Signed-off-by: Hunter Gregory <42728408+huntergregory@users.noreply.github.com>

---------

Signed-off-by: Hunter Gregory <42728408+huntergregory@users.noreply.github.com>
2024-07-24 01:57:02 +00:00
John Payne 0a48278af5
ci: update Cyclonus workflow triggers (#2868)
ci: update Cyclonus triggers
2024-07-22 22:27:08 +00:00
dependabot[bot] db4e427234
deps: bump github.com/Azure/azure-sdk-for-go/sdk/azcore from 1.12.0 to 1.13.0 (#2859)
deps: bump github.com/Azure/azure-sdk-for-go/sdk/azcore

Bumps [github.com/Azure/azure-sdk-for-go/sdk/azcore](https://github.com/Azure/azure-sdk-for-go) from 1.12.0 to 1.13.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-go/releases)
- [Changelog](https://github.com/Azure/azure-sdk-for-go/blob/main/documentation/release.md)
- [Commits](https://github.com/Azure/azure-sdk-for-go/compare/sdk/azcore/v1.12.0...sdk/azcore/v1.13.0)

---
updated-dependencies:
- dependency-name: github.com/Azure/azure-sdk-for-go/sdk/azcore
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-22 21:45:11 +00:00
John Payne e28500c0af
ci: Update triggers for NPM pipelines (#2867)
ci: add triggers to npm pipelines
2024-07-22 19:25:45 +00:00
John Payne f5ca48267e
[fix] ci: update cyclonus workflow (#2866)
ci: update cyclonus workflow
2024-07-21 18:51:53 +00:00
John Payne b29bdac938
ci: Shift E2E cluster creation (#2862)
* ci: shift cluster creation

* chore: change depends on for release test
2024-07-19 16:04:05 +00:00
QxBytes a33e3574bc
test: validate inputs to acn components (#2845)
* add validation for cni args and cns request values

* address feedback

* simplify regex match
2024-07-19 15:59:41 +00:00
aggarwal0009 f7b6e8b8c2
Add MacAddress to NodeInfo CRD (#2843)
* add macAddressList to NI CRD

* address pr comments
2024-07-18 21:36:36 +00:00
msvik 6c50d0dcdd
feat: Add CNS API to retrieve VMUniqueID from IMDS (#2842)
* Add CNS API to retrieve VMUniqueID from IMDS

* Address the PR review comments

* Address the security comment from Evans to expose this API wherever needed

* fixed the linter error

* address the PR comments from Matt

* lowercase the struct json fields
2024-07-18 21:32:02 +00:00
John Payne 0d294720c7
ci: Unblock nightly pipeline (#2863)
ci: update nightly pipeline
2024-07-18 18:30:39 +00:00
John Payne d814424fbe
ci: Cleanup ACN PR pipeline yaml (#2861)
ci: cleanup PR yaml
2024-07-18 18:30:10 +00:00
QxBytes 469afea07c
test: add ut for populating network and endpoint hns id in endpoint and endpoint info structs (#2844)
* validate endpoint struct after endpoint creation

* add uts to validate endpoint info and endpoint structs have hns network and endpoint id fields populated

endpoint struct should have the hns endpoint id after new endpoint
endpoint info struct should have the hns endpoint id after new endpoint as well

network struct should have the hns network id after new network
endpoint info struct should have the hns network id after new network as well

endpoint struct should have the hns network id after new endpoint if endpoint info had it

* address linter issue

* address feedback by validating info sent to cns

* modify hnsv2 wrapper behavior to only set hns id if not already set for npm uts
2024-07-17 13:26:11 +00:00
dependabot[bot] 171c75b2d5
deps: bump golang.org/x/crypto from 0.24.0 to 0.25.0 (#2834)
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.24.0 to 0.25.0.
- [Commits](https://github.com/golang/crypto/compare/v0.24.0...v0.25.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-11 16:26:10 +00:00
Paul Yu 03e0447f32
add L1VH IB support on CNI (#2762)
* add L1VH IB support on CNI

* fix IB issues

* fix UT errors

* fix linter issues

* add win 2025 support for cni image build

* add and comments

* fix a logic bug

* disable endpoint creation and deletion if it's IB NIC

* fix a linter issue

* add UTs

* add UTs for powershell

* enhance Test_getInterfaceInfoKey test case

* remove windows 2025 build from pipeline

* fix some issues

* add an UT to test pnpID

* fix an issue

* fix an ut

* add double quotes

* unblock a brunch of issues

* remove unnecessary codes

* upgradelatest upstream cnii build

* fix a log

* add windows build on pipeline temporarily

* remove backendNIC check for findMasterInterface

* add ut to confirm IB does not create endpoint

* fix linter issue that use %q

* format network.go

* add more uts to cover powershell commands

* remove windows2025 pipeline build

* enhance logs

* fix cniResult format

* add getPnpidstate func

* fix the issue for infraNIC routes

* fix the issue for infraNIC routes

* fix gateway ip address

* add get-pnpdevice UT

* add accelnetNIC support for L1VH

* enhance logic for accelnet nic netowrk flag

* enhance network windows uts

* fix bitmask operator

* use another PR for accelnet PR

* gofumpt files

* fix comments for functional codes

* add uts

* add more uts

* fix uts

* fix functional codes comments

* Update cni/network/network.go

Co-authored-by: tamilmani1989 <tamanoha@microsoft.com>
Signed-off-by: Paul Yu <129891899+paulyufan2@users.noreply.github.com>

* fix latest comments

* fix an UT

* fix invoker_cns_test.go

* fix ut bugs

* fix ut with SkipDefaultRoutes

* add combination ut

* add combination ut

* add ncGateway address to ut

* fix an ut bug

* fix ut bug

* add unhappy test cases

* add endpoint add and deletion cases

* push mock network creation hns api test cases

* remove network creation hns call

* add uts to mock hns network and endpoint calls

* fix ut linter issues

* add infraNIC only invoker test case

* add unhappy path test case

* remove infraNIC only case

* remove unhappy test case

* re-archetect cni ib codes and test

* remove unnecessary logs

* save endpoint state

* save endpoint object for IB

* fix linter issue

* fix a brunch of linter issues

* fix linter issues

* fix linter issue

* fix ut for returned error msg

* temporary add manifest build for CNS/CNI to pipeline

* feedback fix

* fix linter issue

* add ut to get networkName and networkID

* remove Ankit's PR to build cns image

* revert Ankit's changes back

* remove win2025 build from pipeline

* log error for invalid mac address

* revert convertInterfaceInfoToCniResult impl

* fix feedback

* add crd changes to test

* add win2025 yaml to build image

* pass containerID to cns

* revert changes back for review

* revert changes back for review

* gofumpt endpoint.go

* remove comment

* add latest comments

* Update network/endpoint_windows.go

Co-authored-by: tamilmani1989 <tamanoha@microsoft.com>
Signed-off-by: Paul Yu <129891899+paulyufan2@users.noreply.github.com>

* fix a linter issue

* add error check

* add error check

* gofumpt endpoint windows test file

---------

Signed-off-by: Paul Yu <129891899+paulyufan2@users.noreply.github.com>
Co-authored-by: tamilmani1989 <tamanoha@microsoft.com>
2024-07-11 16:05:28 +00:00
Evan Baker 67b5827438
Delete hack/manifests/sshd.yaml (#2839)
This testing manifest is flagged for exposed passwords. It is not a real password, but deleting it anyway to prevent it from being flagged again.

Signed-off-by: Evan Baker <rbtr@users.noreply.github.com>
2024-07-11 15:16:39 +00:00
aggarwal0009 d955f048f0
fix nodeInfo schema (#2838) 2024-07-10 20:43:04 +00:00
Kshitija Murudi b9b8627220
Add swiftv2 middleware support for standalone service fabric scenario (windows) (#2634)
* feature: add sfswiftv2 middleware support for standalone service fabric swiftv2 windows path

* feat: add switch case for middlewaretype

* review: address comments

* pkg: move swiftv2mode for cnsconfig from configuration to cns package to avoid import-cycle

* address review comment

* linter: context check, wrap error

* linter: fix errors wrap return static err

* review: address comments:

* refactor: keep old variable enableswiftv2, initialization pattern

* address pr comments

* rename the middleware to standaloneswiftv2middleware

* remove HostSecondaryIPInfo from podIpInfo

* address review comments-1

* address review comments-2

* Update cns/service/main.go

Co-authored-by: tamilmani1989 <tamanoha@microsoft.com>
Signed-off-by: Kshitija Murudi <kmurudi@microsoft.com>

* fix an linter issue

* rename the IPConfigRequest func

* fix a comment linter issue

* fix a comment linter issue

* remove checking hnsTransparent network mdoe

* remove orchestrator checker

---------

Signed-off-by: Kshitija Murudi <kmurudi@microsoft.com>
Co-authored-by: tamilmani1989 <tamanoha@microsoft.com>
Co-authored-by: Paul Yu <129891899+paulyufan2@users.noreply.github.com>
Co-authored-by: paulyufan2 <paulyu01@outlook.com>
2024-07-10 00:07:14 +00:00
Camryn Lee 0a36997d83
ci: add AzureLinux, rdma and ARM64 release test scenarios for cilium dual stack (#2835)
* test azurelinux and arm64 for cilium dual stack

* add dualstack parameter

* add rdma

* add image build for ipv6-hp-bpf

* use daemonset-dualstack.yaml

* typo

* set version ipv6

* add export line

* change node count
2024-07-09 22:27:52 +00:00
Kshitija Murudi e3b25da9d2
add prefix length from mtpnc to podipinfo & gatewayip (#2828)
* add prefix length from mtpnc to podipinfo & gatewayip

* separate getIpConfig based on OS for HNS prefix changes, add subnet in UTs

* import packages

* refactor middleware into os files after rebase w/ master

* split only the subnet-prefix assign part

* fix lint errors

* add UTs to test the function's behavior for linux vs windows

---------

Signed-off-by: Kshitija Murudi <kmurudi@microsoft.com>
Co-authored-by: paulyufan2 <paulyu01@outlook.com>
2024-07-09 22:05:42 +00:00
John Payne dc0c47439c
ci: Adjust VM usage for CNI Release Test Pipeline (#2837)
ci: Add variables for sku region control
2024-07-09 20:44:00 +00:00
aggarwal0009 662ae8749b
Add Status to NodeInfo CRD (#2827)
* Add Status to NodeInfo CRD

* annotate subresource to NodeInfo status
2024-07-09 16:57:57 +00:00
shreyashastantram 313ce0c4b0
feat: Adding backend interfaces support to CNS (#2693)
* Adding backend interfaces support for CNS

* Fixing the log line

* Moving backend nic functions to platform package

* Moving the pnpID fetching to platform package

* Moving the mapping to CRD mode

* Moving macaddress parsing to net package function

* removing the backend nic config

* Handling multiple interface information

* Adding error handling for macaddress parsing

* Moving pnpid mapping to swift v2  flow

* Adding pipeline vars

* Adding ut's for Happy paths

* Adding ut's for Happy paths

* Adding mtpnc check

* Rebasing with master

* Addressing lint errors

* Adding function to linux file

* Addressing lint errors

* Addressing lint comments

* Addressing Lint issues

* Modifying ut's

* removing mutex lock on cache

* Adding podnetwork instance label

* Modifying ut's after change

* Moving function out of restserver

* Moving mapping after crd intial state

* Adding the config debug statements

* removing the unused config

* Adding the debug statements

* Adding the debug statements

* Adding more debug logs

* removing log lines and adding mtpnc status check

* Moving mapping to state file

* Rebasing and removing the debug statements

* Addressing lint errors

* removing the debug pipeline changes

* Adding more coverage

* Adding test coverage and unhappy paths

* Addressing lint errors

* addressing lint errors

* Addressing lint errors
2024-07-05 23:11:00 +00:00
dependabot[bot] 438036f86d
deps: bump google.golang.org/grpc from 1.64.0 to 1.65.0 (#2829)
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.64.0 to 1.65.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](https://github.com/grpc/grpc-go/compare/v1.64.0...v1.65.0)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-05 20:42:08 +00:00
jc2543 0845e4ecea
Fix ACN PR Pipeline failures related to swiftv2 (#2826)
fix stability of pr pipeline

Co-authored-by: Chloe Chen <chlochen@microsoft.com>
2024-07-05 20:41:50 +00:00
Sharif Nasser Kadamani 368193c5f5
feat: add subnet address space to mtpnc status (#2825)
* feat: add subnet address space to mtpnc status

* ref: regenerate multitenancy crds

---------

Co-authored-by: Kshitija Murudi <kmurudi@microsoft.com>
2024-07-03 05:04:59 +00:00
Camryn Lee ab5990ced0
ci: align cilium charts with AKS (#2820)
* align charts with AKS

* update security context for initcontainer
2024-07-02 21:58:11 +00:00
QxBytes 6aaa151c8f
fix: add hns network id to endpoint struct for pushing to cns in stateless (#2822)
fix not adding hns network id to endpoint struct for pushing to cns
2024-07-02 02:46:13 +00:00
QxBytes fb2ec7a6c3
fix: update azure-vnet directory permissions (#2819)
update file lock directory permissions
2024-07-02 01:33:12 +00:00
Paul Yu 626b05a092
add gateway on CNS to get populated (#2805)
* add primaryip and gateway on CNS

* add windows 2025 build

* remove windows 2025 build from PR
2024-06-28 14:41:35 +00:00
bohuini a6364a5de7
fix: Revert the naming change for DelegatedVMNIC on master (#2810)
Revert "fix: Modified the value of DelegatedVMNIC to resolve compatibility issue (#2801)"

This reverts commit df978d5d89.
2024-06-27 02:08:19 +00:00
dependabot[bot] 85acdca07f
deps: bump github.com/containernetworking/cni from 1.2.1 to 1.2.2 (#2811)
Bumps [github.com/containernetworking/cni](https://github.com/containernetworking/cni) from 1.2.1 to 1.2.2.
- [Release notes](https://github.com/containernetworking/cni/releases)
- [Commits](https://github.com/containernetworking/cni/compare/v1.2.1...v1.2.2)

---
updated-dependencies:
- dependency-name: github.com/containernetworking/cni
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-06-26 13:07:29 +00:00