Skip to content

Commit 5b31e37

Browse files
marvin-tigeramarvin-tigera
authored
Merge pull request #3950 from tigera/auto-build-updates-v1.36.9
[release-v1.36] Auto Release Update for v1.36.9
2 parents e0038ba + 84e4f37 commit 5b31e37

File tree

3 files changed

+34
-34
lines changed

3 files changed

+34
-34
lines changed

‎config/calico_versions.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
# Components defined here are required to be kept in sync with hack/gen-versions/calico.go.tpl
2-
title: v3.29.3
2+
title: v3.29.4
33
components:
44
libcalico-go:
5-
version: v3.29.3
5+
version: v3.29.4
66
typha:
7-
version: v3.29.3
7+
version: v3.29.4
88
calico/node:
9-
version: v3.29.3
9+
version: v3.29.4
1010
calico/cni:
11-
version: v3.29.3
11+
version: v3.29.4
1212
calico/node-windows:
13-
version: v3.29.3
13+
version: v3.29.4
1414
calico/cni-windows:
15-
version: v3.29.3
15+
version: v3.29.4
1616
calico/kube-controllers:
17-
version: v3.29.3
17+
version: v3.29.4
1818
flexvol:
19-
version: v3.29.3
19+
version: v3.29.4
2020
calico/apiserver:
21-
version: v3.29.3
21+
version: v3.29.4
2222
calico/csi:
23-
version: v3.29.3
23+
version: v3.29.4
2424
csi-node-driver-registrar:
25-
version: v3.29.3
25+
version: v3.29.4
2626
key-cert-provisioner:
27-
version: v3.29.3
27+
version: v3.29.4

‎hack/gen-bundle/get-manifests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function downloadOperatorManifests() {
4141
curl ${CALICO_BASE_URL}/manifests/ocp/02-rolebinding-tigera-operator.yaml --output ${BUNDLE_DEPLOY_DIR}/rolebinding-tigera-operator.yaml
4242

4343
# Download the installation CR so that the alm-examples annotation is generated.
44-
curl ${CALICO_BASE_URL}/manifests/ocp/01-cr-installation.yaml --output ${BUNDLE_DEPLOY_DIR}/cr-installation.yaml
44+
curl ${CALICO_BASE_URL}/manifests/ocp/03-cr-installation.yaml --output ${BUNDLE_DEPLOY_DIR}/cr-installation.yaml
4545
}
4646

4747
# Copy over and update the v1beta1 operator crds required for Calico.
@@ -83,7 +83,7 @@ policyrecommendationscopes
8383

8484
# Download the Calico CRDs into CRD dir.
8585
for resource in $CALICO_RESOURCES; do
86-
curl ${CALICO_BASE_URL}/manifests/ocp/crd.projectcalico.org_${resource}.yaml --output ${BUNDLE_CRD_DIR}/crd.projectcalico.org_${resource}.yaml
86+
curl ${CALICO_BASE_URL}/libcalico-go/config/crd/crd.projectcalico.org_${resource}.yaml --output ${BUNDLE_CRD_DIR}/crd.projectcalico.org_${resource}.yaml
8787
done
8888
}
8989

‎pkg/components/calico.go

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,112 +20,112 @@ package components
2020
import "github.com/tigera/operator/version"
2121

2222
var (
23-
CalicoRelease string = "v3.29.3"
23+
CalicoRelease string = "v3.29.4"
2424

2525
ComponentCalicoCNI = Component{
26-
Version: "v3.29.3",
26+
Version: "v3.29.4",
2727
Image: "calico/cni",
2828
Registry: "",
2929
}
3030

3131
ComponentCalicoCNIFIPS = Component{
32-
Version: "v3.29.3-fips",
32+
Version: "v3.29.4-fips",
3333
Image: "calico/cni",
3434
Registry: "",
3535
}
3636

3737
ComponentCalicoCNIWindows = Component{
38-
Version: "v3.29.3",
38+
Version: "v3.29.4",
3939
Image: "calico/cni-windows",
4040
Registry: "",
4141
}
4242

4343
ComponentCalicoCSRInitContainer = Component{
44-
Version: "v3.29.3",
44+
Version: "v3.29.4",
4545
Image: "calico/key-cert-provisioner",
4646
Registry: "",
4747
}
4848

4949
ComponentCalicoKubeControllers = Component{
50-
Version: "v3.29.3",
50+
Version: "v3.29.4",
5151
Image: "calico/kube-controllers",
5252
Registry: "",
5353
}
5454

5555
ComponentCalicoKubeControllersFIPS = Component{
56-
Version: "v3.29.3-fips",
56+
Version: "v3.29.4-fips",
5757
Image: "calico/kube-controllers",
5858
Registry: "",
5959
}
6060

6161
ComponentCalicoNode = Component{
62-
Version: "v3.29.3",
62+
Version: "v3.29.4",
6363
Image: "calico/node",
6464
Registry: "",
6565
}
6666

6767
ComponentCalicoNodeFIPS = Component{
68-
Version: "v3.29.3-fips",
68+
Version: "v3.29.4-fips",
6969
Image: "calico/node",
7070
Registry: "",
7171
}
7272

7373
ComponentCalicoNodeWindows = Component{
74-
Version: "v3.29.3",
74+
Version: "v3.29.4",
7575
Image: "calico/node-windows",
7676
Registry: "",
7777
}
7878

7979
ComponentCalicoTypha = Component{
80-
Version: "v3.29.3",
80+
Version: "v3.29.4",
8181
Image: "calico/typha",
8282
Registry: "",
8383
}
8484

8585
ComponentCalicoTyphaFIPS = Component{
86-
Version: "v3.29.3-fips",
86+
Version: "v3.29.4-fips",
8787
Image: "calico/typha",
8888
Registry: "",
8989
}
9090

9191
ComponentCalicoFlexVolume = Component{
92-
Version: "v3.29.3",
92+
Version: "v3.29.4",
9393
Image: "calico/pod2daemon-flexvol",
9494
Registry: "",
9595
}
9696

9797
ComponentCalicoAPIServer = Component{
98-
Version: "v3.29.3",
98+
Version: "v3.29.4",
9999
Image: "calico/apiserver",
100100
Registry: "",
101101
}
102102

103103
ComponentCalicoAPIServerFIPS = Component{
104-
Version: "v3.29.3-fips",
104+
Version: "v3.29.4-fips",
105105
Image: "calico/apiserver",
106106
Registry: "",
107107
}
108108

109109
ComponentCalicoCSI = Component{
110-
Version: "v3.29.3",
110+
Version: "v3.29.4",
111111
Image: "calico/csi",
112112
Registry: "",
113113
}
114114

115115
ComponentCalicoCSIFIPS = Component{
116-
Version: "v3.29.3-fips",
116+
Version: "v3.29.4-fips",
117117
Image: "calico/csi",
118118
Registry: "",
119119
}
120120

121121
ComponentCalicoCSIRegistrar = Component{
122-
Version: "v3.29.3",
122+
Version: "v3.29.4",
123123
Image: "calico/node-driver-registrar",
124124
Registry: "",
125125
}
126126

127127
ComponentCalicoCSIRegistrarFIPS = Component{
128-
Version: "v3.29.3-fips",
128+
Version: "v3.29.4-fips",
129129
Image: "calico/node-driver-registrar",
130130
Registry: "",
131131
}

0 commit comments

Comments
 (0)