Skip to content

Commit eb1cf57

Browse files
authored
build: v3.32.0 release (#12648)
* build: v3.32.0 release * Use SEMAPHORE_GIT_BRANCH only if it's release or master * Add operator branch to release/release publish * Create temp directory when we start up * Enhance release note parsing * Regenerate release notes * Add headline features
1 parent 7acc397 commit eb1cf57

68 files changed

Lines changed: 314 additions & 125 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,14 +249,14 @@ bin/gh:
249249

250250
# Build a release.
251251
release: release/bin/release
252-
@release/bin/release release build
252+
@OPERATOR_BRANCH=$(OPERATOR_BRANCH) release/bin/release release build
253253

254254
# Publish an already built release.
255255
release-publish: release/bin/release bin/ghr bin/helm
256-
@release/bin/release release publish
256+
@OPERATOR_BRANCH=$(OPERATOR_BRANCH) release/bin/release release publish
257257

258258
release-public: bin/gh release/bin/release
259-
@release/bin/release release public
259+
@OPERATOR_BRANCH=$(OPERATOR_BRANCH) release/bin/release release public
260260

261261
# Create a release branch.
262262
create-release-branch: release/bin/release

charts/calico/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# The Calico version to use when generating manifests.
2-
version: release-v3.32
2+
version: v3.32.0
33

44
# Configure the images to use when generating manifests.
55
# If a new image is added, update manifests/generate.sh

charts/tigera-operator/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,11 @@ dnsConfig: {}
147147
# Image and registry configuration for the tigera/operator pod.
148148
tigeraOperator:
149149
image: tigera/operator
150-
version: master
150+
version: v1.42.0
151151
registry: quay.io
152152
calicoctl:
153153
image: quay.io/calico/ctl
154-
tag: release-v3.32
154+
tag: v3.32.0
155155

156156
# Optionally configure the host and port used to access the Kubernetes API server.
157157
kubernetesServiceEndpoint:

hack/cmd/deps/deps.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -822,8 +822,10 @@ func calculateDefaultBranch(semaphoreDir string) (string, error) {
822822
// In CI, this env var is set either to the current branch, if we're
823823
// building on a branch, or to the target branch if we're building
824824
// a PR.
825-
logrus.Infof("Using SEMAPHORE_GIT_BRANCH for default branch: %s", branch)
826-
return branch, nil
825+
if branch == "master" || strings.HasPrefix(branch, "release-v") {
826+
logrus.Infof("Using SEMAPHORE_GIT_BRANCH for default branch: %s", branch)
827+
return branch, nil
828+
}
827829
}
828830

829831
// Fallback to git.

manifests/alp/istio-inject-configmap-1.1.0.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ data:
178178
- mountPath: /var/run/dikastes
179179
name: dikastes-sock
180180
- name: dikastes
181-
image: quay.io/calico/dikastes:release-v3.32
181+
image: quay.io/calico/dikastes:v3.32.0
182182
args: ["server", "-l", "/var/run/dikastes/dikastes.sock", "-d", "/var/run/felix/nodeagent/socket"]
183183
securityContext:
184184
allowPrivilegeEscalation: false

manifests/alp/istio-inject-configmap-1.1.1.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ data:
178178
- mountPath: /var/run/dikastes
179179
name: dikastes-sock
180180
- name: dikastes
181-
image: quay.io/calico/dikastes:release-v3.32
181+
image: quay.io/calico/dikastes:v3.32.0
182182
args: ["server", "-l", "/var/run/dikastes/dikastes.sock", "-d", "/var/run/felix/nodeagent/socket"]
183183
securityContext:
184184
allowPrivilegeEscalation: false

manifests/alp/istio-inject-configmap-1.1.10.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ data:
180180
- mountPath: /var/run/dikastes
181181
name: dikastes-sock
182182
- name: dikastes
183-
image: quay.io/calico/dikastes:release-v3.32
183+
image: quay.io/calico/dikastes:v3.32.0
184184
args: ["server", "-l", "/var/run/dikastes/dikastes.sock", "-d", "/var/run/felix/nodeagent/socket"]
185185
securityContext:
186186
allowPrivilegeEscalation: false

manifests/alp/istio-inject-configmap-1.1.11.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ data:
180180
- mountPath: /var/run/dikastes
181181
name: dikastes-sock
182182
- name: dikastes
183-
image: quay.io/calico/dikastes:release-v3.32
183+
image: quay.io/calico/dikastes:v3.32.0
184184
args: ["server", "-l", "/var/run/dikastes/dikastes.sock", "-d", "/var/run/felix/nodeagent/socket"]
185185
securityContext:
186186
allowPrivilegeEscalation: false

manifests/alp/istio-inject-configmap-1.1.12.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ data:
180180
- mountPath: /var/run/dikastes
181181
name: dikastes-sock
182182
- name: dikastes
183-
image: quay.io/calico/dikastes:release-v3.32
183+
image: quay.io/calico/dikastes:v3.32.0
184184
args: ["server", "-l", "/var/run/dikastes/dikastes.sock", "-d", "/var/run/felix/nodeagent/socket"]
185185
securityContext:
186186
allowPrivilegeEscalation: false

manifests/alp/istio-inject-configmap-1.1.13.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ data:
180180
- mountPath: /var/run/dikastes
181181
name: dikastes-sock
182182
- name: dikastes
183-
image: quay.io/calico/dikastes:release-v3.32
183+
image: quay.io/calico/dikastes:v3.32.0
184184
args: ["server", "-l", "/var/run/dikastes/dikastes.sock", "-d", "/var/run/felix/nodeagent/socket"]
185185
securityContext:
186186
allowPrivilegeEscalation: false

0 commit comments

Comments
 (0)