mirror of https://github.com/kubernetes/kops.git
				
				
				
			FIX: Pass update-expected for tests
This commit is contained in:
		
							parent
							
								
									2b589d5914
								
							
						
					
					
						commit
						e8dcb67a1f
					
				|  | @ -215,6 +215,7 @@ spec: | ||||||
|     managedASGTag: aws-node-termination-handler/managed |     managedASGTag: aws-node-termination-handler/managed | ||||||
|     memoryRequest: 64Mi |     memoryRequest: 64Mi | ||||||
|     prometheusEnable: false |     prometheusEnable: false | ||||||
|  |     version: v1.14.0 | ||||||
|   nonMasqueradeCIDR: 172.20.0.0/16 |   nonMasqueradeCIDR: 172.20.0.0/16 | ||||||
|   podCIDR: 172.20.128.0/17 |   podCIDR: 172.20.128.0/17 | ||||||
|   secretStore: memfs://clusters.example.com/minimal.example.com/secrets |   secretStore: memfs://clusters.example.com/minimal.example.com/secrets | ||||||
|  |  | ||||||
|  | @ -60,7 +60,7 @@ spec: | ||||||
|     version: 9.99.0 |     version: 9.99.0 | ||||||
|   - id: k8s-1.11 |   - id: k8s-1.11 | ||||||
|     manifest: node-termination-handler.aws/k8s-1.11.yaml |     manifest: node-termination-handler.aws/k8s-1.11.yaml | ||||||
|     manifestHash: 263c1e815b72472dcd22a35e3edd0529d2d94d9a537f031ae4fe90772c5e5c03 |     manifestHash: b0be9a82a9215b10ce4aefa09589e86d754b7484722db7488a8cf3bbaa2ccc3f | ||||||
|     name: node-termination-handler.aws |     name: node-termination-handler.aws | ||||||
|     prune: |     prune: | ||||||
|       kinds: |       kinds: | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ metadata: | ||||||
|     app.kubernetes.io/instance: aws-node-termination-handler |     app.kubernetes.io/instance: aws-node-termination-handler | ||||||
|     app.kubernetes.io/managed-by: kops |     app.kubernetes.io/managed-by: kops | ||||||
|     app.kubernetes.io/name: aws-node-termination-handler |     app.kubernetes.io/name: aws-node-termination-handler | ||||||
|     app.kubernetes.io/version: 1.14.0 |     app.kubernetes.io/version: v1.14.0 | ||||||
|     k8s-addon: node-termination-handler.aws |     k8s-addon: node-termination-handler.aws | ||||||
|     k8s-app: aws-node-termination-handler |     k8s-app: aws-node-termination-handler | ||||||
|   name: aws-node-termination-handler |   name: aws-node-termination-handler | ||||||
|  | @ -91,7 +91,7 @@ metadata: | ||||||
|     app.kubernetes.io/instance: aws-node-termination-handler |     app.kubernetes.io/instance: aws-node-termination-handler | ||||||
|     app.kubernetes.io/managed-by: kops |     app.kubernetes.io/managed-by: kops | ||||||
|     app.kubernetes.io/name: aws-node-termination-handler |     app.kubernetes.io/name: aws-node-termination-handler | ||||||
|     app.kubernetes.io/version: 1.14.0 |     app.kubernetes.io/version: v1.14.0 | ||||||
|     k8s-addon: node-termination-handler.aws |     k8s-addon: node-termination-handler.aws | ||||||
|     k8s-app: aws-node-termination-handler |     k8s-app: aws-node-termination-handler | ||||||
|   name: aws-node-termination-handler |   name: aws-node-termination-handler | ||||||
|  |  | ||||||
|  | @ -217,6 +217,7 @@ spec: | ||||||
|     managedASGTag: aws-node-termination-handler/managed |     managedASGTag: aws-node-termination-handler/managed | ||||||
|     memoryRequest: 64Mi |     memoryRequest: 64Mi | ||||||
|     prometheusEnable: false |     prometheusEnable: false | ||||||
|  |     version: v1.14.0 | ||||||
|   nonMasqueradeCIDR: 172.20.0.0/16 |   nonMasqueradeCIDR: 172.20.0.0/16 | ||||||
|   podCIDR: 172.20.128.0/17 |   podCIDR: 172.20.128.0/17 | ||||||
|   secretStore: memfs://clusters.example.com/minimal.example.com/secrets |   secretStore: memfs://clusters.example.com/minimal.example.com/secrets | ||||||
|  |  | ||||||
|  | @ -67,7 +67,7 @@ spec: | ||||||
|     version: 9.99.0 |     version: 9.99.0 | ||||||
|   - id: k8s-1.11 |   - id: k8s-1.11 | ||||||
|     manifest: node-termination-handler.aws/k8s-1.11.yaml |     manifest: node-termination-handler.aws/k8s-1.11.yaml | ||||||
|     manifestHash: 263c1e815b72472dcd22a35e3edd0529d2d94d9a537f031ae4fe90772c5e5c03 |     manifestHash: b0be9a82a9215b10ce4aefa09589e86d754b7484722db7488a8cf3bbaa2ccc3f | ||||||
|     name: node-termination-handler.aws |     name: node-termination-handler.aws | ||||||
|     prune: |     prune: | ||||||
|       kinds: |       kinds: | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ metadata: | ||||||
|     app.kubernetes.io/instance: aws-node-termination-handler |     app.kubernetes.io/instance: aws-node-termination-handler | ||||||
|     app.kubernetes.io/managed-by: kops |     app.kubernetes.io/managed-by: kops | ||||||
|     app.kubernetes.io/name: aws-node-termination-handler |     app.kubernetes.io/name: aws-node-termination-handler | ||||||
|     app.kubernetes.io/version: 1.14.0 |     app.kubernetes.io/version: v1.14.0 | ||||||
|     k8s-addon: node-termination-handler.aws |     k8s-addon: node-termination-handler.aws | ||||||
|     k8s-app: aws-node-termination-handler |     k8s-app: aws-node-termination-handler | ||||||
|   name: aws-node-termination-handler |   name: aws-node-termination-handler | ||||||
|  | @ -91,7 +91,7 @@ metadata: | ||||||
|     app.kubernetes.io/instance: aws-node-termination-handler |     app.kubernetes.io/instance: aws-node-termination-handler | ||||||
|     app.kubernetes.io/managed-by: kops |     app.kubernetes.io/managed-by: kops | ||||||
|     app.kubernetes.io/name: aws-node-termination-handler |     app.kubernetes.io/name: aws-node-termination-handler | ||||||
|     app.kubernetes.io/version: 1.14.0 |     app.kubernetes.io/version: v1.14.0 | ||||||
|     k8s-addon: node-termination-handler.aws |     k8s-addon: node-termination-handler.aws | ||||||
|     k8s-app: aws-node-termination-handler |     k8s-app: aws-node-termination-handler | ||||||
|   name: aws-node-termination-handler |   name: aws-node-termination-handler | ||||||
|  |  | ||||||
|  | @ -214,6 +214,7 @@ spec: | ||||||
|     managedASGTag: aws-node-termination-handler/managed |     managedASGTag: aws-node-termination-handler/managed | ||||||
|     memoryRequest: 64Mi |     memoryRequest: 64Mi | ||||||
|     prometheusEnable: false |     prometheusEnable: false | ||||||
|  |     version: v1.14.0 | ||||||
|   nonMasqueradeCIDR: 172.20.0.0/16 |   nonMasqueradeCIDR: 172.20.0.0/16 | ||||||
|   podCIDR: 172.20.128.0/17 |   podCIDR: 172.20.128.0/17 | ||||||
|   secretStore: memfs://clusters.example.com/minimal.example.com/secrets |   secretStore: memfs://clusters.example.com/minimal.example.com/secrets | ||||||
|  |  | ||||||
|  | @ -60,7 +60,7 @@ spec: | ||||||
|     version: 9.99.0 |     version: 9.99.0 | ||||||
|   - id: k8s-1.11 |   - id: k8s-1.11 | ||||||
|     manifest: node-termination-handler.aws/k8s-1.11.yaml |     manifest: node-termination-handler.aws/k8s-1.11.yaml | ||||||
|     manifestHash: 9b8cb680850a38ff8b73c49ffc2e864b832e7458f4e93db8dd204a7cf4b19a67 |     manifestHash: bbdad2ac50bd56f8e8c0333fa0e26cea5434fc6621ba981b239ed52f62be2cee | ||||||
|     name: node-termination-handler.aws |     name: node-termination-handler.aws | ||||||
|     prune: |     prune: | ||||||
|       kinds: |       kinds: | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ metadata: | ||||||
|     app.kubernetes.io/instance: aws-node-termination-handler |     app.kubernetes.io/instance: aws-node-termination-handler | ||||||
|     app.kubernetes.io/managed-by: kops |     app.kubernetes.io/managed-by: kops | ||||||
|     app.kubernetes.io/name: aws-node-termination-handler |     app.kubernetes.io/name: aws-node-termination-handler | ||||||
|     app.kubernetes.io/version: 1.14.0 |     app.kubernetes.io/version: v1.14.0 | ||||||
|     k8s-addon: node-termination-handler.aws |     k8s-addon: node-termination-handler.aws | ||||||
|     k8s-app: aws-node-termination-handler |     k8s-app: aws-node-termination-handler | ||||||
|   name: aws-node-termination-handler |   name: aws-node-termination-handler | ||||||
|  | @ -91,7 +91,7 @@ metadata: | ||||||
|     app.kubernetes.io/instance: aws-node-termination-handler |     app.kubernetes.io/instance: aws-node-termination-handler | ||||||
|     app.kubernetes.io/managed-by: kops |     app.kubernetes.io/managed-by: kops | ||||||
|     app.kubernetes.io/name: aws-node-termination-handler |     app.kubernetes.io/name: aws-node-termination-handler | ||||||
|     app.kubernetes.io/version: 1.14.0 |     app.kubernetes.io/version: v1.14.0 | ||||||
|     k8s-addon: node-termination-handler.aws |     k8s-addon: node-termination-handler.aws | ||||||
|     k8s-app: aws-node-termination-handler |     k8s-app: aws-node-termination-handler | ||||||
|   name: aws-node-termination-handler |   name: aws-node-termination-handler | ||||||
|  |  | ||||||
|  | @ -205,6 +205,7 @@ spec: | ||||||
|     managedASGTag: aws-node-termination-handler/managed |     managedASGTag: aws-node-termination-handler/managed | ||||||
|     memoryRequest: 64Mi |     memoryRequest: 64Mi | ||||||
|     prometheusEnable: false |     prometheusEnable: false | ||||||
|  |     version: v1.14.0 | ||||||
|   nonMasqueradeCIDR: 172.20.0.0/16 |   nonMasqueradeCIDR: 172.20.0.0/16 | ||||||
|   podCIDR: 172.20.128.0/17 |   podCIDR: 172.20.128.0/17 | ||||||
|   secretStore: memfs://clusters.example.com/minimal.example.com/secrets |   secretStore: memfs://clusters.example.com/minimal.example.com/secrets | ||||||
|  |  | ||||||
|  | @ -60,7 +60,7 @@ spec: | ||||||
|     version: 9.99.0 |     version: 9.99.0 | ||||||
|   - id: k8s-1.11 |   - id: k8s-1.11 | ||||||
|     manifest: node-termination-handler.aws/k8s-1.11.yaml |     manifest: node-termination-handler.aws/k8s-1.11.yaml | ||||||
|     manifestHash: 9b8cb680850a38ff8b73c49ffc2e864b832e7458f4e93db8dd204a7cf4b19a67 |     manifestHash: bbdad2ac50bd56f8e8c0333fa0e26cea5434fc6621ba981b239ed52f62be2cee | ||||||
|     name: node-termination-handler.aws |     name: node-termination-handler.aws | ||||||
|     prune: |     prune: | ||||||
|       kinds: |       kinds: | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ metadata: | ||||||
|     app.kubernetes.io/instance: aws-node-termination-handler |     app.kubernetes.io/instance: aws-node-termination-handler | ||||||
|     app.kubernetes.io/managed-by: kops |     app.kubernetes.io/managed-by: kops | ||||||
|     app.kubernetes.io/name: aws-node-termination-handler |     app.kubernetes.io/name: aws-node-termination-handler | ||||||
|     app.kubernetes.io/version: 1.14.0 |     app.kubernetes.io/version: v1.14.0 | ||||||
|     k8s-addon: node-termination-handler.aws |     k8s-addon: node-termination-handler.aws | ||||||
|     k8s-app: aws-node-termination-handler |     k8s-app: aws-node-termination-handler | ||||||
|   name: aws-node-termination-handler |   name: aws-node-termination-handler | ||||||
|  | @ -91,7 +91,7 @@ metadata: | ||||||
|     app.kubernetes.io/instance: aws-node-termination-handler |     app.kubernetes.io/instance: aws-node-termination-handler | ||||||
|     app.kubernetes.io/managed-by: kops |     app.kubernetes.io/managed-by: kops | ||||||
|     app.kubernetes.io/name: aws-node-termination-handler |     app.kubernetes.io/name: aws-node-termination-handler | ||||||
|     app.kubernetes.io/version: 1.14.0 |     app.kubernetes.io/version: v1.14.0 | ||||||
|     k8s-addon: node-termination-handler.aws |     k8s-addon: node-termination-handler.aws | ||||||
|     k8s-app: aws-node-termination-handler |     k8s-app: aws-node-termination-handler | ||||||
|   name: aws-node-termination-handler |   name: aws-node-termination-handler | ||||||
|  |  | ||||||
|  | @ -170,6 +170,7 @@ spec: | ||||||
|     managedASGTag: aws-node-termination-handler/managed |     managedASGTag: aws-node-termination-handler/managed | ||||||
|     memoryRequest: 64Mi |     memoryRequest: 64Mi | ||||||
|     prometheusEnable: false |     prometheusEnable: false | ||||||
|  |     version: v1.14.0 | ||||||
|   nonMasqueradeCIDR: 100.64.0.0/10 |   nonMasqueradeCIDR: 100.64.0.0/10 | ||||||
|   podCIDR: 100.96.0.0/11 |   podCIDR: 100.96.0.0/11 | ||||||
|   secretStore: memfs://clusters.example.com/nthsqsresources.longclustername.example.com/secrets |   secretStore: memfs://clusters.example.com/nthsqsresources.longclustername.example.com/secrets | ||||||
|  |  | ||||||
|  | @ -47,7 +47,7 @@ spec: | ||||||
|     version: 9.99.0 |     version: 9.99.0 | ||||||
|   - id: k8s-1.11 |   - id: k8s-1.11 | ||||||
|     manifest: node-termination-handler.aws/k8s-1.11.yaml |     manifest: node-termination-handler.aws/k8s-1.11.yaml | ||||||
|     manifestHash: 10d08b366893f1f11be9b722fd862b510c4aa8e66c1b89345d46a141cf2286ed |     manifestHash: 99a2738356bc31978f60b253f83eeea29dd1d868b5b0203ef86d4c52dc4b45bc | ||||||
|     name: node-termination-handler.aws |     name: node-termination-handler.aws | ||||||
|     prune: |     prune: | ||||||
|       kinds: |       kinds: | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ metadata: | ||||||
|     app.kubernetes.io/instance: aws-node-termination-handler |     app.kubernetes.io/instance: aws-node-termination-handler | ||||||
|     app.kubernetes.io/managed-by: kops |     app.kubernetes.io/managed-by: kops | ||||||
|     app.kubernetes.io/name: aws-node-termination-handler |     app.kubernetes.io/name: aws-node-termination-handler | ||||||
|     app.kubernetes.io/version: 1.14.0 |     app.kubernetes.io/version: v1.14.0 | ||||||
|     k8s-addon: node-termination-handler.aws |     k8s-addon: node-termination-handler.aws | ||||||
|     k8s-app: aws-node-termination-handler |     k8s-app: aws-node-termination-handler | ||||||
|   name: aws-node-termination-handler |   name: aws-node-termination-handler | ||||||
|  | @ -91,7 +91,7 @@ metadata: | ||||||
|     app.kubernetes.io/instance: aws-node-termination-handler |     app.kubernetes.io/instance: aws-node-termination-handler | ||||||
|     app.kubernetes.io/managed-by: kops |     app.kubernetes.io/managed-by: kops | ||||||
|     app.kubernetes.io/name: aws-node-termination-handler |     app.kubernetes.io/name: aws-node-termination-handler | ||||||
|     app.kubernetes.io/version: 1.14.0 |     app.kubernetes.io/version: v1.14.0 | ||||||
|     k8s-addon: node-termination-handler.aws |     k8s-addon: node-termination-handler.aws | ||||||
|     k8s-app: aws-node-termination-handler |     k8s-app: aws-node-termination-handler | ||||||
|   name: aws-node-termination-handler |   name: aws-node-termination-handler | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue