Skip to content

Update canary helm install to helm 3.7 and update README #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 15, 2021
Merged

Update canary helm install to helm 3.7 and update README #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
30036d9
use helm3.7 and change helm chart install steps for 3.7
ryansteakley Oct 7, 2021
61143ef
remove aws-account-id from helm chart steps
ryansteakley Oct 8, 2021
9251288
application-autoscaling release will be marked as v0.2.0
ryansteakley Oct 11, 2021
23bc2b5
use appropriate release tag
ryansteakley Oct 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,13 +166,14 @@ export HELM_EXPERIMENTAL_OCI=1
export SERVICE=sagemaker
export RELEASE_VERSION=v0.1.0
export CHART_EXPORT_PATH=/tmp/chart
export CHART_REPO=public.ecr.aws/aws-controllers-k8s/$SERVICE-chart
export CHART_REF=$CHART_REPO:$RELEASE_VERSION
export CHART_REF=$SERVICE-chart
export CHART_REPO=public.ecr.aws/aws-controllers-k8s/$CHART_REF
export CHART_PACKAGE=$CHART_REF-$RELEASE_VERSION.tgz

mkdir -p $CHART_EXPORT_PATH
helm chart pull $CHART_REF
helm chart list
helm chart export $CHART_REF --destination $CHART_EXPORT_PATH

helm pull oci://$CHART_REPO --version $RELEASE_VERSION -d $CHART_EXPORT_PATH
tar xvf $CHART_EXPORT_PATH/$CHART_PACKAGE -C $CHART_EXPORT_PATH
```

##### 3.1.2 Choose one of the two options for deployment
Expand All @@ -182,7 +183,6 @@ helm chart export $CHART_REF --destination $CHART_EXPORT_PATH
# Update values in helm chart
cd $CHART_EXPORT_PATH/$SERVICE-chart
yq e '.aws.region = env(AWS_DEFAULT_REGION)' -i values.yaml
yq e '.aws.account_id = env(AWS_ACCOUNT_ID)' -i values.yaml
yq e '.serviceAccount.annotations."eks.amazonaws.com/role-arn" = env(IAM_ROLE_ARN_FOR_IRSA)' -i values.yaml
cd -
```
Expand All @@ -192,7 +192,6 @@ helm chart export $CHART_REF --destination $CHART_EXPORT_PATH
# Update values in helm chart
cd $CHART_EXPORT_PATH/$SERVICE-chart
yq e '.aws.region = env(AWS_DEFAULT_REGION)' -i values.yaml
yq e '.aws.account_id = env(AWS_ACCOUNT_ID)' -i values.yaml
yq e '.serviceAccount.annotations."eks.amazonaws.com/role-arn" = env(IAM_ROLE_ARN_FOR_IRSA)' -i values.yaml
yq e '.installScope = "namespace"' -i values.yaml
cd -
Expand Down Expand Up @@ -226,15 +225,16 @@ Jump to Section 4.0 if you only wish to install SageMaker controller
```sh
export HELM_EXPERIMENTAL_OCI=1
export SERVICE=applicationautoscaling
export RELEASE_VERSION=v0.1.0
export RELEASE_VERSION=v0.1.1
export CHART_EXPORT_PATH=/tmp/chart
export CHART_REPO=public.ecr.aws/aws-controllers-k8s/$SERVICE-chart
export CHART_REF=$CHART_REPO:$RELEASE_VERSION
export CHART_REF=$SERVICE-chart
export CHART_REPO=public.ecr.aws/aws-controllers-k8s/$CHART_REF
export CHART_PACKAGE=$CHART_REF-$RELEASE_VERSION.tgz

mkdir -p $CHART_EXPORT_PATH
helm chart pull $CHART_REF
helm chart list
helm chart export $CHART_REF --destination $CHART_EXPORT_PATH

helm pull oci://$CHART_REPO --version $RELEASE_VERSION -d $CHART_EXPORT_PATH
tar xvf $CHART_EXPORT_PATH/$CHART_PACKAGE -C $CHART_EXPORT_PATH
```

##### 3.2.2 Choose one of the two options for deployment
Expand Down
2 changes: 1 addition & 1 deletion test/canary/Dockerfile.canary
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.6/b
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

# Install Helm
RUN curl -q -L "https://get.helm.sh/helm-v3.2.4-linux-amd64.tar.gz" | tar zxf - -C /usr/local/bin/ \
RUN curl -q -L "https://get.helm.sh/helm-v3.7.0-linux-amd64.tar.gz" | tar zxf - -C /usr/local/bin/ \
&& mv /usr/local/bin/linux-amd64/helm /usr/local/bin/helm \
&& rm -r /usr/local/bin/linux-amd64 \
&& chmod +x /usr/local/bin/helm
Expand Down
2 changes: 0 additions & 2 deletions test/canary/scripts/install_controller_helm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@ function install_helm_chart() {
local oidc_role_arn="$2"
local region="$3"
local namespace="$4"
local account_id=$(aws sts get-caller-identity --output text --query "Account")

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

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