Skip to content
This repository has been archived by the owner on Nov 30, 2023. It is now read-only.

Bump kubernetes version and use Giantswarm image repo #200

Merged
merged 2 commits into from
Jan 30, 2023
Merged

Bump kubernetes version and use Giantswarm image repo #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c340883
Bump kubernetes version and use Giantswarm image repo
bdehri Jan 30, 2023
d761401
delete reduntant registry value for etcd images
bdehri Jan 30, 2023
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: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

- Rollback kubernetes version, as upgrade is broken.
- Use Giantswarm repository for Kubernetes images.
- Bump Kubernetes to v1.23.16

## [0.34.0] - 2023-01-27

Expand Down
3 changes: 2 additions & 1 deletion helm/cluster-gcp/templates/_control_plane.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ spec:
name: {{ include "resource.default.name" $ }}-control-plane-{{ include "hash" (dict "data" (include "controlplane-gcpmachinetemplate-spec" $) "global" .) }}
kubeadmConfigSpec:
clusterConfiguration:
# Avoid accessibility issues (e.g. on private clusters) and potential future rate limits for the default `registry.k8s.io`
imageRepository: docker.io/giantswarm
apiServer:
timeoutForControlPlane: 20m
certSANs:
Expand Down Expand Up @@ -111,7 +113,6 @@ spec:
bind-address: 0.0.0.0
etcd:
local:
imageRepository: {{.Values.controlPlane.etcd.imageRepository}}
imageTag: {{.Values.controlPlane.etcd.imageTag}}
extraArgs:
listen-metrics-urls: "http://0.0.0.0:2381"
Expand Down
3 changes: 0 additions & 3 deletions helm/cluster-gcp/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@
"etcd": {
"type": "object",
"properties": {
"imageRepository": {
"type": "string"
},
"imageTag": {
"type": "string"
}
Expand Down
3 changes: 1 addition & 2 deletions helm/cluster-gcp/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ clusterName: "test" # Name of cluster. Used as base name for all cluster resour
clusterDescription: "" # Cluster description used in metadata.
organization: "" # Organization in which to create the cluster.
baseDomain: "" # Customer base domain, generally of the form "<customer codename>.gigantic.io".
kubernetesVersion: 1.23.13
kubernetesVersion: 1.23.16
ubuntuImageVersion: "2204"

vmImageBase: "https://www.googleapis.com/compute/v1/projects/giantswarm-vm-images/global/images/"
Expand Down Expand Up @@ -54,7 +54,6 @@ controlPlane:
scopes:
- "https://www.googleapis.com/auth/compute"
etcd:
imageRepository: "docker.io/giantswarm"
imageTag: 3.5.4-0-k8s

# machineDeployments lets you configure the different nodepools that will be created.
Expand Down