Skip to content

Commit

Permalink
Merge pull request #3350 from tigera/auto-build-updates-v1.34.0
Browse files Browse the repository at this point in the history 
[release-v1.34]  Auto Release Update for v1.34.0
  • Loading branch information
@marvin-tigera
marvin-tigera authored May 11, 2024
2 parents d179bbb + 8716091 commit d841e02
Show file tree
Hide file tree
Showing 7 changed files with 127 additions and 128 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,7 @@ ifdef LOCAL_BUILD
$(error LOCAL_BUILD must not be set for a release)
endif

release-prep: var-require-all-GIT_PR_BRANCH_BASE-GIT_REPO_SLUG-VERSION-CALICO_VERSION-COMMON_VERSION-CALICO_ENTERPRISE_VERSION
release-prep: var-require-all-GIT_PR_BRANCH_BASE-GIT_REPO_SLUG-VERSION-CALICO_VERSION-CALICO_ENTERPRISE_VERSION
$(YQ_V4) ".title = \"$(CALICO_ENTERPRISE_VERSION)\" | .components |= with_entries(select(.key | test(\"^(eck-|coreos-).*\") | not)) |= with(.[]; .version = \"$(CALICO_ENTERPRISE_VERSION)\")" -i config/enterprise_versions.yml
$(YQ_V4) ".title = \"$(CALICO_VERSION)\" | .components.[].version = \"$(CALICO_VERSION)\"" -i config/calico_versions.yml
sed -i "s/\"gcr.io.*\"/\"quay.io\/\"/g" pkg/components/images.go
Expand Down
26 changes: 13 additions & 13 deletions config/calico_versions.yml
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
# Components defined here are required to be kept in sync with hack/gen-versions/calico.go.tpl
title: release-v3.28
title: v3.28.0
components:
libcalico-go:
version: release-v3.28
version: v3.28.0
typha:
version: release-v3.28
version: v3.28.0
calico/node:
version: release-v3.28
version: v3.28.0
calico/cni:
version: release-v3.28
version: v3.28.0
calico/node-windows:
version: release-v3.28
version: v3.28.0
calico/cni-windows:
version: release-v3.28
version: v3.28.0
calico/kube-controllers:
version: release-v3.28
version: v3.28.0
flexvol:
version: release-v3.28
version: v3.28.0
calico/apiserver:
version: release-v3.28
version: v3.28.0
calico/csi:
version: release-v3.28
version: v3.28.0
csi-node-driver-registrar:
version: release-v3.28
version: v3.28.0
key-cert-provisioner:
version: release-v3.28
version: v3.28.0
93 changes: 46 additions & 47 deletions config/enterprise_versions.yml
View file
Original file line number Diff line number Diff line change
@@ -1,154 +1,153 @@
# Components defined here are required to be kept in sync with hack/gen-versions/enterprise.go.tpl
title: release-calient-v3.19
title: v3.19.0-2.0
components:
libcalico-go:
version: release-calient-v3.19
version: v3.19.0-2.0
cnx-manager:
image: tigera/cnx-manager
version: release-calient-v3.19
version: v3.19.0-2.0
voltron:
image: tigera/voltron
version: release-calient-v3.19
version: v3.19.0-2.0
cnx-apiserver:
image: tigera/cnx-apiserver
version: release-calient-v3.19
version: v3.19.0-2.0
cnx-queryserver:
image: tigera/cnx-queryserver
version: release-calient-v3.19
version: v3.19.0-2.0
cnx-kube-controllers:
image: tigera/kube-controllers
version: release-calient-v3.19
version: v3.19.0-2.0
typha:
image: tigera/typha
version: release-calient-v3.19
version: v3.19.0-2.0
cnx-node:
image: tigera/cnx-node
version: release-calient-v3.19
version: v3.19.0-2.0
cnx-node-windows:
image: tigera/cnx-node-windows
version: release-calient-v3.19
version: v3.19.0-2.0
fluentd:
image: tigera/fluentd
version: release-calient-v3.19
version: v3.19.0-2.0
fluentd-windows:
image: tigera/fluentd-windows
version: release-calient-v3.19
version: v3.19.0-2.0
es-proxy:
image: tigera/es-proxy
version: release-calient-v3.19
version: v3.19.0-2.0
linseed:
image: tigera/linseed
version: release-calient-v3.19
version: v3.19.0-2.0
es-gateway:
image: tigera/es-gateway
version: release-calient-v3.19
version: v3.19.0-2.0
dex:
image: tigera/dex
version: release-calient-v3.19
version: v3.19.0-2.0
eck-kibana:
version: 7.17.18
kibana:
image: tigera/kibana
version: release-calient-v3.19
version: v3.19.0-2.0
eck-elasticsearch:
version: 7.17.18
elasticsearch:
image: tigera/elasticsearch
version: release-calient-v3.19
version: v3.19.0-2.0
elastic-tsee-installer:
image: tigera/intrusion-detection-job-installer
version: release-calient-v3.19
version: v3.19.0-2.0
es-curator:
image: tigera/es-curator
version: release-calient-v3.19
version: v3.19.0-2.0
intrusion-detection-controller:
image: tigera/intrusion-detection-controller
version: release-calient-v3.19
version: v3.19.0-2.0
security-event-webhooks-processor:
image: tigera/webhooks-processor
version: release-calient-v3.19
version: v3.19.0-2.0
compliance-controller:
image: tigera/compliance-controller
version: release-calient-v3.19
version: v3.19.0-2.0
compliance-reporter:
image: tigera/compliance-reporter
version: release-calient-v3.19
version: v3.19.0-2.0
compliance-snapshotter:
image: tigera/compliance-snapshotter
version: release-calient-v3.19
version: v3.19.0-2.0
compliance-server:
image: tigera/compliance-server
version: release-calient-v3.19
version: v3.19.0-2.0
compliance-benchmarker:
image: tigera/compliance-benchmarker
version: release-calient-v3.19
version: v3.19.0-2.0
guardian:
image: tigera/guardian
version: release-calient-v3.19
version: v3.19.0-2.0
tigera-cni:
image: tigera/cni
version: release-calient-v3.19
version: v3.19.0-2.0
tigera-cni-windows:
image: tigera/cni-windows
version: release-calient-v3.19
version: v3.19.0-2.0
elasticsearch-metrics:
image: tigera/elasticsearch-metrics
version: release-calient-v3.19
version: v3.19.0-2.0
packetcapture:
image: tigera/packetcapture
version: release-calient-v3.19
version: v3.19.0-2.0
policy-recommendation:
image: tigera/policy-recommendation
version: release-calient-v3.19
version: v3.19.0-2.0
# coreos-prometheus holds the version of prometheus built for tigera/prometheus,
# which prometheus operator uses to validate.
coreos-prometheus:
version: v2.48.1
prometheus:
image: tigera/prometheus
version: release-calient-v3.19
version: v3.19.0-2.0
# coreos-prometheus holds the version of alertmanager built for tigera/alertmanager,
# which prometheus operator uses to validate.
coreos-alertmanager:
version: v0.25.0
alertmanager:
image: tigera/alertmanager
version: release-calient-v3.19
version: v3.19.0-2.0
tigera-prometheus-service:
image: tigera/prometheus-service
version: release-calient-v3.19
version: v3.19.0-2.0
deep-packet-inspection:
image: tigera/deep-packet-inspection
version: release-calient-v3.19
version: v3.19.0-2.0
flexvol:
image: tigera/pod2daemon-flexvol
version: release-calient-v3.19
version: v3.19.0-2.0
csi:
image: tigera/csi
version: release-calient-v3.19
version: v3.19.0-2.0
csi-node-driver-registrar:
image: tigera/node-driver-registrar
version: release-calient-v3.19
version: v3.19.0-2.0
# The components below are third-party images that have been retagged under
# quay.io/tigera so all enterprise images come from the same repository and org.
elasticsearch-operator:
image: tigera/eck-operator
version: release-calient-v3.19
version: v3.19.0-2.0
eck-elasticsearch-operator:
version: 2.6.1
l7-collector:
image: tigera/l7-collector
version: release-calient-v3.19
version: v3.19.0-2.0
envoy:
image: tigera/envoy
version: release-calient-v3.19
version: v3.19.0-2.0
dikastes:
image: tigera/dikastes
version: release-calient-v3.19
version: v3.19.0-2.0
egress-gateway:
image: tigera/egress-gateway
version: release-calient-v3.19
version: v3.19.0-2.0
key-cert-provisioner:
image: tigera/key-cert-provisioner
version: release-calient-v3.19

