From 32ef18754c04a4f729368667082beb4c8ce2ccc6 Mon Sep 17 00:00:00 2001 From: Jakub Darmach Date: Thu, 18 Jan 2024 14:54:21 +0100 Subject: [PATCH 1/7] Trying to workaround tigera container path --- .images.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.images.yaml b/.images.yaml index 53f6021..098a26b 100644 --- a/.images.yaml +++ b/.images.yaml @@ -1,3 +1,19 @@ +target: + host: ghcr.io + repository: stackhpc/calico + auth: + username: GHCR_USERNAME + password: GHCR_PASSWORD +sources: +# Calico +# v3.27.0 +- repository: calico/typha + host: docker.io + tag: v3.27.0 +- repository: calico/pod2daemon-flexvol + host: docker.io + tag: v3.27.0 + target: host: ghcr.io repository: stackhpc From 8fd1d236b916a742a12598551f42a3cf957cea10 Mon Sep 17 00:00:00 2001 From: Jakub Darmach Date: Thu, 18 Jan 2024 15:11:13 +0100 Subject: [PATCH 2/7] Trying to workaround tigera container path once more --- .images.yaml | 16 ---------------- .tigera.yaml | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 .tigera.yaml diff --git a/.images.yaml b/.images.yaml index 098a26b..53f6021 100644 --- a/.images.yaml +++ b/.images.yaml @@ -1,19 +1,3 @@ -target: - host: ghcr.io - repository: stackhpc/calico - auth: - username: GHCR_USERNAME - password: GHCR_PASSWORD -sources: -# Calico -# v3.27.0 -- repository: calico/typha - host: docker.io - tag: v3.27.0 -- repository: calico/pod2daemon-flexvol - host: docker.io - tag: v3.27.0 - target: host: ghcr.io repository: stackhpc diff --git a/.tigera.yaml b/.tigera.yaml new file mode 100644 index 0000000..385d5d2 --- /dev/null +++ b/.tigera.yaml @@ -0,0 +1,16 @@ +target: + host: ghcr.io + repository: stackhpc/calico + auth: + username: GHCR_USERNAME + password: GHCR_PASSWORD +sources: +# Calico +# v3.27.0 +- repository: calico/typha + host: docker.io + tag: v3.27.0 +- repository: calico/pod2daemon-flexvol + host: docker.io + tag: v3.27.0 + From 38802c741b533f9086082d4fef2f7174332c1384 Mon Sep 17 00:00:00 2001 From: Jakub Darmach Date: Thu, 18 Jan 2024 15:18:08 +0100 Subject: [PATCH 3/7] Added separate tigera manifest just for testing --- .github/workflows/pr.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 99f4596..26c0387 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -34,3 +34,6 @@ jobs: - name: Run sinker push (dry-run) run: ../sinker push --dryrun continue-on-error: true + + - name: Run sinker push with magic manifest + run: ../sinker push --manifest .tigera.yml From 5b36546ff670006ec187b8726fd3e1daab68ccae Mon Sep 17 00:00:00 2001 From: Jakub Darmach Date: Thu, 18 Jan 2024 15:21:53 +0100 Subject: [PATCH 4/7] Typo fix --- .github/workflows/pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 26c0387..aaa70e6 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -36,4 +36,4 @@ jobs: continue-on-error: true - name: Run sinker push with magic manifest - run: ../sinker push --manifest .tigera.yml + run: ../sinker push --manifest .tigera.yaml From 4b729d8e2d366afc10ae6ecf2d888b59519f53f4 Mon Sep 17 00:00:00 2001 From: Jakub Darmach Date: Thu, 18 Jan 2024 15:52:29 +0100 Subject: [PATCH 5/7] Adding 3.25 and 3.26 tigera version images --- .tigera.yaml | 45 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/.tigera.yaml b/.tigera.yaml index 385d5d2..2ca1288 100644 --- a/.tigera.yaml +++ b/.tigera.yaml @@ -5,12 +5,51 @@ target: username: GHCR_USERNAME password: GHCR_PASSWORD sources: -# Calico -# v3.27.0 +# v3.25.2 +- repository: calico/cni + host: docker.io + tag: v3.25.2 +- repository: calico/kube-controllers + host: docker.io + tag: v3.25.2 +- repository: calico/node + host: docker.io + tag: v3.25.2 +- repository: calico/pod2daemon-flexvol + host: docker.io + tag: v3.25.2 +- repository: calico/typha + host: docker.io + tag: v3.25.2 +# v3.26.3 +- repository: calico/cni + host: docker.io + tag: v3.26.3 +- repository: calico/kube-controllers + host: docker.io + tag: v3.26.3 +- repository: calico/node + host: docker.io + tag: v3.26.3 +- repository: calico/pod2daemon-flexvol + host: docker.io + tag: v3.26.3 - repository: calico/typha + host: docker.io + tag: v3.26.3 +# v3.27.0 +- repository: calico/cni + host: docker.io + tag: v3.27.0 +- repository: calico/kube-controllers + host: docker.io + tag: v3.27.0 +- repository: calico/node host: docker.io tag: v3.27.0 - repository: calico/pod2daemon-flexvol host: docker.io tag: v3.27.0 - +- repository: calico/typha + host: docker.io + tag: v3.27.0 From 463259220de54dc98ebeb374cbd01059faa6c864 Mon Sep 17 00:00:00 2001 From: Jakub Darmach Date: Thu, 18 Jan 2024 16:45:20 +0100 Subject: [PATCH 6/7] Adding calico - tigera missing images --- .tigera.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.tigera.yaml b/.tigera.yaml index 2ca1288..0a08115 100644 --- a/.tigera.yaml +++ b/.tigera.yaml @@ -6,9 +6,15 @@ target: password: GHCR_PASSWORD sources: # v3.25.2 +- repository: calico/apiserver + host: docker.io + tag: v3.25.2 - repository: calico/cni host: docker.io tag: v3.25.2 +- repository: calico/csi + host: docker.io + tag: v3.25.2 - repository: calico/kube-controllers host: docker.io tag: v3.25.2 @@ -22,9 +28,15 @@ sources: host: docker.io tag: v3.25.2 # v3.26.3 +- repository: calico/apiserver + host: docker.io + tag: v3.26.3 - repository: calico/cni host: docker.io tag: v3.26.3 +- repository: calico/csi + host: docker.io + tag: v3.26.3 - repository: calico/kube-controllers host: docker.io tag: v3.26.3 @@ -38,9 +50,15 @@ sources: host: docker.io tag: v3.26.3 # v3.27.0 +- repository: calico/apiserver + host: docker.io + tag: v3.27.0 - repository: calico/cni host: docker.io tag: v3.27.0 +- repository: calico/csi + host: docker.io + tag: v3.27.0 - repository: calico/kube-controllers host: docker.io tag: v3.27.0 From 81f58bd6404dafa897a293e302b7e9be7a1358a2 Mon Sep 17 00:00:00 2001 From: Jakub Darmach Date: Thu, 18 Jan 2024 17:02:26 +0100 Subject: [PATCH 7/7] Adding calico - tigera missing images --- .tigera.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.tigera.yaml b/.tigera.yaml index 0a08115..0f5af69 100644 --- a/.tigera.yaml +++ b/.tigera.yaml @@ -21,6 +21,9 @@ sources: - repository: calico/node host: docker.io tag: v3.25.2 +- repository: calico/node-driver-registrar + host: docker.io + tag: v3.25.2 - repository: calico/pod2daemon-flexvol host: docker.io tag: v3.25.2 @@ -43,6 +46,9 @@ sources: - repository: calico/node host: docker.io tag: v3.26.3 +- repository: calico/node-driver-registrar + host: docker.io + tag: v3.26.3 - repository: calico/pod2daemon-flexvol host: docker.io tag: v3.26.3 @@ -65,6 +71,9 @@ sources: - repository: calico/node host: docker.io tag: v3.27.0 +- repository: calico/node-driver-registrar + host: docker.io + tag: v3.27.0 - repository: calico/pod2daemon-flexvol host: docker.io tag: v3.27.0