Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
48 changes: 24 additions & 24 deletions config/calico_versions.yml
Original file line number Diff line number Diff line change
@@ -1,49 +1,49 @@
# Components defined here are required to be kept in sync with hack/gen-versions/calico.go.tpl
title: master
title: v3.31.3
components:
libcalico-go:
version: master
version: v3.31.3
typha:
version: master
version: v3.31.3
node:
version: master
version: v3.31.3
cni:
version: master
version: v3.31.3
node-windows:
version: master
version: v3.31.3
cni-windows:
version: master
version: v3.31.3
kube-controllers:
version: master
version: v3.31.3
goldmane:
version: master
version: v3.31.3
flexvol:
version: master
version: v3.31.3
apiserver:
version: master
version: v3.31.3
csi:
version: master
version: v3.31.3
csi-node-driver-registrar:
version: master
version: v3.31.3
key-cert-provisioner:
version: master
version: v3.31.3
whisker:
version: master
version: v3.31.3
whisker-backend:
version: master
version: v3.31.3
envoy-gateway:
version: master
version: v3.31.3
envoy-proxy:
version: master
version: v3.31.3
envoy-ratelimit:
version: master
version: v3.31.3
guardian:
version: master
version: v3.31.3
istio-pilot:
version: master
version: v3.31.3
istio-install-cni:
version: master
version: v3.31.3
istio-ztunnel:
version: master
version: v3.31.3
istio-proxyv2:
version: master
version: v3.31.3
52 changes: 26 additions & 26 deletions pkg/components/calico.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,202 +18,202 @@
package components

var (
CalicoRelease string = "master"
CalicoRelease string = "v3.31.3"

ComponentCalicoCNI = Component{
Version: "master",
Version: "v3.31.3",
Image: "cni",
Registry: "",
imagePath: "",
variant: calicoVariant,
}

ComponentCalicoCNIFIPS = Component{
Version: "master-fips",
Version: "v3.31.3-fips",
Image: "cni",
Registry: "",
imagePath: "",
variant: calicoVariant,
}

ComponentCalicoCNIWindows = Component{
Version: "master",
Version: "v3.31.3",
Image: "cni-windows",
Registry: "",
imagePath: "",
variant: calicoVariant,
}

ComponentCalicoCSRInitContainer = Component{
Version: "master",
Version: "v3.31.3",
Image: "key-cert-provisioner",
Registry: "",
imagePath: "",
variant: calicoVariant,
}

ComponentCalicoKubeControllers = Component{
Version: "master",
Version: "v3.31.3",
Image: "kube-controllers",
Registry: "",
imagePath: "",
variant: calicoVariant,
}

ComponentCalicoKubeControllersFIPS = Component{
Version: "master-fips",
Version: "v3.31.3-fips",
Image: "kube-controllers",
Registry: "",
imagePath: "",
variant: calicoVariant,
}

ComponentCalicoNode = Component{
Version: "master",
Version: "v3.31.3",
Image: "node",
Registry: "",
imagePath: "",
variant: calicoVariant,
}

ComponentCalicoNodeFIPS = Component{
Version: "master-fips",
Version: "v3.31.3-fips",
Image: "node",
Registry: "",
imagePath: "",
variant: calicoVariant,
}

ComponentCalicoNodeWindows = Component{
Version: "master",
Version: "v3.31.3",
Image: "node-windows",
Registry: "",
imagePath: "",
variant: calicoVariant,
}

ComponentCalicoTypha = Component{
Version: "master",
Version: "v3.31.3",
Image: "typha",
Registry: "",
imagePath: "",
variant: calicoVariant,
}

ComponentCalicoTyphaFIPS = Component{
Version: "master-fips",
Version: "v3.31.3-fips",
Image: "typha",
Registry: "",
imagePath: "",
variant: calicoVariant,
}

ComponentCalicoFlexVolume = Component{
Version: "master",
Version: "v3.31.3",
Image: "pod2daemon-flexvol",
Registry: "",
imagePath: "",
variant: calicoVariant,
}

ComponentCalicoAPIServer = Component{
Version: "master",
Version: "v3.31.3",
Image: "apiserver",
Registry: "",
imagePath: "",
variant: calicoVariant,
}

ComponentCalicoAPIServerFIPS = Component{
Version: "master-fips",
Version: "v3.31.3-fips",
Image: "apiserver",
Registry: "",
imagePath: "",
variant: calicoVariant,
}

ComponentCalicoCSI = Component{
Version: "master",
Version: "v3.31.3",
Image: "csi",
Registry: "",
imagePath: "",
variant: calicoVariant,
}

ComponentCalicoCSIFIPS = Component{
Version: "master-fips",
Version: "v3.31.3-fips",
Image: "csi",
Registry: "",
imagePath: "",
variant: calicoVariant,
}

ComponentCalicoCSIRegistrar = Component{
Version: "master",
Version: "v3.31.3",
Image: "node-driver-registrar",
Registry: "",
imagePath: "",
variant: calicoVariant,
}

ComponentCalicoCSIRegistrarFIPS = Component{
Version: "master-fips",
Version: "v3.31.3-fips",
Image: "node-driver-registrar",
Registry: "",
imagePath: "",
variant: calicoVariant,
}

ComponentCalicoGoldmane = Component{
Version: "master",
Version: "v3.31.3",
Image: "goldmane",
Registry: "",
imagePath: "",
variant: calicoVariant,
}

ComponentCalicoWhisker = Component{
Version: "master",
Version: "v3.31.3",
Image: "whisker",
Registry: "",
imagePath: "",
variant: calicoVariant,
}

ComponentCalicoWhiskerBackend = Component{
Version: "master",
Version: "v3.31.3",
Image: "whisker-backend",
Registry: "",
imagePath: "",
variant: calicoVariant,
}

ComponentCalicoEnvoyGateway = Component{
Version: "master",
Version: "v3.31.3",
Image: "envoy-gateway",
Registry: "",
imagePath: "",
variant: calicoVariant,
}

ComponentCalicoEnvoyProxy = Component{
Version: "master",
Version: "v3.31.3",
Image: "envoy-proxy",
Registry: "",
imagePath: "",
variant: calicoVariant,
}

ComponentCalicoEnvoyRatelimit = Component{
Version: "master",
Version: "v3.31.3",
Image: "envoy-ratelimit",
Registry: "",
imagePath: "",
variant: calicoVariant,
}

ComponentCalicoGuardian = Component{
Version: "master",
Version: "v3.31.3",
Image: "guardian",
Registry: "",
imagePath: "",
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/istio/istio_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,7 @@ var _ = Describe("Istio controller tests", func() {
// Create ImageSet with all required Istio images
imageSet := &operatorv1.ImageSet{
ObjectMeta: metav1.ObjectMeta{
Name: "calico-master",
Name: "calico-v3.31.3",
},
Spec: operatorv1.ImageSetSpec{
Images: []operatorv1.Image{
Expand Down
Loading