diff --git a/README.md b/README.md index 64fe9034..2881f5fa 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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 - ``` @@ -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 - @@ -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 diff --git a/test/canary/Dockerfile.canary b/test/canary/Dockerfile.canary index 9eb24588..dd0c625f 100644 --- a/test/canary/Dockerfile.canary +++ b/test/canary/Dockerfile.canary @@ -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 diff --git a/test/canary/scripts/install_controller_helm.sh b/test/canary/scripts/install_controller_helm.sh index 66a44aba..19af9d29 100755 --- a/test/canary/scripts/install_controller_helm.sh +++ b/test/canary/scripts/install_controller_helm.sh @@ -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