Skip to content

Commit 1bd249b

Browse files
authored
Updates for v3.26.0 release (#7696)
* Update values.yaml files for v3.26.0 * Generate manifests * Add release notes * Fix deployment file paths
1 parent 21d949e commit 1bd249b

File tree

63 files changed

+182
-112
lines changed

Some content is hidden

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

63 files changed

+182
-112
lines changed

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.26
2+
version: v3.26.0
33

44
# Configure the images to use when generating manifests.
55
node:

charts/tigera-operator/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ podLabels: {}
4141
# Image and registry configuration for the tigera/operator pod.
4242
tigeraOperator:
4343
image: tigera/operator
44-
version: release-v1.30
44+
version: v1.30.0
4545
registry: quay.io
4646
calicoctl:
4747
image: docker.io/calico/ctl
48-
tag: release-v3.26
48+
tag: v3.26.0

hack/release/pkg/builder/builder.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ func (r *ReleaseBuilder) collectGithubArtifacts(ver string) error {
332332
if _, err := r.runner.Run("cp", []string{fmt.Sprintf("bin/tigera-operator-%s.tgz", ver), uploadDir}, nil); err != nil {
333333
return err
334334
}
335-
if _, err := r.runner.Run("cp", []string{"manifests/ocp.tgz", ver, uploadDir}, nil); err != nil {
335+
if _, err := r.runner.Run("cp", []string{"bin/ocp.tgz", uploadDir}, nil); err != nil {
336336
return err
337337
}
338338

@@ -416,7 +416,7 @@ func (r *ReleaseBuilder) buildReleaseTar(ver string, targetDir string) error {
416416
}
417417

418418
// Add in manifests directory generated from the docs.
419-
if _, err := r.runner.Run("cp", []string{"-r", "/manifests", releaseBase}, nil); err != nil {
419+
if _, err := r.runner.Run("cp", []string{"-r", "manifests", releaseBase}, nil); err != nil {
420420
return err
421421
}
422422

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: calico/dikastes:release-v3.26
181+
image: calico/dikastes:v3.26.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: calico/dikastes:release-v3.26
181+
image: calico/dikastes:v3.26.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: calico/dikastes:release-v3.26
183+
image: calico/dikastes:v3.26.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: calico/dikastes:release-v3.26
183+
image: calico/dikastes:v3.26.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: calico/dikastes:release-v3.26
183+
image: calico/dikastes:v3.26.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: calico/dikastes:release-v3.26
183+
image: calico/dikastes:v3.26.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.14.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: calico/dikastes:release-v3.26
183+
image: calico/dikastes:v3.26.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)