Merge pull request #14952 from olemarkus/cas-bump-1261

Bump cluster autoscaler to 1.26.1
2023-01-05 05:25:58 -08:00 · 2023-01-05 05:25:58 -08:00 · a3f4f97a53
parent 7b4430ff61 517da72ff5
commit a3f4f97a53
16 changed files with 17 additions and 17 deletions
--- a/pkg/model/components/clusterautoscaler.go
+++ b/pkg/model/components/clusterautoscaler.go
@ -52,9 +52,9 @@ func (b *ClusterAutoscalerOptionsBuilder) BuildOptions(o interface{}) error {
 			case 25:
 				image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.0"
 			case 26:
-				image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.0"
+				image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.1"
 			default:
-				image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.0"
+				image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.1"
 			}
 		}
 		cas.Image = fi.PtrTo(image)
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content
@ -33,7 +33,7 @@ spec:
    balanceSimilarNodeGroups: false
    enabled: true
    expander: random
-    image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.0
+    image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.1
    maxNodeProvisionTime: 15m0s
    newPodScaleUpDelay: 0s
    scaleDownDelayAfterAdd: 10m0s
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -41,7 +41,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.15
    manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
-    manifestHash: 10c96e535d61975b58b27ac8beef2da578df330febaed51db73c249d545d20da
+    manifestHash: ae5578d4a54d4c7fd6d4ffc55c0b382c6b3dce39f258dd5ddc17d726d3b797db
    name: cluster-autoscaler.addons.k8s.io
    selector:
      k8s-addon: cluster-autoscaler.addons.k8s.io
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content
@ -344,7 +344,7 @@ spec:
          value: arn:aws-test:iam::123456789012:role/cluster-autoscaler.kube-system.sa.minimal.example.com
        - name: AWS_WEB_IDENTITY_TOKEN_FILE
          value: /var/run/secrets/amazonaws.com/token
-        image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.0
+        image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.1
        imagePullPolicy: IfNotPresent
        livenessProbe:
          failureThreshold: 3
--- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content
@ -33,7 +33,7 @@ spec:
    balanceSimilarNodeGroups: false
    enabled: true
    expander: random
-    image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.0
+    image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.1
    maxNodeProvisionTime: 15m0s
    newPodScaleUpDelay: 0s
    scaleDownDelayAfterAdd: 10m0s
--- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -49,7 +49,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.15
    manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
-    manifestHash: 10c96e535d61975b58b27ac8beef2da578df330febaed51db73c249d545d20da
+    manifestHash: ae5578d4a54d4c7fd6d4ffc55c0b382c6b3dce39f258dd5ddc17d726d3b797db
    name: cluster-autoscaler.addons.k8s.io
    selector:
      k8s-addon: cluster-autoscaler.addons.k8s.io
--- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content
@ -344,7 +344,7 @@ spec:
          value: arn:aws-test:iam::123456789012:role/cluster-autoscaler.kube-system.sa.minimal.example.com
        - name: AWS_WEB_IDENTITY_TOKEN_FILE
          value: /var/run/secrets/amazonaws.com/token
-        image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.0
+        image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.1
        imagePullPolicy: IfNotPresent
        livenessProbe:
          failureThreshold: 3
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content
@ -33,7 +33,7 @@ spec:
    balanceSimilarNodeGroups: false
    enabled: true
    expander: random
-    image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.0
+    image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.1
    maxNodeProvisionTime: 15m0s
    newPodScaleUpDelay: 0s
    scaleDownDelayAfterAdd: 10m0s
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -41,7 +41,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.15
    manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
-    manifestHash: 2d0ce7743ac871427dce8c4d824e0a39afbb28d9a0aeebc54615ad0708deb029
+    manifestHash: 9a2c29ff5f282fd1ff028373cf1e0e2530a95853f1d8052fcc0476a899f56b2e
    name: cluster-autoscaler.addons.k8s.io
    selector:
      k8s-addon: cluster-autoscaler.addons.k8s.io
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content
@ -342,7 +342,7 @@ spec:
        env:
        - name: AWS_REGION
          value: us-test-1
-        image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.0
+        image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.1
        imagePullPolicy: IfNotPresent
        livenessProbe:
          failureThreshold: 3
--- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content
@ -31,7 +31,7 @@ spec:
    balanceSimilarNodeGroups: false
    enabled: true
    expander: random
-    image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.0
+    image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.1
    maxNodeProvisionTime: 15m0s
    newPodScaleUpDelay: 0s
    scaleDownDelayAfterAdd: 10m0s
--- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -41,7 +41,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.15
    manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
-    manifestHash: c4b9cdc4f3dc1724be5ea9e62abe442ec7afc53a64d290924b13f9ccdea95551
+    manifestHash: 7fdcb8e43211dabb7f6efee0fe1b2a006076b80d3c406ee92991f56a5d6229cb
    name: cluster-autoscaler.addons.k8s.io
    selector:
      k8s-addon: cluster-autoscaler.addons.k8s.io
--- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content
+++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content
@ -338,7 +338,7 @@ spec:
        - --logtostderr=true
        - --stderrthreshold=info
        - --v=4
-        image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.0
+        image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.1
        imagePullPolicy: IfNotPresent
        livenessProbe:
          failureThreshold: 3
--- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content
@ -32,7 +32,7 @@ spec:
    balanceSimilarNodeGroups: false
    enabled: true
    expander: random
-    image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.0
+    image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.1
    maxNodeProvisionTime: 15m0s
    newPodScaleUpDelay: 0s
    podAnnotations:
--- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -41,7 +41,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.15
    manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
-    manifestHash: a84a2659889876b2e63bdf34d12f431074d9c49e5fa159fe5fb2033c999b3b29
+    manifestHash: b86c65b3e7a267ef6cced12c2a810b2185de558d0b4cbcf96d10058bc0d2d744
    name: cluster-autoscaler.addons.k8s.io
    selector:
      k8s-addon: cluster-autoscaler.addons.k8s.io
--- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content
+++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content
@ -343,7 +343,7 @@ spec:
        env:
        - name: AWS_REGION
          value: us-test-1
-        image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.0
+        image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.1
        imagePullPolicy: IfNotPresent
        livenessProbe:
          failureThreshold: 3