clean up

eksctl-io · Sep 13, 2022 · 59ebb21 · 59ebb21
1 parent a5271e4
commit 59ebb21
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 78 deletions.
diff --git a/Makefile b/Makefile
@@ -136,7 +136,7 @@ delete-integration-test-dev-cluster: build ## Delete the test cluster for use wh
 ##@ Code Generation
 
 .PHONY: generate-always
-generate-always: ## Generate code (required for every build)
+generate-always: pkg/addons/default/assets/aws-node.yaml ## Generate code (required for every build)
 	go generate ./pkg/apis/eksctl.io/v1alpha5/generate.go
 	go generate ./pkg/nodebootstrap
 	go generate ./pkg/addons

diff --git a/integration/data/podinfo.yaml b/integration/data/podinfo.yaml
@@ -31,16 +31,16 @@ spec:
           httpGet:
             path: /readyz
             port: 8080
-          initialDelaySeconds: 3
+          initialDelaySeconds: 1
           periodSeconds: 5
-          failureThreshold: 10
+          failureThreshold: 1
         livenessProbe:
           httpGet:
             path: /healthz
             port: 8080
-          initialDelaySeconds: 5
+          initialDelaySeconds: 1
           periodSeconds: 10
-          failureThreshold: 15
+          failureThreshold: 2
         resources:
           requests:
             memory: "32Mi"

diff --git a/integration/tests/managed/managed_nodegroup_test.go b/integration/tests/managed/managed_nodegroup_test.go
@@ -379,9 +379,10 @@ var _ = Describe("(Integration) Create Managed Nodegroups", func() {
 				},
 				{
 					NodeGroupBase: &api.NodeGroupBase{
-						Name:       ubuntuNodegroup,
-						VolumeSize: aws.Int(25),
-						AMIFamily:  "Ubuntu2004",
+						Name:         ubuntuNodegroup,
+						VolumeSize:   aws.Int(25),
+						AMIFamily:    "Ubuntu2004",
+						InstanceType: "t3a.xlarge",
 					},
 				},
 			}

diff --git a/pkg/addons/default/assets/aws-node.yaml b/pkg/addons/default/assets/aws-node.yaml
@@ -124,18 +124,18 @@ spec:
       serviceAccountName: aws-node
       hostNetwork: true
       initContainers:
-        - name: aws-vpc-cni-init
-          image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.11.3"
-          env:
-            - name: DISABLE_TCP_EARLY_DEMUX
-              value: "false"
-            - name: ENABLE_IPv6
-              value: "false"
-          securityContext:
+      - name: aws-vpc-cni-init
+        image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.11.3"
+        env:
+          - name: DISABLE_TCP_EARLY_DEMUX
+            value: "false"
+          - name: ENABLE_IPv6
+            value: "false"
+        securityContext:
             privileged: true
-          volumeMounts:
-            - mountPath: /host/opt/cni/bin
-              name: cni-bin-dir
+        volumeMounts:
+          - mountPath: /host/opt/cni/bin
+            name: cni-bin-dir
       terminationGracePeriodSeconds: 10
       tolerations:
         - operator: Exists
@@ -150,21 +150,21 @@ spec:
           livenessProbe:
             exec:
               command:
-                - /app/grpc-health-probe
-                - -addr=:50051
-                - -connect-timeout=10s
-                - -rpc-timeout=10s
+              - /app/grpc-health-probe
+              - -addr=:50051
+              - -connect-timeout=5s
+              - -rpc-timeout=5s
             initialDelaySeconds: 60
-            timeoutSeconds: 15
+            timeoutSeconds: 10
           readinessProbe:
             exec:
               command:
-                - /app/grpc-health-probe
-                - -addr=:50051
-                - -connect-timeout=10s
-                - -rpc-timeout=10s
-            initialDelaySeconds: 5
-            timeoutSeconds: 15
+              - /app/grpc-health-probe
+              - -addr=:50051
+              - -connect-timeout=5s
+              - -rpc-timeout=5s
+            initialDelaySeconds: 1
+            timeoutSeconds: 10
           env:
             - name: ADDITIONAL_ENI_TAGS
               value: "{}"
@@ -181,7 +181,7 @@ spec:
             - name: AWS_VPC_K8S_CNI_LOGLEVEL
               value: "DEBUG"
             - name: AWS_VPC_K8S_CNI_LOG_FILE
-              value: "stdout"
+              value: "/host/var/log/aws-routed-eni/ipamd.log"
             - name: AWS_VPC_K8S_CNI_RANDOMIZESNAT
               value: "prng"
             - name: AWS_VPC_K8S_CNI_VETHPREFIX
@@ -218,56 +218,56 @@ spec:
           securityContext:
             capabilities:
               add:
-                - NET_ADMIN
+              - NET_ADMIN
           volumeMounts:
-            - mountPath: /host/opt/cni/bin
-              name: cni-bin-dir
-            - mountPath: /host/etc/cni/net.d
-              name: cni-net-dir
-            - mountPath: /host/var/log/aws-routed-eni
-              name: log-dir
-            - mountPath: /var/run/dockershim.sock
-              name: dockershim
-            - mountPath: /var/run/aws-node
-              name: run-dir
-            - mountPath: /run/xtables.lock
-              name: xtables-lock
+          - mountPath: /host/opt/cni/bin
+            name: cni-bin-dir
+          - mountPath: /host/etc/cni/net.d
+            name: cni-net-dir
+          - mountPath: /host/var/log/aws-routed-eni
+            name: log-dir
+          - mountPath: /var/run/dockershim.sock
+            name: dockershim
+          - mountPath: /var/run/aws-node
+            name: run-dir
+          - mountPath: /run/xtables.lock
+            name: xtables-lock
       volumes:
-        - name: cni-bin-dir
-          hostPath:
-            path: /opt/cni/bin
-        - name: cni-net-dir
-          hostPath:
-            path: /etc/cni/net.d
-        - name: dockershim
-          hostPath:
-            path: /var/run/dockershim.sock
-        - name: log-dir
-          hostPath:
-            path: /var/log/aws-routed-eni
-            type: DirectoryOrCreate
-        - name: run-dir
-          hostPath:
-            path: /var/run/aws-node
-            type: DirectoryOrCreate
-        - name: xtables-lock
-          hostPath:
-            path: /run/xtables.lock
+      - name: cni-bin-dir
+        hostPath:
+          path: /opt/cni/bin
+      - name: cni-net-dir
+        hostPath:
+          path: /etc/cni/net.d
+      - name: dockershim
+        hostPath:
+          path: /var/run/dockershim.sock
+      - name: log-dir
+        hostPath:
+          path: /var/log/aws-routed-eni
+          type: DirectoryOrCreate
+      - name: run-dir
+        hostPath:
+          path: /var/run/aws-node
+          type: DirectoryOrCreate
+      - name: xtables-lock
+        hostPath:
+          path: /run/xtables.lock
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
-              - matchExpressions:
-                  - key: kubernetes.io/os
-                    operator: In
-                    values:
-                      - linux
-                  - key: kubernetes.io/arch
-                    operator: In
-                    values:
-                      - amd64
-                      - arm64
-                  - key: eks.amazonaws.com/compute-type
-                    operator: NotIn
-                    values:
-                      - fargate
+            - matchExpressions:
+              - key: kubernetes.io/os
+                operator: In
+                values:
+                - linux
+              - key: kubernetes.io/arch
+                operator: In
+                values:
+                - amd64
+                - arm64
+              - key: eks.amazonaws.com/compute-type
+                operator: NotIn
+                values:
+                - fargate