From 800a20247d17c9c4ef17f686a7a91355bb46d979 Mon Sep 17 00:00:00 2001
From: Andrei Pavlov <apavlov@mirantis.com>
Date: Tue, 6 Aug 2024 14:14:51 +0700
Subject: [PATCH] Remove hostname-override from templates
Signed-off-by: Andrei Pavlov <apavlov@mirantis.com>
---
templates/aws-hosted-cp/Chart.yaml | 2 +-
templates/aws-hosted-cp/templates/k0sworkerconfigtemplate.yaml | 2 +-
templates/aws-standalone-cp/Chart.yaml | 2 +-
templates/aws-standalone-cp/templates/k0scontrolplane.yaml | 2 +-
.../aws-standalone-cp/templates/k0sworkerconfigtemplate.yaml | 2 +-
templates/hmc-templates/files/templates/aws-hosted-cp.yaml | 2 +-
templates/hmc-templates/files/templates/aws-standalone-cp.yaml | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/templates/aws-hosted-cp/Chart.yaml b/templates/aws-hosted-cp/Chart.yaml
index 4e64894d3..f108d64d8 100644
--- a/templates/aws-hosted-cp/Chart.yaml
+++ b/templates/aws-hosted-cp/Chart.yaml
@@ -7,7 +7,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.1
+version: 0.1.2
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
diff --git a/templates/aws-hosted-cp/templates/k0sworkerconfigtemplate.yaml b/templates/aws-hosted-cp/templates/k0sworkerconfigtemplate.yaml
index 90b654cb2..562e4fdeb 100644
--- a/templates/aws-hosted-cp/templates/k0sworkerconfigtemplate.yaml
+++ b/templates/aws-hosted-cp/templates/k0sworkerconfigtemplate.yaml
@@ -8,4 +8,4 @@ spec:
version: {{ .Values.k0s.version }}
args:
- --enable-cloud-provider
- - --kubelet-extra-args="--cloud-provider=external --hostname-override=$(hostname --fqdn)"
\ No newline at end of file
+ - --kubelet-extra-args="--cloud-provider=external"
diff --git a/templates/aws-standalone-cp/Chart.yaml b/templates/aws-standalone-cp/Chart.yaml
index bbb91bff8..6879b1231 100644
--- a/templates/aws-standalone-cp/Chart.yaml
+++ b/templates/aws-standalone-cp/Chart.yaml
@@ -6,7 +6,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.1
+version: 0.1.2
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
diff --git a/templates/aws-standalone-cp/templates/k0scontrolplane.yaml b/templates/aws-standalone-cp/templates/k0scontrolplane.yaml
index ff9d6eab3..209ae51b0 100644
--- a/templates/aws-standalone-cp/templates/k0scontrolplane.yaml
+++ b/templates/aws-standalone-cp/templates/k0scontrolplane.yaml
@@ -9,7 +9,7 @@ spec:
args:
- --enable-worker
- --enable-cloud-provider
- - --kubelet-extra-args="--cloud-provider=external --hostname-override=$(hostname --fqdn)"
+ - --kubelet-extra-args="--cloud-provider=external"
- --disable-components=konnectivity-server
k0s:
apiVersion: k0s.k0sproject.io/v1beta1
diff --git a/templates/aws-standalone-cp/templates/k0sworkerconfigtemplate.yaml b/templates/aws-standalone-cp/templates/k0sworkerconfigtemplate.yaml
index 8eda68514..562e4fdeb 100644
--- a/templates/aws-standalone-cp/templates/k0sworkerconfigtemplate.yaml
+++ b/templates/aws-standalone-cp/templates/k0sworkerconfigtemplate.yaml
@@ -8,4 +8,4 @@ spec:
version: {{ .Values.k0s.version }}
args:
- --enable-cloud-provider
- - --kubelet-extra-args="--cloud-provider=external --hostname-override=$(hostname --fqdn)"
+ - --kubelet-extra-args="--cloud-provider=external"
diff --git a/templates/hmc-templates/files/templates/aws-hosted-cp.yaml b/templates/hmc-templates/files/templates/aws-hosted-cp.yaml
index 6fa0c9ea4..3e6a46838 100644
--- a/templates/hmc-templates/files/templates/aws-hosted-cp.yaml
+++ b/templates/hmc-templates/files/templates/aws-hosted-cp.yaml
@@ -5,4 +5,4 @@ metadata:
spec:
helm:
chartName: aws-hosted-cp
- chartVersion: 0.1.1
+ chartVersion: 0.1.2
diff --git a/templates/hmc-templates/files/templates/aws-standalone-cp.yaml b/templates/hmc-templates/files/templates/aws-standalone-cp.yaml
index 8c3c72f6e..31f785f0d 100644
--- a/templates/hmc-templates/files/templates/aws-standalone-cp.yaml
+++ b/templates/hmc-templates/files/templates/aws-standalone-cp.yaml
@@ -5,4 +5,4 @@ metadata:
spec:
helm:
chartName: aws-standalone-cp
- chartVersion: 0.1.1
+ chartVersion: 0.1.2