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.

Sign up for GitHub

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

Jump to bottom

Update calico to 3.29.1 and fixed automated script #568

Merged
merged 2 commits into from
Nov 26, 2024
+10 −7
Merged

Update calico to 3.29.1 and fixed automated script #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcf9a44
Update calico chart to v3.29.1
rbrtbnfgl Nov 25, 2024
d3d6fee
Added .orig files deletion for flannel and calico automated script
rbrtbnfgl Nov 25, 2024
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
2 changes: 1 addition & 1 deletion packages/rke2-calico/generated-changes/patch/Chart.yaml.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
- https://github.com/projectcalico/calico/tree/master/charts/tigera-operator
- https://github.com/tigera/operator
- https://github.com/projectcalico/calico
version: v3.29.0
version: v3.29.1
+annotations:
+ catalog.cattle.io/namespace: tigera-operator
4 changes: 2 additions & 2 deletions ...ges/rke2-calico/generated-changes/patch/templates/tigera-operator/00-uninstall.yaml.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
- namespace: {{.Release.Namespace}}
+ namespace: tigera-operator
labels:
k8s-app: tigera-operator-uninstall
helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
@@ -35,5 +35,5 @@
{{- include "tigera-operator.labels" (dict "context" .) | nindent 4 }}
@@ -34,5 +34,5 @@
serviceAccountName: tigera-operator
containers:
- name: cleanup-job
Expand Down
4 changes: 2 additions & 2 deletions packages/rke2-calico/generated-changes/patch/values.yaml.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
tigeraOperator:
- image: tigera/operator
+ image: rancher/mirrored-calico-operator
version: v1.36.0
version: v1.36.2
- registry: quay.io
+ registry: docker.io
calicoctl:
- image: docker.io/calico/ctl
+ image: rancher/mirrored-calico-ctl
tag: v3.29.0
tag: v3.29.1

-kubeletVolumePluginPath: /var/lib/kubelet
+kubeletVolumePluginPath: "None"
Expand Down
2 changes: 1 addition & 1 deletion packages/rke2-calico/package.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
url: https://github.com/projectcalico/calico/releases/download/v3.29.0/tigera-operator-v3.29.0.tgz
url: https://github.com/projectcalico/calico/releases/download/v3.29.1/tigera-operator-v3.29.1.tgz
packageVersion: 00
additionalCharts:
- workingDir: charts-crd
Expand Down
2 changes: 1 addition & 1 deletion packages/rke2-calico/templates/crd-template/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v1
version: v3.29.0
version: v3.29.1
description: Installs the CRDs for rke2-calico
name: rke2-calico-crd
type: application
2 changes: 2 additions & 0 deletions updatecli/scripts/update-calico.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ if [ -n "$CALICO_VERSION" ]; then
yq -i ".url = \"https://github.com/projectcalico/calico/releases/download/$CALICO_VERSION/tigera-operator-$CALICO_VERSION.tgz\" |
.packageVersion = 00" packages/rke2-calico/package.yaml
GOCACHE='/home/runner/.cache/go-build' GOPATH='/home/runner/go' PACKAGE='rke2-calico' make prepare
find packages/rke2-calico/charts -name '*.orig' -delete
find packages/rke2-calico/charts-crd -name '*.orig' -delete
GOCACHE='/home/runner/.cache/go-build' GOPATH='/home/runner/go' PACKAGE='rke2-calico' make patch
make clean
fi
Expand Down
1 change: 1 addition & 0 deletions updatecli/scripts/update-flannel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ if [ -n "$FLANNEL_VERSION" ]; then
yq -i ".packageVersion = $new_version" packages/rke2-flannel/package.yaml
fi
GOCACHE='/home/runner/.cache/go-build' GOPATH='/home/runner/go' PACKAGE='rke2-flannel' make prepare
find packages/rke2-flannel/charts -name '*.orig' -delete
GOCACHE='/home/runner/.cache/go-build' GOPATH='/home/runner/go' PACKAGE='rke2-flannel' make patch
make clean
fi
Expand Down
Loading