From 9b0f2e7ac3c7295e3a55ad16874f73a9c4497768 Mon Sep 17 00:00:00 2001
From: pceicicd <pekwatch746@gmail.com>
Date: Sun, 2 Apr 2023 04:45:16 +0000
Subject: [PATCH] update to use helm 3 to be consistent with RIC installation;
 also remove those utilities that aren't really used

Change-Id: Ic30e55c9be1caad7dffb38fe82d19a7bd93489db
Signed-off-by: pceicicd <pekwatch746@gmail.com>
---
 XTesting/richelm/Dockerfile | 32 +-------------------------------
 XTesting/richelm/deploy.sh  |  2 --
 2 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/XTesting/richelm/Dockerfile b/XTesting/richelm/Dockerfile
index b07c377..be7ab98 100644
--- a/XTesting/richelm/Dockerfile
+++ b/XTesting/richelm/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine
 
 # Ignore to update versions here
 # docker build --no-cache --build-arg KUBECTL_VERSION=${tag} --build-arg HELM_VERSION=${helm} --build-arg KUSTOMIZE_VERSION=${kustomize_version} -t ${image}:${tag} .
-ARG HELM_VERSION=2.17.0
+ARG HELM_VERSION=3.5.4
 ARG KUBECTL_VERSION=1.19.16
 ARG KUSTOMIZE_VERSION=v3.8.1
 ARG KUBESEAL_VERSION=0.18.1
@@ -17,8 +17,6 @@ RUN apk add --update --no-cache curl ca-certificates bash git && \
     chmod +x /usr/bin/helm && \
     rm -rf linux-amd64
 
-RUN helm init --client-only
-
 # add helm-diff
 RUN helm plugin install https://github.com/databus23/helm-diff && rm -rf /tmp/helm-*
 
@@ -33,40 +31,12 @@ RUN curl -sLO https://storage.googleapis.com/kubernetes-release/release/v${KUBEC
     mv kubectl /usr/bin/kubectl && \
     chmod +x /usr/bin/kubectl
 
-# Install kustomize (latest release)
-RUN curl -sLO https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2F${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz && \
-    tar xvzf kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz && \
-    mv kustomize /usr/bin/kustomize && \
-    chmod +x /usr/bin/kustomize
-
-# Install eksctl (latest version)
-RUN curl -sL "https://github.com/weaveworks/eksctl/releases/latest/download/eksctl_$(uname -s)_amd64.tar.gz" | tar xz -C /tmp && \
-    mv /tmp/eksctl /usr/bin && \
-    chmod +x /usr/bin/eksctl
-
-# Install awscli
-RUN apk add --update --no-cache python3 && \
-    python3 -m ensurepip && \
-    pip3 install --upgrade pip && \
-    pip3 install awscli && \
-    pip3 cache purge
-
-# https://docs.aws.amazon.com/eks/latest/userguide/install-aws-iam-authenticator.html
-# Install aws-iam-authenticator
-RUN authenticator=$(aws --no-sign-request s3 ls s3://amazon-eks --recursive |grep aws-iam-authenticator$|grep amd64 |awk '{print $NF}' |sort -V|tail -1) && \
-    aws --no-sign-request s3 cp s3://amazon-eks/${authenticator} /usr/bin/aws-iam-authenticator && \
-    chmod +x /usr/bin/aws-iam-authenticator
-
 # Install jq
 RUN apk add --update --no-cache jq yq
 
 # Install for envsubst
 RUN apk add --update --no-cache gettext
 
-# Install kubeseal
-RUN curl -L https://github.com/bitnami-labs/sealed-secrets/releases/download/v${KUBESEAL_VERSION}/kubeseal-${KUBESEAL_VERSION}-linux-amd64.tar.gz -o - | tar xz -C /usr/bin/ && \
-    chmod +x /usr/bin/kubeseal
-
 WORKDIR /apps
 COPY . .
 
diff --git a/XTesting/richelm/deploy.sh b/XTesting/richelm/deploy.sh
index c46bb34..fe27946 100644
--- a/XTesting/richelm/deploy.sh
+++ b/XTesting/richelm/deploy.sh
@@ -1,8 +1,6 @@
 #!/bin/bash
 set -x
 
-# initiate the tiller
-helm init --service-account tiller
 git clone "https://gerrit.o-ran-sc.org/r/ric-plt/ric-dep"
 
 export VERIFY_CHECKSUM=false
-- 
2.16.6