Skip to content

Commit 93dc270

Browse files
author
John Lam
committed
Prepare v1.3.8 release: Update to GitHub Container Registry and synchronize configurations
- Update all image references from Docker Hub to GitHub Container Registry (ghcr.io) - Synchronize YAML manifests with Helm chart configurations - Bump version to v1.3.8 in Chart.yaml and all image tags - Add missing NODE_NAME environment variable to deployment.yaml - Update resource limits to match Helm chart values (500m CPU, 512Mi memory) - Add LOG_LEVEL environment variable to eni-manager-daemonset.yaml - Fix golint issue in pkg/eni-manager/network/manager.go (remove unnecessary else block) - Ensure MAX_CONCURRENT_RECONCILES is set to 5 consistently across all manifests - All Go code quality checks passing (go vet, golint, gocyclo, ineffassign, misspell) - All tests passing successfully
1 parent 77789df commit 93dc270

5 files changed

Lines changed: 22 additions & 16 deletions

File tree

charts/aws-multi-eni-controller/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: v2
22
name: aws-multi-eni-controller
33
description: A Helm chart for AWS Multi-ENI Controller
44
type: application
5-
version: "1.3.7"
6-
appVersion: "v1.3.6-comprehensive-tests"
5+
version: "1.3.8"
6+
appVersion: "v1.3.8"
77
home: https://github.com/johnlam90/aws-multi-eni-controller
88
sources:
99
- https://github.com/johnlam90/aws-multi-eni-controller

charts/aws-multi-eni-controller/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
# Image configuration
66
image:
7-
repository: johnlam90/aws-multi-eni-controller
8-
tag: fix-cleanup-case-01-2261c5e
7+
repository: ghcr.io/johnlam90/aws-multi-eni-controller
8+
tag: v1.3.8
99
pullPolicy: Always
1010

1111
# Namespace to deploy the controller

deploy/deployment.yaml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ spec:
173173
# - "kubernetes"
174174
containers:
175175
- name: manager
176-
image: johnlam90/aws-multi-eni-controller:fix-cleanup-case-01-2261c5e
176+
image: ghcr.io/johnlam90/aws-multi-eni-controller:v1.3.8
177177
env:
178178
- name: COMPONENT
179179
value: "eni-controller"
@@ -209,7 +209,12 @@ spec:
209209
value: "3"
210210
# Maximum number of concurrent reconciles
211211
- name: MAX_CONCURRENT_RECONCILES
212-
value: "1"
212+
value: "5"
213+
# Node name for Kubernetes context
214+
- name: NODE_NAME
215+
valueFrom:
216+
fieldRef:
217+
fieldPath: spec.nodeName
213218
# Let Kubernetes handle service discovery automatically
214219
# - name: KUBERNETES_SERVICE_HOST
215220
# value: "172.20.0.1"
@@ -220,8 +225,8 @@ spec:
220225
- --enable-leader-election
221226
resources:
222227
limits:
223-
cpu: 100m
224-
memory: 128Mi
228+
cpu: 500m
229+
memory: 512Mi
225230
requests:
226231
cpu: 100m
227232
memory: 128Mi

deploy/eni-manager-daemonset.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ spec:
2020
ng: multi-eni
2121
initContainers:
2222
- name: dpdk-setup
23-
image: johnlam90/aws-multi-eni-controller:fix-cleanup-case-01-2261c5e
23+
image: ghcr.io/johnlam90/aws-multi-eni-controller:v1.3.8
2424
command: ["/bin/sh", "-c"]
2525
args:
2626
- |
@@ -180,7 +180,7 @@ spec:
180180
readOnly: true
181181
containers:
182182
- name: eni-manager
183-
image: johnlam90/aws-multi-eni-controller:fix-cleanup-case-01-2261c5e
183+
image: ghcr.io/johnlam90/aws-multi-eni-controller:v1.3.8
184184
env:
185185
- name: COMPONENT
186186
value: "eni-manager"
@@ -215,6 +215,8 @@ spec:
215215
# Enable aggressive IMDS configuration for node replacement scenarios
216216
- name: IMDS_AGGRESSIVE_CONFIGURATION
217217
value: "true"
218+
- name: LOG_LEVEL
219+
value: "info"
218220
# DPDK Configuration
219221
- name: ENABLE_DPDK
220222
value: "true" # Enable DPDK device binding

pkg/eni-manager/network/manager.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,11 @@ func (m *Manager) BringUpInterface(ifaceName string) error {
130130
if updatedLink.Attrs().Flags&net.FlagUp != 0 {
131131
log.Printf("Successfully brought up interface %s using netlink (attempt %d)", ifaceName, attempt)
132132
return nil
133-
} else {
134-
log.Printf("Interface %s netlink operation succeeded but interface is still down (attempt %d)", ifaceName, attempt)
135-
if attempt < maxRetries {
136-
time.Sleep(retryDelay)
137-
continue
138-
}
133+
}
134+
log.Printf("Interface %s netlink operation succeeded but interface is still down (attempt %d)", ifaceName, attempt)
135+
if attempt < maxRetries {
136+
time.Sleep(retryDelay)
137+
continue
139138
}
140139
}
141140
}

0 commit comments

Comments
 (0)