Skip to content
This repository has been archived by the owner on Apr 17, 2024. It is now read-only.

Commit

Permalink
chore: fixes and improvements
Browse files Browse the repository at this point in the history
- upgrade kubernetes version
- increase the osd size
- force namespace for rook-ceph
  • Loading branch information
Javlopez committed Mar 19, 2024
1 parent dd222a6 commit 77f8775
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 7 deletions.
13 changes: 9 additions & 4 deletions internal/k8s/k8s.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ const (
rookCephOperatorChartValues = "rook-ceph/values.yaml"
)

const (
defaultRookCephNS = "rook-ceph"
)

type Cluster struct {
kubeConfigFile string
chartsDir string
Expand Down Expand Up @@ -52,6 +56,7 @@ func (c *Cluster) InstallCharts() error {

opt := &helmclient.KubeConfClientOptions{
Options: &helmclient.Options{
Namespace: defaultRookCephNS,
RepositoryCache: "/tmp/.helmcache",
RepositoryConfig: "/tmp/.helmrepo",
Debug: true,
Expand Down Expand Up @@ -79,7 +84,7 @@ func (c *Cluster) InstallCharts() error {
chartSpec := helmclient.ChartSpec{
ReleaseName: "rook-ceph",
ChartName: "rook-release/rook-ceph",
Namespace: "rook-ceph",
Namespace: defaultRookCephNS,
CreateNamespace: true,
UpgradeCRDs: true,
ValuesYaml: string(valuesRookOperatorYaml),
Expand All @@ -100,12 +105,12 @@ func (c *Cluster) InstallCharts() error {
chartClusterSpec := &helmclient.ChartSpec{
ReleaseName: "rook-ceph-cluster",
ChartName: "rook-release/rook-ceph-cluster",
Namespace: "rook-ceph",
Namespace: defaultRookCephNS,
ValuesYaml: string(valuesRookClusterYaml),
CreateNamespace: true,

Force: true,
Force: true,
}

fmt.Println("========== installing Ceph GetCluster Helm Chart =======")
clusterRelease, err := helmClient.InstallOrUpgradeChart(context.Background(), chartClusterSpec, nil)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion pkg/models/kubeone.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func NewKubeOneConfig(clusterName string) *KubeOneConfig {
Kind: "KubeOneCluster",
Name: clusterName,
Versions: Versions{
Kubernetes: "1.25.6",
Kubernetes: "1.27.11",
},
CloudProvider: CloudProvider{
Hetzner: CloudProviderHetzner{},
Expand Down
6 changes: 5 additions & 1 deletion pkg/providers/hetzner/hetzner.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ import (
"go.uber.org/fx"
)

const (
defaultOSDSizeInGB = 100
)

type Provider struct {
Client *hcloud.Client
Token string
Expand Down Expand Up @@ -87,7 +91,7 @@ func (p *Provider) AttacheVolumesToServers(ctx context.Context, customerName str
for _, server := range servers {
serverName := server.Name
name := fmt.Sprintf("data-%s-pool1-%s", customerName, serverName[len(serverName)-5:])
err := p.AttachVolumeToServer(ctx, server, volLabels, 40, name, false)
err := p.AttachVolumeToServer(ctx, server, volLabels, defaultOSDSizeInGB, name, false)
if err != nil {
p.Logger.Error("unable to create volume", "err", err)
return err
Expand Down
2 changes: 1 addition & 1 deletion templates/hetzner/kubeone.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: kubeone.k8c.io/v1beta2
kind: KubeOneCluster
versions:
kubernetes: '1.25.6'
kubernetes: '1.27.11'
cloudProvider:
hetzner: {}
external: true

0 comments on commit 77f8775

Please sign in to comment.