Merge pull request #8268 from hakman/compare-examples

azure: Make it easier to compare examples

Author: k8s-ci-robot

cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-aks.yaml

@@ -125,7 +125,7 @@ data:
   ClientID: <base64-encoded-client-id>
   ClientSecret: <base64-encoded-client-secret>
   ResourceGroup: <base64-encoded-resource-group>
-  SubscriptionID: <base64-encode-subscription-id>
+  SubscriptionID: <base64-encoded-subscription-id>
   TenantID: <base64-encoded-tenant-id>
   VMType: QUtTCg==
 kind: Secret
@@ -152,17 +152,7 @@ spec:
     spec:
       serviceAccountName: cluster-autoscaler
       containers:
-        - image: registry.k8s.io/autoscaling/cluster-autoscaler:{{ ca_version }}
-          imagePullPolicy: Always
-          name: cluster-autoscaler
-          resources:
-            limits:
-              cpu: 100m
-              memory: 300Mi
-            requests:
-              cpu: 100m
-              memory: 300Mi
-          command:
+        - command:
             - ./cluster-autoscaler
             - --v=3
             - --logtostderr=true
@@ -200,4 +190,14 @@ spec:
                 secretKeyRef:
                   key: VMType
                   name: cluster-autoscaler-azure
+          image: registry.k8s.io/autoscaling/cluster-autoscaler:{{ ca_version }}
+          imagePullPolicy: Always
+          name: cluster-autoscaler
+          resources:
+            limits:
+              cpu: 100m
+              memory: 300Mi
+            requests:
+              cpu: 100m
+              memory: 300Mi
       restartPolicy: Always

cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-autodiscover.yaml

@@ -123,7 +123,7 @@ subjects:
 apiVersion: v1
 data:
   ResourceGroup: <base64-encoded-resource-group>
-  SubscriptionID: <base64-encode-subscription-id>
+  SubscriptionID: <base64-encoded-subscription-id>
   Deployment: <base64-encoded-azure-initial-deploy-name>
   VMType: c3RhbmRhcmQ=
 kind: Secret

cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-standard-msi.yaml

@@ -123,7 +123,7 @@ subjects:
 apiVersion: v1
 data:
   ResourceGroup: <base64-encoded-resource-group>
-  SubscriptionID: <base64-encode-subscription-id>
+  SubscriptionID: <base64-encoded-subscription-id>
   Deployment: <base64-encoded-azure-initial-deploy-name>
   VMType: c3RhbmRhcmQ=
 kind: Secret

cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-standard.yaml

@@ -125,7 +125,7 @@ data:
   ClientID: <base64-encoded-client-id>
   ClientSecret: <base64-encoded-client-secret>
   ResourceGroup: <base64-encoded-resource-group>
-  SubscriptionID: <base64-encode-subscription-id>
+  SubscriptionID: <base64-encoded-subscription-id>
   TenantID: <base64-encoded-tenant-id>
   Deployment: <base64-encoded-azure-initial-deploy-name>
   VMType: c3RhbmRhcmQ=

cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-vmss-control-plane.yaml

@@ -125,7 +125,7 @@ data:
   ClientID: <base64-encoded-client-id>
   ClientSecret: <base64-encoded-client-secret>
   ResourceGroup: <base64-encoded-resource-group>
-  SubscriptionID: <base64-encode-subscription-id>
+  SubscriptionID: <base64-encoded-subscription-id>
   TenantID: <base64-encoded-tenant-id>
   VMType: dm1zcw==
 kind: Secret
@@ -159,10 +159,7 @@ spec:
       nodeSelector:
         kubernetes.io/role: control-plane
       containers:
-        - image: registry.k8s.io/autoscaling/cluster-autoscaler:{{ ca_version }}
-          imagePullPolicy: Always
-          name: cluster-autoscaler
-          command:
+        - command:
             - ./cluster-autoscaler
             - --v=3
             - --logtostderr=true
@@ -201,6 +198,9 @@ spec:
                 secretKeyRef:
                   key: VMType
                   name: cluster-autoscaler-azure
+          image: registry.k8s.io/autoscaling/cluster-autoscaler:{{ ca_version }}
+          imagePullPolicy: Always
+          name: cluster-autoscaler
           resources:
             limits:
               cpu: 100m

cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-vmss-msi.yaml

@@ -123,7 +123,7 @@ subjects:
 apiVersion: v1
 data:
   ResourceGroup: <base64-encoded-resource-group>
-  SubscriptionID: <base64-encode-subscription-id>
+  SubscriptionID: <base64-encoded-subscription-id>
   VMType: dm1zcw==
 kind: Secret
 metadata:
@@ -157,10 +157,7 @@ spec:
       nodeSelector:
         kubernetes.io/role: control-plane
       containers:
-        - image: registry.k8s.io/autoscaling/cluster-autoscaler:{{ ca_version }}
-          imagePullPolicy: Always
-          name: cluster-autoscaler
-          command:
+        - command:
             - ./cluster-autoscaler
             - --v=3
             - --logtostderr=true
@@ -186,6 +183,9 @@ spec:
                 secretKeyRef:
                   key: VMType
                   name: cluster-autoscaler-azure
+          image: registry.k8s.io/autoscaling/cluster-autoscaler:{{ ca_version }}
+          imagePullPolicy: Always
+          name: cluster-autoscaler
           resources:
             limits:
               cpu: 100m

cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-vmss.yaml

@@ -125,7 +125,7 @@ data:
   ClientID: <base64-encoded-client-id>
   ClientSecret: <base64-encoded-client-secret>
   ResourceGroup: <base64-encoded-resource-group>
-  SubscriptionID: <base64-encode-subscription-id>
+  SubscriptionID: <base64-encoded-subscription-id>
   TenantID: <base64-encoded-tenant-id>
   VMType: dm1zcw==
 kind: Secret
@@ -152,17 +152,7 @@ spec:
     spec:
       serviceAccountName: cluster-autoscaler
       containers:
-        - image: registry.k8s.io/autoscaling/cluster-autoscaler:{{ ca_version }}
-          imagePullPolicy: Always
-          name: cluster-autoscaler
-          resources:
-            limits:
-              cpu: 100m
-              memory: 300Mi
-            requests:
-              cpu: 100m
-              memory: 300Mi
-          command:
+        - command:
             - ./cluster-autoscaler
             - --v=3
             - --logtostderr=true
@@ -201,6 +191,16 @@ spec:
                 secretKeyRef:
                   key: VMType
                   name: cluster-autoscaler-azure
+          image: registry.k8s.io/autoscaling/cluster-autoscaler:{{ ca_version }}
+          imagePullPolicy: Always
+          name: cluster-autoscaler
+          resources:
+            limits:
+              cpu: 100m
+              memory: 300Mi
+            requests:
+              cpu: 100m
+              memory: 300Mi
           volumeMounts:
             - mountPath: /etc/ssl/certs/ca-certificates.crt
               name: ssl-certs