Skip to content
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.

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

K0smotron bump #127

Merged
merged 3 commits into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion templates/aws-hosted-cp/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions templates/aws-hosted-cp/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,3 @@
{{- define "machinedeployment.name" -}}
{{- include "cluster.name" . }}-md
{{- end }}

{{- define "k0sconfig.name" -}}
{{- include "cluster.name" . }}-k0sconfig
{{- end }}
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ spec:
apiVersion: k0s.k0sproject.io/v1beta1
kind: ClusterConfig
metadata:
name: {{ include "k0sconfig.name" . }}
namespace: {{ .Release.Namespace }}
name: k0s
spec:
network:
provider: calico
Expand All @@ -37,6 +36,8 @@ spec:
chartname: aws-cloud-controller-manager/aws-cloud-controller-manager
version: "0.0.8"
values: |
image:
tag: v1.30.3
args:
- --v=2
- --cloud-provider=aws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion templates/aws-standalone-cp/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions templates/aws-standalone-cp/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,3 @@
{{- define "machinedeployment.name" -}}
{{- include "cluster.name" . }}-md
{{- end }}

{{- define "k0sconfig.name" -}}
{{- include "cluster.name" . }}-k0sconfig
{{- end }}
7 changes: 4 additions & 3 deletions templates/aws-standalone-cp/templates/k0scontrolplane.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@ 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
kind: ClusterConfig
metadata:
name: {{ include "k0sconfig.name" . }}
namespace: {{ .Release.Namespace }}
name: k0s
spec:
api:
extraArgs:
Expand All @@ -40,6 +39,8 @@ spec:
values: |
nodeSelector:
node-role.kubernetes.io/control-plane: "true"
image:
tag: v1.30.3
args:
- --v=2
- --cloud-provider=aws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ metadata:
spec:
helm:
chartName: aws-hosted-cp
chartVersion: 0.1.1
chartVersion: 0.1.2
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ metadata:
spec:
helm:
chartName: aws-standalone-cp
chartVersion: 0.1.1
chartVersion: 0.1.2
2 changes: 1 addition & 1 deletion templates/hmc-templates/files/templates/k0smotron.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ metadata:
spec:
helm:
chartName: k0smotron
chartVersion: 0.1.0
chartVersion: 0.1.1
4 changes: 2 additions & 2 deletions templates/k0smotron/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ 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.0
version: 0.1.1
# 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.
# It is recommended to use it with quotes.
appVersion: "0.1.0"
appVersion: "1.0.2"
annotations:
hmc.mirantis.com/type: provider
hmc.mirantis.com/infrastructure-providers: k0smotron
Expand Down
2 changes: 1 addition & 1 deletion templates/k0smotron/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ manager:
image:
repository: quay.io/k0sproject
name: k0smotron
tag: v1.0.0
tag: v1.0.2
imagePullPolicy: IfNotPresent
resources:
limits:
Expand Down