Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/v1.24'
Browse files Browse the repository at this point in the history 
# Conflicts:
#	roles/add-on/templates/calico.yaml.j2
#	roles/add-on/templates/canal.yaml.j2
#	scripts/make-registry.sh
  • Loading branch information
@actions-user
actions-user committed Feb 17, 2024
2 parents 9228421 + a6f5b73 commit 0a7f512
Show file tree
Hide file tree
Showing 5 changed files with 322 additions and 66 deletions.
Loading

0 comments on commit 0a7f512

Please sign in to comment.