Skip to content

Commit 6b664e5

Browse files
committed
Move to Helm v3
1 parent c9bb324 commit 6b664e5

File tree

4 files changed

+4
-25
lines changed

4 files changed

+4
-25
lines changed

helm/aws-load-balancer-controller/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: v1
1+
apiVersion: v2
22
name: aws-load-balancer-controller
33
description: AWS Load Balancer Controller Helm chart for Kubernetes
44
version: 1.2.9

helm/aws-load-balancer-controller/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ AWS Load Balancer controller manages the following AWS resources
2626
- 1.18.18+ for 1.18
2727
- 1.19.10+ for 1.19
2828
- IAM permissions
29+
- Helm v3 is needed
2930

3031
The controller runs on the worker nodes, so it needs access to the AWS ALB/NLB resources via IAM permissions. The
3132
IAM permissions can either be setup via IAM roles for ServiceAccount or can be attached directly to the worker node IAM roles.
@@ -187,7 +188,7 @@ The default values set by the application itself can be confirmed [here](https:/
187188
| `webhookTLS.caCert` | TLS CA certificate for webhook (auto-generated if not provided) | "" |
188189
| `webhookTLS.cert` | TLS certificate for webhook (auto-generated if not provided) | "" |
189190
| `webhookTLS.key` | TLS private key for webhook (auto-generated if not provided) | "" |
190-
| `keepTLSSecret` | Keeps the usage of existing TLS Secret | `false` |
191+
| `keepTLSSecret` | Reuse existing TLS Secret during chart upgrade | `false` |
191192
| `serviceAnnotations` | Annotations to be added to the provisioned webhook service resource | `{}` |
192193
| `serviceMaxConcurrentReconciles` | Maximum number of concurrently running reconcile loops for service | None |
193194
| `targetgroupbindingMaxConcurrentReconciles` | Maximum number of concurrently running reconcile loops for targetGroupBinding | None |

helm/aws-load-balancer-controller/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ webhookTLS:
133133
cert:
134134
key:
135135

136-
# keepTLSSecret keeps using the existing TLS secrets, false by default
136+
# keepTLSSecret specifies whether to reuse existing TLS secret for chart upgrade
137137
keepTLSSecret: false
138138

139139
# Maximum number of concurrently running reconcile loops for service (default 3)

test/helm/helm-lint.sh

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
77
TMP_DIR="$SCRIPTPATH/../../build"
88
PLATFORM=$(uname | tr '[:upper:]' '[:lower:]')
99
HELM3_VERSION="3.3.1"
10-
HELM2_VERSION="2.16.10"
1110
HELM_DIR="${SCRIPTPATH}/../../helm"
1211
LB_HELM_CHART=${HELM_DIR}/aws-load-balancer-controller
1312

@@ -21,37 +20,16 @@ if [ ! -x "$TMP_DIR/helm" ]; then
2120
echo " Downloaded the \"helm\" binary"
2221
fi
2322

24-
if [ ! -x "$TMP_DIR/helm2" ]; then
25-
echo " Downloading the \"helm2\" binary"
26-
curl -L https://get.helm.sh/helm-v$HELM2_VERSION-$PLATFORM-amd64.tar.gz | tar zxf - -C $TMP_DIR
27-
mv $TMP_DIR/$PLATFORM-amd64/helm $TMP_DIR/helm2
28-
chmod +x $TMP_DIR/helm2
29-
echo " Downloaded the \"helm2\" binary"
30-
fi
3123
export PATH=$TMP_DIR:$PATH
3224

3325
echo "=============================================================================="
3426
echo " Linting Helm Chart w/ Helm v3"
3527
echo "=============================================================================="
3628
helm lint $LB_HELM_CHART
3729

38-
echo "=============================================================================="
39-
echo " Linting Helm Chart w/ Helm v2"
40-
echo "=============================================================================="
41-
helm2 lint $LB_HELM_CHART
42-
43-
echo " Helm Linting for v2 and v3 have successfully completed!"
44-
4530
echo "=============================================================================="
4631
echo " Generate Template w/ Helm v3"
4732
echo "=============================================================================="
4833

4934
helm template aws-load-balancer-controller "${LB_HELM_CHART}" --debug --namespace=kube-system -f "${LB_HELM_CHART}/test.yaml" > /dev/null
5035

51-
echo "=============================================================================="
52-
echo " Generate Template w/ Helm v2"
53-
echo "=============================================================================="
54-
55-
helm2 template --name aws-load-balancer-controller "${LB_HELM_CHART}" --debug --namespace=kube-system -f "${LB_HELM_CHART}/test.yaml" > /dev/null
56-
57-
echo " Helm template generation for v2 and v3 have successfully completed!"

0 commit comments

Comments
 (0)