Skip to content

Commit

Permalink
Merge pull request kubernetes-sigs#69 from kahun/feature/autoscaler_h…
Browse files Browse the repository at this point in the history
…elm_chart_offline

Autoscaler helm chart offline installation
  • Loading branch information
kahun authored Mar 24, 2023
2 parents 4a2b3c4 + b2f0097 commit 3ee35da
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion DEPENDENCIES
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ core:
calico:
calicoctl: v3.22.3
tigera-operator: v1.25.9
cluster-autoscaler: -
cluster-autoscaler: 9.25.0
aws:
clusterawsadm: v2.0.2
cluster-api-aws: v2.0.2
Expand Down
2 changes: 1 addition & 1 deletion pkg/cluster/internal/create/actions/createworker/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ func rewriteDescriptorFile(descriptorPath string) error {
}

func integrateClusterAutoscaler(node nodes.Node, kubeconfigPath string, clusterID string, provider string) exec.Cmd {
cmd := node.Command("helm", "install", "cluster-autoscaler", "autoscaler/cluster-autoscaler",
cmd := node.Command("helm", "install", "cluster-autoscaler", "/stratio/helm/cluster-autoscaler",
"--kubeconfig", kubeconfigPath,
"--namespace", "kube-system",
"--set", "autoDiscovery.clusterName="+clusterID,
Expand Down
9 changes: 5 additions & 4 deletions pkg/cluster/internal/providers/docker/stratio/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
FROM kindest/node:v1.24.7

# Init feature gates
ENV CLUSTER_TOPOLOGY=true

# Tools versions
ENV CLUSTERCTL=v1.3.2
ENV CLUSTERAWSADM=v2.0.2
ENV HELM_VERSION=v3.11.0

# Init feature gates
ENV CLUSTER_TOPOLOGY=true

# Helm charts
ENV CLUSTER_AUTOSCALER=9.25.0
ENV TIGERA_OPERATOR=v3.22.3

# Cluster-api artifacts
Expand All @@ -33,7 +34,7 @@ RUN curl -L https://get.helm.sh/helm-${HELM_VERSION}-linux-amd64.tar.gz -o /root
&& chmod +x /usr/local/bin/helm

RUN mkdir -p /stratio/helm \
&& /usr/local/bin/helm repo add autoscaler https://kubernetes.github.io/autoscaler \
&& for i in {1..3}; do timeout 5 helm pull cluster-autoscaler --version ${CLUSTER_AUTOSCALER} --repo https://kubernetes.github.io/autoscaler --untar --untardir /stratio/helm; done \
&& helm pull tigera-operator --version ${TIGERA_OPERATOR} --repo https://docs.projectcalico.org/charts --untar --untardir /stratio/helm

RUN mkdir -p ${CAPI_REPO}/infrastructure-aws/${CAPA} \
Expand Down

0 comments on commit 3ee35da

Please sign in to comment.