Skip to content

Commit 5f97f5a

Browse files
authored
Update canary helm install to helm 3.7 and update README (#119)
Description of changes: - Update the install link to helm 3.7 and update README to reflect installing charts using helm 3.7 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 8ffdea0 commit 5f97f5a

File tree

3 files changed

+14
-16
lines changed

3 files changed

+14
-16
lines changed

README.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -166,13 +166,14 @@ export HELM_EXPERIMENTAL_OCI=1
166166
export SERVICE=sagemaker
167167
export RELEASE_VERSION=v0.1.0
168168
export CHART_EXPORT_PATH=/tmp/chart
169-
export CHART_REPO=public.ecr.aws/aws-controllers-k8s/$SERVICE-chart
170-
export CHART_REF=$CHART_REPO:$RELEASE_VERSION
169+
export CHART_REF=$SERVICE-chart
170+
export CHART_REPO=public.ecr.aws/aws-controllers-k8s/$CHART_REF
171+
export CHART_PACKAGE=$CHART_REF-$RELEASE_VERSION.tgz
171172

172173
mkdir -p $CHART_EXPORT_PATH
173-
helm chart pull $CHART_REF
174-
helm chart list
175-
helm chart export $CHART_REF --destination $CHART_EXPORT_PATH
174+
175+
helm pull oci://$CHART_REPO --version $RELEASE_VERSION -d $CHART_EXPORT_PATH
176+
tar xvf $CHART_EXPORT_PATH/$CHART_PACKAGE -C $CHART_EXPORT_PATH
176177
```
177178

178179
##### 3.1.2 Choose one of the two options for deployment
@@ -182,7 +183,6 @@ helm chart export $CHART_REF --destination $CHART_EXPORT_PATH
182183
# Update values in helm chart
183184
cd $CHART_EXPORT_PATH/$SERVICE-chart
184185
yq e '.aws.region = env(AWS_DEFAULT_REGION)' -i values.yaml
185-
yq e '.aws.account_id = env(AWS_ACCOUNT_ID)' -i values.yaml
186186
yq e '.serviceAccount.annotations."eks.amazonaws.com/role-arn" = env(IAM_ROLE_ARN_FOR_IRSA)' -i values.yaml
187187
cd -
188188
```
@@ -192,7 +192,6 @@ helm chart export $CHART_REF --destination $CHART_EXPORT_PATH
192192
# Update values in helm chart
193193
cd $CHART_EXPORT_PATH/$SERVICE-chart
194194
yq e '.aws.region = env(AWS_DEFAULT_REGION)' -i values.yaml
195-
yq e '.aws.account_id = env(AWS_ACCOUNT_ID)' -i values.yaml
196195
yq e '.serviceAccount.annotations."eks.amazonaws.com/role-arn" = env(IAM_ROLE_ARN_FOR_IRSA)' -i values.yaml
197196
yq e '.installScope = "namespace"' -i values.yaml
198197
cd -
@@ -226,15 +225,16 @@ Jump to Section 4.0 if you only wish to install SageMaker controller
226225
```sh
227226
export HELM_EXPERIMENTAL_OCI=1
228227
export SERVICE=applicationautoscaling
229-
export RELEASE_VERSION=v0.1.0
228+
export RELEASE_VERSION=v0.1.1
230229
export CHART_EXPORT_PATH=/tmp/chart
231-
export CHART_REPO=public.ecr.aws/aws-controllers-k8s/$SERVICE-chart
232-
export CHART_REF=$CHART_REPO:$RELEASE_VERSION
230+
export CHART_REF=$SERVICE-chart
231+
export CHART_REPO=public.ecr.aws/aws-controllers-k8s/$CHART_REF
232+
export CHART_PACKAGE=$CHART_REF-$RELEASE_VERSION.tgz
233233
234234
mkdir -p $CHART_EXPORT_PATH
235-
helm chart pull $CHART_REF
236-
helm chart list
237-
helm chart export $CHART_REF --destination $CHART_EXPORT_PATH
235+
236+
helm pull oci://$CHART_REPO --version $RELEASE_VERSION -d $CHART_EXPORT_PATH
237+
tar xvf $CHART_EXPORT_PATH/$CHART_PACKAGE -C $CHART_EXPORT_PATH
238238
```
239239

240240
##### 3.2.2 Choose one of the two options for deployment

test/canary/Dockerfile.canary

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.6/b
3333
RUN curl --silent --location "https://github.com/weaveworks/eksctl/releases/latest/download/eksctl_$(uname -s)_amd64.tar.gz" | tar xz -C /tmp && mv /tmp/eksctl /bin
3434

3535
# Install Helm
36-
RUN curl -q -L "https://get.helm.sh/helm-v3.2.4-linux-amd64.tar.gz" | tar zxf - -C /usr/local/bin/ \
36+
RUN curl -q -L "https://get.helm.sh/helm-v3.7.0-linux-amd64.tar.gz" | tar zxf - -C /usr/local/bin/ \
3737
&& mv /usr/local/bin/linux-amd64/helm /usr/local/bin/helm \
3838
&& rm -r /usr/local/bin/linux-amd64 \
3939
&& chmod +x /usr/local/bin/helm

test/canary/scripts/install_controller_helm.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@ function install_helm_chart() {
77
local oidc_role_arn="$2"
88
local region="$3"
99
local namespace="$4"
10-
local account_id=$(aws sts get-caller-identity --output text --query "Account")
1110

1211
yq w -i helm/values.yaml "serviceAccount.annotations" ""
1312
yq w -i helm/values.yaml 'serviceAccount.annotations."eks.amazonaws.com/role-arn"' "$oidc_role_arn"
1413
yq w -i helm/values.yaml "aws.region" $region
15-
yq w -i helm/values.yaml "aws.account_id" $account_id
1614

1715
kubectl apply -f helm/crds
1816
helm install -n $namespace --create-namespace ack-$service-controller --skip-crds helm

0 commit comments

Comments
 (0)