Merge pull request 'fixes | creating initial Velero and Sealed Secrets backups while bootstrapping a fresh cluster' (#139) from hetzner/bare-metal into main

Reviewed-on: https://gitea.obmondo.com/EnableIT/kubeaid-bootstrap-script/pulls/139

Author: ashish1099

pkg/cloud/aws/get_vm_specs.go

@@ -28,6 +28,6 @@ func (a *AWS) GetVMSpecs(ctx context.Context, vmType string) *cloud.VMSpec {
 
 	return &cloud.VMSpec{
 		CPU:    uint32(*instanceDetails.VCpuInfo.DefaultVCpus),
-		Memory: uint32(*instanceDetails.MemoryInfo.SizeInMiB),
+		Memory: uint32(*instanceDetails.MemoryInfo.SizeInMiB) / 1024,
 	}
 }

pkg/cloud/azure/get_vm_specs.go

@@ -24,7 +24,7 @@ func (a *Azure) GetVMSpecs(ctx context.Context, vmType string) *cloud.VMSpec {
 			if *vmSize.Name == vmType {
 				return &cloud.VMSpec{
 					CPU:    uint32(*vmSize.NumberOfCores),
-					Memory: uint32(*vmSize.MemoryInMB),
+					Memory: uint32(*vmSize.MemoryInMB) / 1024,
 				}
 			}
 		}

pkg/cloud/cloud_provider.go

@@ -22,7 +22,7 @@ type (
 
 	VMSpec struct {
 		CPU    uint32
-		Memory uint32 // (in MiB).
+		Memory uint32 // (in GiB).
 
 		// Only used in case of HCloud, since the root volume size is fixed unlike in case of other
 		// hyper-scalars like AWS / Azure.

pkg/cloud/hetzner/get_vm_specs.go

@@ -16,7 +16,7 @@ func (h *Hetzner) GetVMSpecs(ctx context.Context, machineType string) *cloud.VMS
 
 	return &cloud.VMSpec{
 		CPU:            uint32(machineDetails.Cores),
-		Memory:         uint32(machineDetails.Memory * 1024),
+		Memory:         uint32(machineDetails.Memory),
 		RootVolumeSize: aws.Uint32(uint32(machineDetails.Disk)),
 	}
 }

pkg/config/config.go

@@ -23,13 +23,13 @@ type (
 
 	ForksConfig struct {
 		KubeaidForkURL       string `yaml:"kubeaid"       default:"https://github.com/Obmondo/KubeAid"`
-		KubeaidConfigForkURL string `yaml:"kubeaidConfig"                                              validate:"required,notblank"`
+		KubeaidConfigForkURL string `yaml:"kubeaidConfig"                                              validate:"notblank"`
 	}
 
 	ClusterConfig struct {
-		Name           string `yaml:"name"           validate:"required,notblank"`
-		K8sVersion     string `yaml:"k8sVersion"     validate:"required,notblank"`
-		KubeaidVersion string `yaml:"kubeaidVersion" validate:"required,notblank"`
+		Name           string `yaml:"name"           validate:"notblank"`
+		K8sVersion     string `yaml:"k8sVersion"     validate:"notblank"`
+		KubeaidVersion string `yaml:"kubeaidVersion" validate:"notblank"`
 
 		EnableAuditLogging bool `yaml:"enableAuditLogging" default:"True"`
 
@@ -56,9 +56,9 @@ type (
 
 	// REFER : "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1".HostPathMount
 	HostPathMountConfig struct {
-		Name      string              `yaml:"name"      validate:"required,notblank"`
-		HostPath  string              `yaml:"hostPath"  validate:"required,notblank"`
-		MountPath string              `yaml:"mountPath" validate:"required,notblank"`
+		Name      string              `yaml:"name"      validate:"notblank"`
+		HostPath  string              `yaml:"hostPath"  validate:"notblank"`
+		MountPath string              `yaml:"mountPath" validate:"notblank"`
 		PathType  coreV1.HostPathType `yaml:"pathType"  validate:"required"`
 
 		/*
@@ -75,8 +75,8 @@ type (
 
 	// REFER : "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1".File
 	FileConfig struct {
-		Path    string `yaml:"path"    validate:"required,notblank"`
-		Content string `yaml:"content" validate:"required,notblank"`
+		Path    string `yaml:"path"    validate:"notblank"`
+		Content string `yaml:"content" validate:"notblank"`
 	}
 
 	UserConfig struct {
@@ -85,7 +85,7 @@ type (
 	}
 
 	NodeGroup struct {
-		Name string `yaml:"name" validate:"required,notblank"`
+		Name string `yaml:"name" validate:"notblank"`
 
 		CPU    uint32 `validate:"required"`
 		Memory uint32 `validate:"required"`
@@ -107,16 +107,16 @@ type (
 	}
 
 	DisasterRecoveryConfig struct {
-		VeleroBackupsBucketName        string `yaml:"veleroBackupsBucketName"        validate:"required,notblank"`
-		SealedSecretsBackupsBucketName string `yaml:"sealedSecretsBackupsBucketName" validate:"required,notblank"`
+		VeleroBackupsBucketName        string `yaml:"veleroBackupsBucketName"        validate:"notblank"`
+		SealedSecretsBackupsBucketName string `yaml:"sealedSecretsBackupsBucketName" validate:"notblank"`
 	}
 
 	SSHKeyPairConfig struct {
-		PublicKeyFilePath string `yaml:"publicKeyFilePath" validate:"required,notblank"`
-		PublicKey         string `                         validate:"required,notblank"`
+		PublicKeyFilePath string `yaml:"publicKeyFilePath" validate:"notblank"`
+		PublicKey         string `                         validate:"notblank"`
 
-		PrivateKeyFilePath string `yaml:"privateKeyFilePath" validate:"required,notblank"`
-		PrivateKey         string `                          validate:"required,notblank"`
+		PrivateKeyFilePath string `yaml:"privateKeyFilePath" validate:"notblank"`
+		PrivateKey         string `                          validate:"notblank"`
 	}
 
 	MonitoringConfig struct {
@@ -129,49 +129,49 @@ type (
 // AWS specific.
 type (
 	AWSConfig struct {
-		Region string `yaml:"region" validate:"required,notblank"`
+		Region string `yaml:"region" validate:"notblank"`
 
-		SSHKeyName     string          `yaml:"sshKeyName"     validate:"required,notblank"`
+		SSHKeyName     string          `yaml:"sshKeyName"     validate:"notblank"`
 		VPCID          *string         `yaml:"vpcID"`
-		BastionEnabled bool            `yaml:"bastionEnabled"                              default:"True"`
+		BastionEnabled bool            `yaml:"bastionEnabled"                     default:"True"`
 		ControlPlane   AWSControlPlane `yaml:"controlPlane"   validate:"required"`
 		NodeGroups     []AWSNodeGroup  `yaml:"nodeGroups"     validate:"required"`
 	}
 
 	AWSControlPlane struct {
-		LoadBalancerScheme string    `yaml:"loadBalancerScheme" default:"internet-facing" validate:"required,notblank"`
+		LoadBalancerScheme string    `yaml:"loadBalancerScheme" default:"internet-facing" validate:"notblank"`
 		Replicas           uint32    `yaml:"replicas"                                     validate:"required"`
-		InstanceType       string    `yaml:"instanceType"                                 validate:"required,notblank"`
+		InstanceType       string    `yaml:"instanceType"                                 validate:"notblank"`
 		AMI                AMIConfig `yaml:"ami"                                          validate:"required"`
 	}
 
 	AWSNodeGroup struct {
 		NodeGroup `yaml:",inline"`
 
 		AMI            AMIConfig `yaml:"ami"            validate:"required"`
-		InstanceType   string    `yaml:"instanceType"   validate:"required,notblank"`
+		InstanceType   string    `yaml:"instanceType"   validate:"notblank"`
 		RootVolumeSize uint32    `yaml:"rootVolumeSize" validate:"required"`
-		SSHKeyName     string    `yaml:"sshKeyName"     validate:"required,notblank"`
+		SSHKeyName     string    `yaml:"sshKeyName"     validate:"notblank"`
 	}
 
 	AMIConfig struct {
-		ID string `yaml:"id" validate:"required,notblank"`
+		ID string `yaml:"id" validate:"notblank"`
 	}
 )
 
 // Azure specific.
 type (
 	AzureConfig struct {
-		TenantID       string         `yaml:"tenantID"       validate:"required,notblank"`
-		SubscriptionID string         `yaml:"subscriptionID" validate:"required,notblank"`
+		TenantID       string         `yaml:"tenantID"       validate:"notblank"`
+		SubscriptionID string         `yaml:"subscriptionID" validate:"notblank"`
 		AADApplication AADApplication `yaml:"aadApplication" validate:"required"`
-		Location       string         `yaml:"location"       validate:"required,notblank"`
+		Location       string         `yaml:"location"       validate:"notblank"`
 
-		StorageAccount string `yaml:"storageAccount" validate:"required,notblank"`
+		StorageAccount string `yaml:"storageAccount" validate:"notblank"`
 
 		WorkloadIdentity WorkloadIdentity `yaml:"workloadIdentity" validate:"required"`
 
-		SSHPublicKey string `yaml:"sshPublicKey" validate:"required,notblank"`
+		SSHPublicKey string `yaml:"sshPublicKey" validate:"notblank"`
 
 		ImageID *string `yaml:"imageID"`
 
@@ -180,57 +180,57 @@ type (
 	}
 
 	AADApplication struct {
-		Name               string `yaml:"name"               validate:"required,notblank"`
-		ObjectID           string `yaml:"objectID"           validate:"required,notblank"`
-		ServicePrincipalID string `yaml:"servicePrincipalID" validate:"required,notblank"`
+		Name               string `yaml:"name"               validate:"notblank"`
+		ObjectID           string `yaml:"objectID"           validate:"notblank"`
+		ServicePrincipalID string `yaml:"servicePrincipalID" validate:"notblank"`
 	}
 
 	WorkloadIdentity struct {
-		OpenIDProviderSSHKeyPair SSHKeyPairConfig `yaml:"openIDProviderSSHKeyPair" validate:"required,notblank"`
+		OpenIDProviderSSHKeyPair SSHKeyPairConfig `yaml:"openIDProviderSSHKeyPair" validate:"notblank"`
 	}
 
 	AzureControlPlane struct {
-		LoadBalancerType string `yaml:"loadBalancerType" validate:"required,notblank" default:"Public"`
+		LoadBalancerType string `yaml:"loadBalancerType" validate:"notblank"        default:"Public"`
 		DiskSizeGB       uint32 `yaml:"diskSizeGB"       validate:"required,gt=100"`
-		VMSize           string `yaml:"vmSize"           validate:"required,notblank"`
+		VMSize           string `yaml:"vmSize"           validate:"notblank"`
 		Replicas         uint32 `yaml:"replicas"         validate:"required,gt=0"`
 	}
 
 	AzureNodeGroup struct {
 		NodeGroup `yaml:",inline"`
 
-		VMSize     string `yaml:"vmSize"     validate:"required,notblank"`
+		VMSize     string `yaml:"vmSize"     validate:"notblank"`
 		DiskSizeGB uint32 `yaml:"diskSizeGB" validate:"required"`
 	}
 )
 
 // Hetzner specific.
 type (
 	HetznerConfig struct {
-		Mode string `yaml:"mode" default:"hcloud" validate:"required,notblank"`
+		Mode string `yaml:"mode" default:"hcloud" validate:"notblank,oneof='bare-metal hcloud hybrid'"`
 
-		Zone   string `yaml:"zone"   validate:"required,notblank"`
-		Region string `yaml:"region" validate:"required,notblank"`
+		Zone   string `yaml:"zone"   validate:"notblank"`
+		Region string `yaml:"region" validate:"notblank"`
 
-		HCloudSSHKeyPairName string `yaml:"hcloudSSHKeyPairName" validate:"required,notblank"`
+		HCloudSSHKeyPairName string `yaml:"hcloudSSHKeyPairName" validate:"notblank"`
 
 		NetworkEnabled bool   `yaml:"networkEnabled" default:"True"         validate:"required"`
-		ImageName      string `yaml:"imageName"      default:"ubuntu-24.04" validate:"required,notblank"`
+		ImageName      string `yaml:"imageName"      default:"ubuntu-24.04" validate:"notblank"`
 
 		ControlPlane HetznerControlPlane `yaml:"controlPlane" validate:"required"`
 		NodeGroups   HetznerNodeGroups   `yaml:"nodeGroups"   validate:"required"`
 	}
 
 	HetznerControlPlane struct {
-		MachineType  string                         `yaml:"machineType"  validate:"required,notblank"`
+		MachineType  string                         `yaml:"machineType"  validate:"notblank"`
 		Replicas     uint                           `yaml:"replicas"     validate:"required"`
 		Regions      []string                       `yaml:"regions"      validate:"required,gt=0"`
 		LoadBalancer HCloudControlPlaneLoadBalancer `yaml:"loadBalancer"`
 	}
 
 	HCloudControlPlaneLoadBalancer struct {
 		Enabled bool   `yaml:"enabled" validate:"required"`
-		Region  string `yaml:"region"  validate:"required,notblank"`
+		Region  string `yaml:"region"  validate:"notblank"`
 	}
 
 	HetznerNodeGroups struct {
@@ -240,7 +240,7 @@ type (
 	HCloudNodeGroup struct {
 		NodeGroup `yaml:",inline"`
 
-		MachineType    string `yaml:"machineType" validate:"required,notblank"`
+		MachineType    string `yaml:"machineType" validate:"notblank"`
 		RootVolumeSize uint32 `                   validate:"required"`
 	}
 )

pkg/config/secrets.go

@@ -15,17 +15,17 @@ type (
 	}
 
 	AWSCredentials struct {
-		AWSAccessKeyID     string `yaml:"accessKeyID"     validate:"required,notblank"`
-		AWSSecretAccessKey string `yaml:"secretAccessKey" validate:"required,notblank"`
+		AWSAccessKeyID     string `yaml:"accessKeyID"     validate:"notblank"`
+		AWSSecretAccessKey string `yaml:"secretAccessKey" validate:"notblank"`
 		AWSSessionToken    string `yaml:"sessionToken"`
 	}
 
 	AzureCredentials struct {
-		ClientID     string `yaml:"clientID"     validate:"required,notblank"`
-		ClientSecret string `yaml:"clientSecret" validate:"required,notblank"`
+		ClientID     string `yaml:"clientID"     validate:"notblank"`
+		ClientSecret string `yaml:"clientSecret" validate:"notblank"`
 	}
 
 	HetznerCredentials struct {
-		APIToken string `yaml:"apiToken" validate:"required,notblank"`
+		APIToken string `yaml:"apiToken" validate:"notblank"`
 	}
 )

pkg/constants/constants.go

@@ -120,14 +120,15 @@ const (
 	AzureBlobNameOpenIDConfiguration = ".well-known/openid-configuration"
 	AzureBlobNameJWKSDocument        = "openid/v1/jwks"
 
+	// NOTE : You can view all the Azure built-in roles here :
+	//        https://learn.microsoft.com/en-us/azure/role-based-access-control/built-in-roles.
+
 	// Grants full access to manage all resources, but does not allow you to assign roles in Azure
 	// RBAC, manage assignments in Azure Blueprints, or share image galleries.
 	AzureRoleIDContributor = "b24988ac-6180-42a0-ab88-20f7382dd24c"
 	// Provides full access to Azure Storage blob containers and data, including assigning POSIX
 	// access control.
 	AzureRoleIDStorageBlobDataOwner = "b7e6dc6d-f1e8-4753-8033-0f276bb0955b"
-	// NOTE : You can view all the Azure built-in roles here :
-	//        https://learn.microsoft.com/en-us/azure/role-based-access-control/built-in-roles.
 
 	AzureResponseStatusCodeResourceAlreadyExists = 409
 
@@ -136,6 +137,13 @@ const (
 	UAMISealedSecretsBackuper = "sealed-secrets-backuper"
 )
 
+// Hetzner
+const (
+	HetznerModeBareMetal = "bare-metal"
+	HetznerModeHCloud    = "hcloud"
+	HetznerModeHybrid    = "hybrid"
+)
+
 const (
 	// Namespaces.
 	NamespaceVelero        = "velero"
@@ -148,11 +156,14 @@ const (
 	ServiceAccountSealedSecrets = "sealed-secrets"
 )
 
-// Miscellaneous.
+// File names
 const (
 	FileNameGeneralConfig = "general.yaml"
 	FileNameSecretsConfig = "secrets.yaml"
+)
 
+// Miscellaneous.
+const (
 	RepoURLObmondoKubeAid = "https://github.com/Obmondo/KubeAid"
 
 	ClusterTypeManagement = "management"
@@ -162,4 +173,6 @@ const (
 	SSHPublicKeyPrefixPEM     = "-----BEGIN PUBLIC KEY-----"
 
 	GzippedFilenameSuffix = ".gz"
+
+	CRONJobNameBackupSealedSecrets = "backup-sealed-secrets"
 )

pkg/constants/templates.go

@@ -120,7 +120,7 @@ var (
 // Hetzner specific template names.
 var (
 	HCloudSpecificNonSecretTemplateNames = []string{
-		// For HCloud Controller Manager.
+		// For Hetzner Cloud Controller Manager.
 		"argocd-apps/templates/ccm-hetzner.yaml.tmpl",
 		"argocd-apps/values-ccm-hetzner.yaml.tmpl",
 
@@ -130,7 +130,7 @@ var (
 	}
 
 	HCloudSpecificSecretTemplateNames = []string{
-		// For HCloud Controller Manager.
+		// For Hetzner Cloud Controller Manager.
 		"sealed-secrets/kube-system/cloud-credentials.yaml.tmpl",
 
 		// For Cluster API.