version: v3.19.0-2.0
2 changes: 1 addition & 1 deletion hack/gen-versions/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

const (
defaultCalicoRegistry = "docker.io"
defaultEnterpriseRegistry = "gcr.io/unique-caldron-775/cnx"
defaultEnterpriseRegistry = "quay.io"

eeVersionsTpl = "enterprise.go.tpl"
osVersionsTpl = "calico.go.tpl"
Expand Down
38 changes: 19 additions & 19 deletions pkg/components/calico.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,112 +20,112 @@ package components
import "github.com/tigera/operator/version"

var (
CalicoRelease string = "release-v3.28"
CalicoRelease string = "v3.28.0"

ComponentCalicoCNI = component{
Version: "release-v3.28",
Version: "v3.28.0",
Image: "calico/cni",
Registry: "",
}

ComponentCalicoCNIFIPS = component{
Version: "release-v3.28-fips",
Version: "v3.28.0-fips",
Image: "calico/cni",
Registry: "",
}

ComponentCalicoCNIWindows = component{
Version: "release-v3.28",
Version: "v3.28.0",
Image: "calico/cni-windows",
Registry: "",
}

ComponentCalicoCSRInitContainer = component{
Version: "release-v3.28",
Version: "v3.28.0",
Image: "calico/key-cert-provisioner",
Registry: "",
}

ComponentCalicoKubeControllers = component{
Version: "release-v3.28",
Version: "v3.28.0",
Image: "calico/kube-controllers",
Registry: "",
}

ComponentCalicoKubeControllersFIPS = component{
Version: "release-v3.28-fips",
Version: "v3.28.0-fips",
Image: "calico/kube-controllers",
Registry: "",
}

ComponentCalicoNode = component{
Version: "release-v3.28",
Version: "v3.28.0",
Image: "calico/node",
Registry: "",
}

ComponentCalicoNodeFIPS = component{
Version: "release-v3.28-fips",
Version: "v3.28.0-fips",
Image: "calico/node",
Registry: "",
}

ComponentCalicoNodeWindows = component{
Version: "release-v3.28",
Version: "v3.28.0",
Image: "calico/node-windows",
Registry: "",
}

ComponentCalicoTypha = component{
Version: "release-v3.28",
Version: "v3.28.0",
Image: "calico/typha",
Registry: "",
}

ComponentCalicoTyphaFIPS = component{
Version: "release-v3.28-fips",
Version: "v3.28.0-fips",
Image: "calico/typha",
Registry: "",
}

ComponentCalicoFlexVolume = component{
Version: "release-v3.28",
Version: "v3.28.0",
Image: "calico/pod2daemon-flexvol",
Registry: "",
}

ComponentCalicoAPIServer = component{
Version: "release-v3.28",
Version: "v3.28.0",
Image: "calico/apiserver",
Registry: "",
}

ComponentCalicoAPIServerFIPS = component{
Version: "release-v3.28-fips",
Version: "v3.28.0-fips",
Image: "calico/apiserver",
Registry: "",
}

ComponentCalicoCSI = component{
Version: "release-v3.28",
Version: "v3.28.0",
Image: "calico/csi",
Registry: "",
}

ComponentCalicoCSIFIPS = component{
Version: "release-v3.28-fips",
Version: "v3.28.0-fips",
Image: "calico/csi",
Registry: "",
}

ComponentCalicoCSIRegistrar = component{
Version: "release-v3.28",
Version: "v3.28.0",
Image: "calico/node-driver-registrar",
Registry: "",
}

ComponentCalicoCSIRegistrarFIPS = component{
Version: "release-v3.28-fips",
Version: "v3.28.0-fips",
Image: "calico/node-driver-registrar",
Registry: "",
}
Expand Down
Loading

0 comments on commit d841e02

Please sign in to comment.