From 693a72a2286bbd94597691afe75bee97bb73929c Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Wed, 6 Sep 2023 06:32:57 +0300 Subject: [PATCH] hack/update-expected.sh --- ...-ipv6.example.com-addons-bootstrap_content | 2 +- ...working.projectcalico.org-k8s-1.25_content | 20 ++++++++--------- ...alico.example.com-addons-bootstrap_content | 2 +- ...working.projectcalico.org-k8s-1.25_content | 22 +++++++++---------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content index 111eb0e44a..1e837b22ad 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.25 manifest: networking.projectcalico.org/k8s-1.25.yaml - manifestHash: bde3f2186b82eddaca56d35ff7ec2c96e6f8feb583f3096da045eb0d00cdf492 + manifestHash: 5898b8d3b8178048ad8777ba31094d24684e11627cf167923b622cfb4afb12bf name: networking.projectcalico.org prune: kinds: diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-networking.projectcalico.org-k8s-1.25_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-networking.projectcalico.org-k8s-1.25_content index dad05346ff..99e3c201cb 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-networking.projectcalico.org-k8s-1.25_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-networking.projectcalico.org-k8s-1.25_content @@ -1019,12 +1019,12 @@ spec: - type: string description: 'BPFPSNATPorts sets the range from which we randomly pick a port if there is a source port collision. This should be - within the ephemeral range as defined by RFC 6056 (1024–65535) - and preferably outside the ephemeral ranges used by common operating - systems. Linux uses 32768–60999, while others mostly use the IANA - defined range 49152–65535. It is not necessarily a problem if - this range overlaps with the operating systems. Both ends of the - range are inclusive. [Default: 20000:29999]' + within the ephemeral range as defined by RFC 6056 (1024–65535) and + preferably outside the ephemeral ranges used by common operating + systems. Linux uses 32768–60999, while others mostly use the IANA + defined range 49152–65535. It is not necessarily a problem if this + range overlaps with the operating systems. Both ends of the range + are inclusive. [Default: 20000:29999]' pattern: ^.* x-kubernetes-int-or-string: true bpfPolicyDebugEnabled: @@ -4626,7 +4626,7 @@ spec: - configMapRef: name: kubernetes-services-endpoint optional: true - image: docker.io/calico/node:v3.25.1 + image: docker.io/calico/node:v3.25.2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -4706,7 +4706,7 @@ spec: - configMapRef: name: kubernetes-services-endpoint optional: true - image: docker.io/calico/cni:v3.25.1 + image: docker.io/calico/cni:v3.25.2 imagePullPolicy: IfNotPresent name: install-cni securityContext: @@ -4720,7 +4720,7 @@ spec: - calico-node - -init - -best-effort - image: docker.io/calico/node:v3.25.1 + image: docker.io/calico/node:v3.25.2 imagePullPolicy: IfNotPresent name: mount-bpffs securityContext: @@ -4843,7 +4843,7 @@ spec: value: node - name: DATASTORE_TYPE value: kubernetes - image: docker.io/calico/kube-controllers:v3.25.1 + image: docker.io/calico/kube-controllers:v3.25.2 imagePullPolicy: IfNotPresent livenessProbe: exec: diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content index a3052a7ae0..51dca7c42a 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.25 manifest: networking.projectcalico.org/k8s-1.25.yaml - manifestHash: 8a9f1f3229fc5eb8fb4e134a93eb8a70c00e135fc6eca6046e9b4c4902fa7205 + manifestHash: 36e27a220f36800fe4dba1c00904fc41b0a3398f553549235c8bbbd205b47205 name: networking.projectcalico.org prune: kinds: diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-networking.projectcalico.org-k8s-1.25_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-networking.projectcalico.org-k8s-1.25_content index c53a7d872d..abba25df1a 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-networking.projectcalico.org-k8s-1.25_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-networking.projectcalico.org-k8s-1.25_content @@ -1018,12 +1018,12 @@ spec: - type: string description: 'BPFPSNATPorts sets the range from which we randomly pick a port if there is a source port collision. This should be - within the ephemeral range as defined by RFC 6056 (1024–65535) - and preferably outside the ephemeral ranges used by common operating - systems. Linux uses 32768–60999, while others mostly use the IANA - defined range 49152–65535. It is not necessarily a problem if - this range overlaps with the operating systems. Both ends of the - range are inclusive. [Default: 20000:29999]' + within the ephemeral range as defined by RFC 6056 (1024–65535) and + preferably outside the ephemeral ranges used by common operating + systems. Linux uses 32768–60999, while others mostly use the IANA + defined range 49152–65535. It is not necessarily a problem if this + range overlaps with the operating systems. Both ends of the range + are inclusive. [Default: 20000:29999]' pattern: ^.* x-kubernetes-int-or-string: true bpfPolicyDebugEnabled: @@ -4621,7 +4621,7 @@ spec: - configMapRef: name: kubernetes-services-endpoint optional: true - image: docker.io/calico/node:v3.25.1 + image: docker.io/calico/node:v3.25.2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -4695,7 +4695,7 @@ spec: - configMapRef: name: kubernetes-services-endpoint optional: true - image: docker.io/calico/cni:v3.25.1 + image: docker.io/calico/cni:v3.25.2 imagePullPolicy: IfNotPresent name: upgrade-ipam securityContext: @@ -4730,7 +4730,7 @@ spec: - configMapRef: name: kubernetes-services-endpoint optional: true - image: docker.io/calico/cni:v3.25.1 + image: docker.io/calico/cni:v3.25.2 imagePullPolicy: IfNotPresent name: install-cni securityContext: @@ -4744,7 +4744,7 @@ spec: - calico-node - -init - -best-effort - image: docker.io/calico/node:v3.25.1 + image: docker.io/calico/node:v3.25.2 imagePullPolicy: IfNotPresent name: mount-bpffs securityContext: @@ -4870,7 +4870,7 @@ spec: value: node - name: DATASTORE_TYPE value: kubernetes - image: docker.io/calico/kube-controllers:v3.25.1 + image: docker.io/calico/kube-controllers:v3.25.2 imagePullPolicy: IfNotPresent livenessProbe: exec: