Move cloud metadata packages and kubernetes resources marshaling to internal

Decouples cloud provider metadata packages from kubernetes related code

Signed-off-by: Malte Poll <mp@edgeless.systems>

bootstrapper/cmd/bootstrapper/main.go

@@ -10,9 +10,6 @@ import (
 	"strconv"
 	"strings"
 
-	azurecloud "github.com/edgelesssys/constellation/bootstrapper/cloudprovider/azure"
-	gcpcloud "github.com/edgelesssys/constellation/bootstrapper/cloudprovider/gcp"
-	qemucloud "github.com/edgelesssys/constellation/bootstrapper/cloudprovider/qemu"
 	"github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes"
 	"github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi"
 	"github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi/kubectl"
@@ -24,6 +21,9 @@ import (
 	"github.com/edgelesssys/constellation/internal/attestation/qemu"
 	"github.com/edgelesssys/constellation/internal/attestation/simulator"
 	"github.com/edgelesssys/constellation/internal/attestation/vtpm"
+	azurecloud "github.com/edgelesssys/constellation/internal/cloud/azure"
+	gcpcloud "github.com/edgelesssys/constellation/internal/cloud/gcp"
+	qemucloud "github.com/edgelesssys/constellation/internal/cloud/qemu"
 	"github.com/edgelesssys/constellation/internal/constants"
 	"github.com/edgelesssys/constellation/internal/file"
 	"github.com/edgelesssys/constellation/internal/iproute"

bootstrapper/internal/kubernetes/cloud_provider.go

@@ -3,8 +3,8 @@ package kubernetes
 import (
 	"context"
 
-	"github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi/resources"
 	"github.com/edgelesssys/constellation/internal/cloud/metadata"
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/edgelesssys/constellation/internal/versions"
 	k8s "k8s.io/api/core/v1"
 )
@@ -41,10 +41,10 @@ type CloudControllerManager interface {
 	ExtraArgs() []string
 	// ConfigMaps returns a list of ConfigMaps to deploy together with the k8s cloud-controller-manager
 	// Reference: https://kubernetes.io/docs/concepts/configuration/configmap/ .
-	ConfigMaps(instance metadata.InstanceMetadata) (resources.ConfigMaps, error)
+	ConfigMaps(instance metadata.InstanceMetadata) (kubernetes.ConfigMaps, error)
 	// Secrets returns a list of secrets to deploy together with the k8s cloud-controller-manager.
 	// Reference: https://kubernetes.io/docs/concepts/configuration/secret/ .
-	Secrets(ctx context.Context, providerID, cloudServiceAccountURI string) (resources.Secrets, error)
+	Secrets(ctx context.Context, providerID, cloudServiceAccountURI string) (kubernetes.Secrets, error)
 	// Volumes returns a list of volumes to deploy together with the k8s cloud-controller-manager.
 	// Reference: https://kubernetes.io/docs/concepts/storage/volumes/ .
 	Volumes() []k8s.Volume
@@ -73,7 +73,7 @@ type ClusterAutoscaler interface {
 	// Name returns the cloud-provider name as used by k8s cluster-autoscaler.
 	Name() string
 	// Secrets returns a list of secrets to deploy together with the k8s cluster-autoscaler.
-	Secrets(providerID, cloudServiceAccountURI string) (resources.Secrets, error)
+	Secrets(providerID, cloudServiceAccountURI string) (kubernetes.Secrets, error)
 	// Volumes returns a list of volumes to deploy together with the k8s cluster-autoscaler.
 	Volumes() []k8s.Volume
 	// VolumeMounts returns a list of volume mounts to deploy together with the k8s cluster-autoscaler.
@@ -159,11 +159,11 @@ func (m *stubCloudControllerManager) ExtraArgs() []string {
 	return []string{}
 }
 
-func (m *stubCloudControllerManager) ConfigMaps(instance metadata.InstanceMetadata) (resources.ConfigMaps, error) {
+func (m *stubCloudControllerManager) ConfigMaps(instance metadata.InstanceMetadata) (kubernetes.ConfigMaps, error) {
 	return []*k8s.ConfigMap{}, nil
 }
 
-func (m *stubCloudControllerManager) Secrets(ctx context.Context, instance, cloudServiceAccountURI string) (resources.Secrets, error) {
+func (m *stubCloudControllerManager) Secrets(ctx context.Context, instance, cloudServiceAccountURI string) (kubernetes.Secrets, error) {
 	return []*k8s.Secret{}, nil
 }
 
@@ -216,8 +216,8 @@ func (a *stubClusterAutoscaler) Name() string {
 }
 
 // Secrets returns a list of secrets to deploy together with the k8s cluster-autoscaler.
-func (a *stubClusterAutoscaler) Secrets(instance, cloudServiceAccountURI string) (resources.Secrets, error) {
-	return resources.Secrets{}, nil
+func (a *stubClusterAutoscaler) Secrets(instance, cloudServiceAccountURI string) (kubernetes.Secrets, error) {
+	return kubernetes.Secrets{}, nil
 }
 
 // Volumes returns a list of volumes to deploy together with the k8s cluster-autoscaler.

bootstrapper/internal/kubernetes/k8sapi/kubeadm_config.go

@@ -4,8 +4,8 @@ import (
 	"path/filepath"
 
 	"github.com/edgelesssys/constellation/bootstrapper/internal/kubelet"
-	"github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi/resources"
 	"github.com/edgelesssys/constellation/internal/constants"
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/edgelesssys/constellation/internal/versions"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -223,12 +223,12 @@ func (k *KubeadmJoinYAML) SetControlPlane(advertiseAddress string) {
 }
 
 func (k *KubeadmJoinYAML) Marshal() ([]byte, error) {
-	return resources.MarshalK8SResources(k)
+	return kubernetes.MarshalK8SResources(k)
 }
 
 func (k *KubeadmJoinYAML) Unmarshal(yamlData []byte) (KubeadmJoinYAML, error) {
 	var tmp KubeadmJoinYAML
-	return tmp, resources.UnmarshalK8SResources(yamlData, &tmp)
+	return tmp, kubernetes.UnmarshalK8SResources(yamlData, &tmp)
 }
 
 type KubeadmInitYAML struct {
@@ -291,10 +291,10 @@ func (k *KubeadmInitYAML) SetProviderID(providerID string) {
 }
 
 func (k *KubeadmInitYAML) Marshal() ([]byte, error) {
-	return resources.MarshalK8SResources(k)
+	return kubernetes.MarshalK8SResources(k)
 }
 
 func (k *KubeadmInitYAML) Unmarshal(yamlData []byte) (KubeadmInitYAML, error) {
 	var tmp KubeadmInitYAML
-	return tmp, resources.UnmarshalK8SResources(yamlData, &tmp)
+	return tmp, kubernetes.UnmarshalK8SResources(yamlData, &tmp)
 }

bootstrapper/internal/kubernetes/k8sapi/kubectl/client/client.go

@@ -5,7 +5,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi/resources"
+	kubernetesshared "github.com/edgelesssys/constellation/internal/kubernetes"
 	corev1 "k8s.io/api/core/v1"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	apiextensionsclientv1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1"
@@ -83,7 +83,7 @@ func (c *Client) ApplyOneObject(info *resource.Info, forceConflicts bool) error
 }
 
 // GetObjects tries to marshal the resources into []*resource.Info using a resource.Builder.
-func (c *Client) GetObjects(resources resources.Marshaler) ([]*resource.Info, error) {
+func (c *Client) GetObjects(resources kubernetesshared.Marshaler) ([]*resource.Info, error) {
 	// convert our resource struct into YAML
 	data, err := resources.Marshal()
 	if err != nil {

bootstrapper/internal/kubernetes/k8sapi/kubectl/client/client_test.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi/resources"
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/goleak"
@@ -263,7 +264,7 @@ func TestApplyOneObject(t *testing.T) {
 
 func TestGetObjects(t *testing.T) {
 	testCases := map[string]struct {
-		wantResources    resources.Marshaler
+		wantResources    kubernetes.Marshaler
 		httpResponseData map[string]string
 		resourcesYAML    string
 		wantErr          bool

bootstrapper/internal/kubernetes/k8sapi/kubectl/kubectl.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi/resources"
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/cli-runtime/pkg/resource"
 )
@@ -18,7 +18,7 @@ type Client interface {
 	// ApplyOneObject applies a k8s resource similar to kubectl apply.
 	ApplyOneObject(info *resource.Info, forceConflicts bool) error
 	// GetObjects converts resources into prepared info fields for use in ApplyOneObject.
-	GetObjects(resources resources.Marshaler) ([]*resource.Info, error)
+	GetObjects(resources kubernetes.Marshaler) ([]*resource.Info, error)
 	CreateConfigMap(ctx context.Context, configMap corev1.ConfigMap) error
 	AddTolerationsToDeployment(ctx context.Context, tolerations []corev1.Toleration, name string, namespace string) error
 	AddNodeSelectorsToDeployment(ctx context.Context, selectors map[string]string, name string, namespace string) error
@@ -45,7 +45,7 @@ func New() *Kubectl {
 }
 
 // Apply will apply the given resources using server-side-apply.
-func (k *Kubectl) Apply(resources resources.Marshaler, forceConflicts bool) error {
+func (k *Kubectl) Apply(resources kubernetes.Marshaler, forceConflicts bool) error {
 	if k.kubeconfig == nil {
 		return ErrKubeconfigNotSet
 	}

bootstrapper/internal/kubernetes/k8sapi/kubectl/kubectl_test.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi/resources"
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/goleak"
 	corev1 "k8s.io/api/core/v1"
@@ -30,7 +30,7 @@ func (s *stubClient) ApplyOneObject(info *resource.Info, forceConflicts bool) er
 	return s.applyOneObjectErr
 }
 
-func (s *stubClient) GetObjects(resources resources.Marshaler) ([]*resource.Info, error) {
+func (s *stubClient) GetObjects(resources kubernetes.Marshaler) ([]*resource.Info, error) {
 	return s.getObjectsInfos, s.getObjectsErr
 }
 

bootstrapper/internal/kubernetes/k8sapi/resources/access_manager.go

@@ -1,6 +1,7 @@
 package resources
 
 import (
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/edgelesssys/constellation/internal/versions"
 	"google.golang.org/protobuf/proto"
 	apps "k8s.io/api/apps/v1"
@@ -192,5 +193,5 @@ func NewAccessManagerDeployment(sshUsers map[string]string) *accessManagerDeploy
 
 // Marshal marshals the access-manager deployment as YAML documents.
 func (c *accessManagerDeployment) Marshal() ([]byte, error) {
-	return MarshalK8SResources(c)
+	return kubernetes.MarshalK8SResources(c)
 }

bootstrapper/internal/kubernetes/k8sapi/resources/access_manager_test.go

@@ -3,6 +3,7 @@ package resources
 import (
 	"testing"
 
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/goleak"
@@ -22,7 +23,7 @@ func TestAccessManagerMarshalUnmarshal(t *testing.T) {
 	require.NoError(err)
 
 	var recreated accessManagerDeployment
-	require.NoError(UnmarshalK8SResources(data, &recreated))
+	require.NoError(kubernetes.UnmarshalK8SResources(data, &recreated))
 	assert.Equal(accessManagerDeplNil, &recreated)
 
 	// With data
@@ -32,6 +33,6 @@ func TestAccessManagerMarshalUnmarshal(t *testing.T) {
 	data, err = accessManagerDeplNil.Marshal()
 	require.NoError(err)
 
-	require.NoError(UnmarshalK8SResources(data, &recreated))
+	require.NoError(kubernetes.UnmarshalK8SResources(data, &recreated))
 	assert.Equal(accessManagerDeplNil, &recreated)
 }

bootstrapper/internal/kubernetes/k8sapi/resources/auditpolicy.go

@@ -1,6 +1,7 @@
 package resources
 
 import (
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	auditv1 "k8s.io/apiserver/pkg/apis/audit/v1"
 )
@@ -29,5 +30,5 @@ func NewDefaultAuditPolicy() *AuditPolicy {
 
 // Marshal marshals the audit policy as a YAML document.
 func (p *AuditPolicy) Marshal() ([]byte, error) {
-	return MarshalK8SResources(p)
+	return kubernetes.MarshalK8SResources(p)
 }

bootstrapper/internal/kubernetes/k8sapi/resources/auditpolicy_test.go

@@ -3,6 +3,7 @@ package resources
 import (
 	"testing"
 
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -16,6 +17,6 @@ func TestAuditPolicyMarshalUnmarshal(t *testing.T) {
 	require.NoError(err)
 
 	var recreated AuditPolicy
-	require.NoError(UnmarshalK8SResources(data, &recreated))
+	require.NoError(kubernetes.UnmarshalK8SResources(data, &recreated))
 	assert.Equal(auditPolicy, &recreated)
 }

bootstrapper/internal/kubernetes/k8sapi/resources/cloud_controller_manager.go

@@ -3,6 +3,7 @@ package resources
 import (
 	"fmt"
 
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	apps "k8s.io/api/apps/v1"
 	k8s "k8s.io/api/core/v1"
 	rbac "k8s.io/api/rbac/v1"
@@ -168,5 +169,5 @@ func NewDefaultCloudControllerManagerDeployment(cloudProvider, image, path, podC
 }
 
 func (c *cloudControllerManagerDeployment) Marshal() ([]byte, error) {
-	return MarshalK8SResources(c)
+	return kubernetes.MarshalK8SResources(c)
 }

bootstrapper/internal/kubernetes/k8sapi/resources/cloud_controller_manager_test.go

@@ -3,6 +3,7 @@ package resources
 import (
 	"testing"
 
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	k8s "k8s.io/api/core/v1"
@@ -17,6 +18,6 @@ func TestCloudControllerMarshalUnmarshal(t *testing.T) {
 	require.NoError(err)
 
 	var recreated cloudControllerManagerDeployment
-	require.NoError(UnmarshalK8SResources(data, &recreated))
+	require.NoError(kubernetes.UnmarshalK8SResources(data, &recreated))
 	assert.Equal(cloudControllerManagerDepl, &recreated)
 }

bootstrapper/internal/kubernetes/k8sapi/resources/cloudnodemanager.go

@@ -1,6 +1,7 @@
 package resources
 
 import (
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	apps "k8s.io/api/apps/v1"
 	k8s "k8s.io/api/core/v1"
 	rbac "k8s.io/api/rbac/v1"
@@ -176,5 +177,5 @@ func NewDefaultCloudNodeManagerDeployment(image, path string, extraArgs []string
 
 // Marshal marshals the cloud-node-manager deployment as YAML documents.
 func (c *cloudNodeManagerDeployment) Marshal() ([]byte, error) {
-	return MarshalK8SResources(c)
+	return kubernetes.MarshalK8SResources(c)
 }

bootstrapper/internal/kubernetes/k8sapi/resources/cloudnodemanager_test.go

@@ -3,6 +3,7 @@ package resources
 import (
 	"testing"
 
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -16,6 +17,6 @@ func TestCloudNodeManagerMarshalUnmarshal(t *testing.T) {
 	require.NoError(err)
 
 	var recreated cloudNodeManagerDeployment
-	require.NoError(UnmarshalK8SResources(data, &recreated))
+	require.NoError(kubernetes.UnmarshalK8SResources(data, &recreated))
 	assert.Equal(cloudNodeManagerDepl, &recreated)
 }

bootstrapper/internal/kubernetes/k8sapi/resources/cluster_autoscaler.go

@@ -1,6 +1,7 @@
 package resources
 
 import (
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/edgelesssys/constellation/internal/versions"
 	"google.golang.org/protobuf/proto"
 	apps "k8s.io/api/apps/v1"
@@ -485,7 +486,7 @@ func NewDefaultAutoscalerDeployment(extraVolumes []k8s.Volume, extraVolumeMounts
 }
 
 func (a *autoscalerDeployment) Marshal() ([]byte, error) {
-	return MarshalK8SResources(a)
+	return kubernetes.MarshalK8SResources(a)
 }
 
 func (a *autoscalerDeployment) SetAutoscalerCommand(cloudprovider string, autoscalingNodeGroups []string) {

bootstrapper/internal/kubernetes/k8sapi/resources/cluster_autoscaler_test.go

@@ -3,6 +3,7 @@ package resources
 import (
 	"testing"
 
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -19,7 +20,7 @@ func TestAutoscalerDeploymentMarshalUnmarshal(t *testing.T) {
 	t.Log(string(data))
 
 	var recreated autoscalerDeployment
-	require.NoError(UnmarshalK8SResources(data, &recreated))
+	require.NoError(kubernetes.UnmarshalK8SResources(data, &recreated))
 	assert.Equal(autoscalerDepl, &recreated)
 }
 
@@ -36,6 +37,6 @@ func TestAutoscalerDeploymentWithCommandMarshalUnmarshal(t *testing.T) {
 	t.Log(string(data))
 
 	var recreated autoscalerDeployment
-	require.NoError(UnmarshalK8SResources(data, &recreated))
+	require.NoError(kubernetes.UnmarshalK8SResources(data, &recreated))
 	assert.Equal(autoscalerDepl, &recreated)
 }

bootstrapper/internal/kubernetes/k8sapi/resources/gcp_guest_agent.go

@@ -1,6 +1,7 @@
 package resources
 
 import (
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/edgelesssys/constellation/internal/versions"
 	apps "k8s.io/api/apps/v1"
 	k8s "k8s.io/api/core/v1"
@@ -172,5 +173,5 @@ func NewGCPGuestAgentDaemonset() *gcpGuestAgentDaemonset {
 
 // Marshal marshals the access-manager deployment as YAML documents.
 func (c *gcpGuestAgentDaemonset) Marshal() ([]byte, error) {
-	return MarshalK8SResources(c)
+	return kubernetes.MarshalK8SResources(c)
 }

bootstrapper/internal/kubernetes/k8sapi/resources/joinservice.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/edgelesssys/constellation/internal/constants"
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/edgelesssys/constellation/internal/versions"
 	apps "k8s.io/api/apps/v1"
 	k8s "k8s.io/api/core/v1"
@@ -252,5 +253,5 @@ func NewJoinServiceDaemonset(csp, measurementsJSON, enforcedPCRsJSON string, mea
 
 // Marshal the daemonset using the Kubernetes resource marshaller.
 func (a *joinServiceDaemonset) Marshal() ([]byte, error) {
-	return MarshalK8SResources(a)
+	return kubernetes.MarshalK8SResources(a)
 }

bootstrapper/internal/kubernetes/k8sapi/resources/joinservice_test.go

@@ -3,6 +3,7 @@ package resources
 import (
 	"testing"
 
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -13,6 +14,6 @@ func TestNewJoinServiceDaemonset(t *testing.T) {
 	require.NoError(t, err)
 
 	var recreated joinServiceDaemonset
-	require.NoError(t, UnmarshalK8SResources(deploymentYAML, &recreated))
+	require.NoError(t, kubernetes.UnmarshalK8SResources(deploymentYAML, &recreated))
 	assert.Equal(t, deployment, &recreated)
 }

bootstrapper/internal/kubernetes/k8sapi/resources/kms.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/edgelesssys/constellation/internal/constants"
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/edgelesssys/constellation/internal/versions"
 	apps "k8s.io/api/apps/v1"
 	k8s "k8s.io/api/core/v1"
@@ -246,5 +247,5 @@ func NewKMSDeployment(csp string, config KMSConfig) *kmsDeployment {
 }
 
 func (c *kmsDeployment) Marshal() ([]byte, error) {
-	return MarshalK8SResources(c)
+	return kubernetes.MarshalK8SResources(c)
 }

bootstrapper/internal/kubernetes/k8sapi/resources/kms_test.go

@@ -3,6 +3,7 @@ package resources
 import (
 	"testing"
 
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -16,6 +17,6 @@ func TestKMSMarshalUnmarshal(t *testing.T) {
 	require.NoError(err)
 
 	var recreated kmsDeployment
-	require.NoError(UnmarshalK8SResources(data, &recreated))
+	require.NoError(kubernetes.UnmarshalK8SResources(data, &recreated))
 	assert.Equal(kmsDepl, &recreated)
 }

bootstrapper/internal/kubernetes/k8sapi/resources/node_maintenance_operator.go

@@ -3,6 +3,7 @@ package resources
 import (
 	"time"
 
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/edgelesssys/constellation/internal/versions"
 	operatorsv1 "github.com/operator-framework/api/pkg/operators/v1"
 	operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
@@ -74,5 +75,5 @@ func NewNodeMaintenanceOperatorDeployment() *nodeMaintenanceOperatorDeployment {
 }
 
 func (c *nodeMaintenanceOperatorDeployment) Marshal() ([]byte, error) {
-	return MarshalK8SResources(c)
+	return kubernetes.MarshalK8SResources(c)
 }

bootstrapper/internal/kubernetes/k8sapi/resources/node_maintenance_operator_test.go

@@ -3,6 +3,7 @@ package resources
 import (
 	"testing"
 
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -16,6 +17,6 @@ func TestNodeMaintenanceOperatorMarshalUnmarshal(t *testing.T) {
 	require.NoError(err)
 
 	var recreated nodeMaintenanceOperatorDeployment
-	require.NoError(UnmarshalK8SResources(data, &recreated))
+	require.NoError(kubernetes.UnmarshalK8SResources(data, &recreated))
 	assert.Equal(nmoDepl, &recreated)
 }

bootstrapper/internal/kubernetes/k8sapi/resources/node_operator.go

@@ -4,6 +4,7 @@ import (
 	_ "embed"
 	"time"
 
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/edgelesssys/constellation/internal/versions"
 	operatorsv1 "github.com/operator-framework/api/pkg/operators/v1"
 	operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
@@ -88,5 +89,5 @@ func NewNodeOperatorDeployment(cloudProvider string, uid string) *nodeOperatorDe
 }
 
 func (c *nodeOperatorDeployment) Marshal() ([]byte, error) {
-	return MarshalK8SResources(c)
+	return kubernetes.MarshalK8SResources(c)
 }

bootstrapper/internal/kubernetes/k8sapi/resources/node_operator_test.go

@@ -3,6 +3,7 @@ package resources
 import (
 	"testing"
 
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -16,6 +17,6 @@ func TestNodeOperatorMarshalUnmarshal(t *testing.T) {
 	require.NoError(err)
 
 	var recreated nodeOperatorDeployment
-	require.NoError(UnmarshalK8SResources(data, &recreated))
+	require.NoError(kubernetes.UnmarshalK8SResources(data, &recreated))
 	assert.Equal(nmoDepl, &recreated)
 }

bootstrapper/internal/kubernetes/k8sapi/resources/verification.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/edgelesssys/constellation/internal/constants"
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/edgelesssys/constellation/internal/versions"
 	apps "k8s.io/api/apps/v1"
 	k8s "k8s.io/api/core/v1"
@@ -144,5 +145,5 @@ func NewVerificationDaemonSet(csp string) *verificationDaemonset {
 }
 
 func (v *verificationDaemonset) Marshal() ([]byte, error) {
-	return MarshalK8SResources(v)
+	return kubernetes.MarshalK8SResources(v)
 }

bootstrapper/internal/kubernetes/k8sapi/resources/verification_test.go

@@ -3,6 +3,7 @@ package resources
 import (
 	"testing"
 
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -13,6 +14,6 @@ func TestNewVerificationDaemonset(t *testing.T) {
 	require.NoError(t, err)
 
 	var recreated verificationDaemonset
-	require.NoError(t, UnmarshalK8SResources(deploymentYAML, &recreated))
+	require.NoError(t, kubernetes.UnmarshalK8SResources(deploymentYAML, &recreated))
 	assert.Equal(t, deployment, &recreated)
 }

bootstrapper/internal/kubernetes/k8sapi/util.go

@@ -20,6 +20,7 @@ import (
 	"github.com/edgelesssys/constellation/bootstrapper/internal/kubelet"
 	"github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi/resources"
 	"github.com/edgelesssys/constellation/internal/constants"
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	kubeconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
 
 	"github.com/edgelesssys/constellation/internal/crypto"
@@ -49,7 +50,7 @@ const (
 
 // Client provides the functions to talk to the k8s API.
 type Client interface {
-	Apply(resources resources.Marshaler, forceConflicts bool) error
+	Apply(resources kubernetes.Marshaler, forceConflicts bool) error
 	SetKubeconfig(kubeconfig []byte)
 	CreateConfigMap(ctx context.Context, configMap corev1.ConfigMap) error
 	AddTolerationsToDeployment(ctx context.Context, tolerations []corev1.Toleration, name string, namespace string) error
@@ -343,7 +344,7 @@ func (k *KubernetesUtil) deployCiliumQEMU(ctx context.Context, helmClient *actio
 }
 
 // SetupAutoscaling deploys the k8s cluster autoscaler.
-func (k *KubernetesUtil) SetupAutoscaling(kubectl Client, clusterAutoscalerConfiguration resources.Marshaler, secrets resources.Marshaler) error {
+func (k *KubernetesUtil) SetupAutoscaling(kubectl Client, clusterAutoscalerConfiguration kubernetes.Marshaler, secrets kubernetes.Marshaler) error {
 	if err := kubectl.Apply(secrets, true); err != nil {
 		return fmt.Errorf("applying cluster-autoscaler Secrets: %w", err)
 	}
@@ -351,17 +352,17 @@ func (k *KubernetesUtil) SetupAutoscaling(kubectl Client, clusterAutoscalerConfi
 }
 
 // SetupJoinService deploys the Constellation node join service.
-func (k *KubernetesUtil) SetupJoinService(kubectl Client, joinServiceConfiguration resources.Marshaler) error {
+func (k *KubernetesUtil) SetupJoinService(kubectl Client, joinServiceConfiguration kubernetes.Marshaler) error {
 	return kubectl.Apply(joinServiceConfiguration, true)
 }
 
 // SetupGCPGuestAgent deploys the GCP guest agent daemon set.
-func (k *KubernetesUtil) SetupGCPGuestAgent(kubectl Client, guestAgentDaemonset resources.Marshaler) error {
+func (k *KubernetesUtil) SetupGCPGuestAgent(kubectl Client, guestAgentDaemonset kubernetes.Marshaler) error {
 	return kubectl.Apply(guestAgentDaemonset, true)
 }
 
 // SetupCloudControllerManager deploys the k8s cloud-controller-manager.
-func (k *KubernetesUtil) SetupCloudControllerManager(kubectl Client, cloudControllerManagerConfiguration resources.Marshaler, configMaps resources.Marshaler, secrets resources.Marshaler) error {
+func (k *KubernetesUtil) SetupCloudControllerManager(kubectl Client, cloudControllerManagerConfiguration kubernetes.Marshaler, configMaps kubernetes.Marshaler, secrets kubernetes.Marshaler) error {
 	if err := kubectl.Apply(configMaps, true); err != nil {
 		return fmt.Errorf("applying ccm ConfigMaps: %w", err)
 	}
@@ -375,17 +376,17 @@ func (k *KubernetesUtil) SetupCloudControllerManager(kubectl Client, cloudContro
 }
 
 // SetupCloudNodeManager deploys the k8s cloud-node-manager.
-func (k *KubernetesUtil) SetupCloudNodeManager(kubectl Client, cloudNodeManagerConfiguration resources.Marshaler) error {
+func (k *KubernetesUtil) SetupCloudNodeManager(kubectl Client, cloudNodeManagerConfiguration kubernetes.Marshaler) error {
 	return kubectl.Apply(cloudNodeManagerConfiguration, true)
 }
 
 // SetupAccessManager deploys the constellation-access-manager for deploying SSH keys on control-plane & worker nodes.
-func (k *KubernetesUtil) SetupAccessManager(kubectl Client, accessManagerConfiguration resources.Marshaler) error {
+func (k *KubernetesUtil) SetupAccessManager(kubectl Client, accessManagerConfiguration kubernetes.Marshaler) error {
 	return kubectl.Apply(accessManagerConfiguration, true)
 }
 
 // SetupKMS deploys the KMS deployment.
-func (k *KubernetesUtil) SetupKMS(kubectl Client, kmsConfiguration resources.Marshaler) error {
+func (k *KubernetesUtil) SetupKMS(kubectl Client, kmsConfiguration kubernetes.Marshaler) error {
 	if err := kubectl.Apply(kmsConfiguration, true); err != nil {
 		return fmt.Errorf("applying KMS configuration: %w", err)
 	}
@@ -393,11 +394,11 @@ func (k *KubernetesUtil) SetupKMS(kubectl Client, kmsConfiguration resources.Mar
 }
 
 // SetupVerificationService deploys the verification service.
-func (k *KubernetesUtil) SetupVerificationService(kubectl Client, verificationServiceConfiguration resources.Marshaler) error {
+func (k *KubernetesUtil) SetupVerificationService(kubectl Client, verificationServiceConfiguration kubernetes.Marshaler) error {
 	return kubectl.Apply(verificationServiceConfiguration, true)
 }
 
-func (k *KubernetesUtil) SetupOperatorLifecycleManager(ctx context.Context, kubectl Client, olmCRDs, olmConfiguration resources.Marshaler, crdNames []string) error {
+func (k *KubernetesUtil) SetupOperatorLifecycleManager(ctx context.Context, kubectl Client, olmCRDs, olmConfiguration kubernetes.Marshaler, crdNames []string) error {
 	if err := kubectl.Apply(olmCRDs, true); err != nil {
 		return fmt.Errorf("applying OLM CRDs: %w", err)
 	}
@@ -409,11 +410,11 @@ func (k *KubernetesUtil) SetupOperatorLifecycleManager(ctx context.Context, kube
 	return kubectl.Apply(olmConfiguration, true)
 }
 
-func (k *KubernetesUtil) SetupNodeMaintenanceOperator(kubectl Client, nodeMaintenanceOperatorConfiguration resources.Marshaler) error {
+func (k *KubernetesUtil) SetupNodeMaintenanceOperator(kubectl Client, nodeMaintenanceOperatorConfiguration kubernetes.Marshaler) error {
 	return kubectl.Apply(nodeMaintenanceOperatorConfiguration, true)
 }
 
-func (k *KubernetesUtil) SetupNodeOperator(ctx context.Context, kubectl Client, nodeOperatorConfiguration resources.Marshaler) error {
+func (k *KubernetesUtil) SetupNodeOperator(ctx context.Context, kubectl Client, nodeOperatorConfiguration kubernetes.Marshaler) error {
 	return kubectl.Apply(nodeOperatorConfiguration, true)
 }
 

bootstrapper/internal/kubernetes/k8sutil.go

@@ -5,7 +5,7 @@ import (
 	"net"
 
 	"github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi"
-	"github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi/resources"
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/edgelesssys/constellation/internal/logger"
 	"github.com/edgelesssys/constellation/internal/versions"
 )
@@ -15,17 +15,17 @@ type clusterUtil interface {
 	InitCluster(ctx context.Context, initConfig []byte, nodeName string, ips []net.IP, log *logger.Logger) error
 	JoinCluster(ctx context.Context, joinConfig []byte, log *logger.Logger) error
 	SetupHelmDeployments(ctx context.Context, client k8sapi.Client, helmDeployments []byte, in k8sapi.SetupPodNetworkInput, log *logger.Logger) error
-	SetupAccessManager(kubectl k8sapi.Client, sshUsers resources.Marshaler) error
-	SetupAutoscaling(kubectl k8sapi.Client, clusterAutoscalerConfiguration resources.Marshaler, secrets resources.Marshaler) error
-	SetupJoinService(kubectl k8sapi.Client, joinServiceConfiguration resources.Marshaler) error
-	SetupCloudControllerManager(kubectl k8sapi.Client, cloudControllerManagerConfiguration resources.Marshaler, configMaps resources.Marshaler, secrets resources.Marshaler) error
-	SetupCloudNodeManager(kubectl k8sapi.Client, cloudNodeManagerConfiguration resources.Marshaler) error
-	SetupKMS(kubectl k8sapi.Client, kmsConfiguration resources.Marshaler) error
-	SetupVerificationService(kubectl k8sapi.Client, verificationServiceConfiguration resources.Marshaler) error
-	SetupGCPGuestAgent(kubectl k8sapi.Client, gcpGuestAgentConfiguration resources.Marshaler) error
-	SetupOperatorLifecycleManager(ctx context.Context, kubectl k8sapi.Client, olmCRDs, olmConfiguration resources.Marshaler, crdNames []string) error
-	SetupNodeMaintenanceOperator(kubectl k8sapi.Client, nodeMaintenanceOperatorConfiguration resources.Marshaler) error
-	SetupNodeOperator(ctx context.Context, kubectl k8sapi.Client, nodeOperatorConfiguration resources.Marshaler) error
+	SetupAccessManager(kubectl k8sapi.Client, sshUsers kubernetes.Marshaler) error
+	SetupAutoscaling(kubectl k8sapi.Client, clusterAutoscalerConfiguration kubernetes.Marshaler, secrets kubernetes.Marshaler) error
+	SetupJoinService(kubectl k8sapi.Client, joinServiceConfiguration kubernetes.Marshaler) error
+	SetupCloudControllerManager(kubectl k8sapi.Client, cloudControllerManagerConfiguration kubernetes.Marshaler, configMaps kubernetes.Marshaler, secrets kubernetes.Marshaler) error
+	SetupCloudNodeManager(kubectl k8sapi.Client, cloudNodeManagerConfiguration kubernetes.Marshaler) error
+	SetupKMS(kubectl k8sapi.Client, kmsConfiguration kubernetes.Marshaler) error
+	SetupVerificationService(kubectl k8sapi.Client, verificationServiceConfiguration kubernetes.Marshaler) error
+	SetupGCPGuestAgent(kubectl k8sapi.Client, gcpGuestAgentConfiguration kubernetes.Marshaler) error
+	SetupOperatorLifecycleManager(ctx context.Context, kubectl k8sapi.Client, olmCRDs, olmConfiguration kubernetes.Marshaler, crdNames []string) error
+	SetupNodeMaintenanceOperator(kubectl k8sapi.Client, nodeMaintenanceOperatorConfiguration kubernetes.Marshaler) error
+	SetupNodeOperator(ctx context.Context, kubectl k8sapi.Client, nodeOperatorConfiguration kubernetes.Marshaler) error
 	StartKubelet() error
 	RestartKubelet() error
 	FixCilium(nodeNameK8s string, log *logger.Logger)

bootstrapper/internal/kubernetes/kubernetes_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/edgelesssys/constellation/bootstrapper/role"
 	"github.com/edgelesssys/constellation/internal/cloud/metadata"
 	"github.com/edgelesssys/constellation/internal/constants"
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/edgelesssys/constellation/internal/logger"
 	"github.com/edgelesssys/constellation/internal/versions"
 	"github.com/stretchr/testify/assert"
@@ -311,7 +312,7 @@ func TestInitCluster(t *testing.T) {
 			require.NoError(err)
 
 			var kubeadmConfig k8sapi.KubeadmInitYAML
-			require.NoError(resources.UnmarshalK8SResources(tc.clusterUtil.initConfigs[0], &kubeadmConfig))
+			require.NoError(kubernetes.UnmarshalK8SResources(tc.clusterUtil.initConfigs[0], &kubeadmConfig))
 			require.Equal(tc.wantConfig.ClusterConfiguration, kubeadmConfig.ClusterConfiguration)
 			require.Equal(tc.wantConfig.InitConfiguration, kubeadmConfig.InitConfiguration)
 		})
@@ -543,47 +544,47 @@ func (s *stubClusterUtil) SetupHelmDeployments(context.Context, k8sapi.Client, [
 	return s.setupHelmDeploymentsErr
 }
 
-func (s *stubClusterUtil) SetupAutoscaling(kubectl k8sapi.Client, clusterAutoscalerConfiguration resources.Marshaler, secrets resources.Marshaler) error {
+func (s *stubClusterUtil) SetupAutoscaling(kubectl k8sapi.Client, clusterAutoscalerConfiguration kubernetes.Marshaler, secrets kubernetes.Marshaler) error {
 	return s.setupAutoscalingError
 }
 
-func (s *stubClusterUtil) SetupJoinService(kubectl k8sapi.Client, joinServiceConfiguration resources.Marshaler) error {
+func (s *stubClusterUtil) SetupJoinService(kubectl k8sapi.Client, joinServiceConfiguration kubernetes.Marshaler) error {
 	return s.setupJoinServiceError
 }
 
-func (s *stubClusterUtil) SetupGCPGuestAgent(kubectl k8sapi.Client, gcpGuestAgentConfiguration resources.Marshaler) error {
+func (s *stubClusterUtil) SetupGCPGuestAgent(kubectl k8sapi.Client, gcpGuestAgentConfiguration kubernetes.Marshaler) error {
 	return s.setupGCPGuestAgentErr
 }
 
-func (s *stubClusterUtil) SetupCloudControllerManager(kubectl k8sapi.Client, cloudControllerManagerConfiguration resources.Marshaler, configMaps resources.Marshaler, secrets resources.Marshaler) error {
+func (s *stubClusterUtil) SetupCloudControllerManager(kubectl k8sapi.Client, cloudControllerManagerConfiguration kubernetes.Marshaler, configMaps kubernetes.Marshaler, secrets kubernetes.Marshaler) error {
 	return s.setupCloudControllerManagerError
 }
 
-func (s *stubClusterUtil) SetupKMS(kubectl k8sapi.Client, kmsDeployment resources.Marshaler) error {
+func (s *stubClusterUtil) SetupKMS(kubectl k8sapi.Client, kmsDeployment kubernetes.Marshaler) error {
 	return s.setupKMSError
 }
 
-func (s *stubClusterUtil) SetupAccessManager(kubectl k8sapi.Client, accessManagerConfiguration resources.Marshaler) error {
+func (s *stubClusterUtil) SetupAccessManager(kubectl k8sapi.Client, accessManagerConfiguration kubernetes.Marshaler) error {
 	return s.setupAccessManagerError
 }
 
-func (s *stubClusterUtil) SetupCloudNodeManager(kubectl k8sapi.Client, cloudNodeManagerConfiguration resources.Marshaler) error {
+func (s *stubClusterUtil) SetupCloudNodeManager(kubectl k8sapi.Client, cloudNodeManagerConfiguration kubernetes.Marshaler) error {
 	return s.setupCloudNodeManagerError
 }
 
-func (s *stubClusterUtil) SetupVerificationService(kubectl k8sapi.Client, verificationServiceConfiguration resources.Marshaler) error {
+func (s *stubClusterUtil) SetupVerificationService(kubectl k8sapi.Client, verificationServiceConfiguration kubernetes.Marshaler) error {
 	return s.setupVerificationServiceErr
 }
 
-func (s *stubClusterUtil) SetupOperatorLifecycleManager(ctx context.Context, kubectl k8sapi.Client, olmCRDs, olmConfiguration resources.Marshaler, crdNames []string) error {
+func (s *stubClusterUtil) SetupOperatorLifecycleManager(ctx context.Context, kubectl k8sapi.Client, olmCRDs, olmConfiguration kubernetes.Marshaler, crdNames []string) error {
 	return s.setupOLMErr
 }
 
-func (s *stubClusterUtil) SetupNodeMaintenanceOperator(kubectl k8sapi.Client, nodeMaintenanceOperatorConfiguration resources.Marshaler) error {
+func (s *stubClusterUtil) SetupNodeMaintenanceOperator(kubectl k8sapi.Client, nodeMaintenanceOperatorConfiguration kubernetes.Marshaler) error {
 	return s.setupNMOErr
 }
 
-func (s *stubClusterUtil) SetupNodeOperator(ctx context.Context, kubectl k8sapi.Client, nodeOperatorConfiguration resources.Marshaler) error {
+func (s *stubClusterUtil) SetupNodeOperator(ctx context.Context, kubectl k8sapi.Client, nodeOperatorConfiguration kubernetes.Marshaler) error {
 	return s.setupNodeOperatorErr
 }
 
@@ -630,11 +631,11 @@ type stubKubectl struct {
 	AddTNodeSelectorsToDeploymentErr error
 	waitForCRDsErr                   error
 
-	resources   []resources.Marshaler
+	resources   []kubernetes.Marshaler
 	kubeconfigs [][]byte
 }
 
-func (s *stubKubectl) Apply(resources resources.Marshaler, forceConflicts bool) error {
+func (s *stubKubectl) Apply(resources kubernetes.Marshaler, forceConflicts bool) error {
 	s.resources = append(s.resources, resources)
 	return s.ApplyErr
 }

debugd/internal/debugd/metadata/cloudprovider/cloudprovider.go

@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"net"
 
-	azurecloud "github.com/edgelesssys/constellation/bootstrapper/cloudprovider/azure"
-	gcpcloud "github.com/edgelesssys/constellation/bootstrapper/cloudprovider/gcp"
-	qemucloud "github.com/edgelesssys/constellation/bootstrapper/cloudprovider/qemu"
 	"github.com/edgelesssys/constellation/bootstrapper/role"
+	azurecloud "github.com/edgelesssys/constellation/internal/cloud/azure"
+	gcpcloud "github.com/edgelesssys/constellation/internal/cloud/gcp"
 	"github.com/edgelesssys/constellation/internal/cloud/metadata"
+	qemucloud "github.com/edgelesssys/constellation/internal/cloud/qemu"
 	"github.com/edgelesssys/constellation/internal/deploy/ssh"
 )
 

internal/cloud/azure/autoscaler.go

@@ -1,8 +1,8 @@
 package azure
 
 import (
-	"github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi/resources"
 	"github.com/edgelesssys/constellation/internal/azureshared"
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	k8s "k8s.io/api/core/v1"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -16,16 +16,16 @@ func (a *Autoscaler) Name() string {
 }
 
 // Secrets returns a list of secrets to deploy together with the k8s cluster-autoscaler.
-func (a *Autoscaler) Secrets(providerID string, cloudServiceAccountURI string) (resources.Secrets, error) {
+func (a *Autoscaler) Secrets(providerID string, cloudServiceAccountURI string) (kubernetes.Secrets, error) {
 	subscriptionID, resourceGroup, err := azureshared.BasicsFromProviderID(providerID)
 	if err != nil {
-		return resources.Secrets{}, err
+		return kubernetes.Secrets{}, err
 	}
 	creds, err := azureshared.ApplicationCredentialsFromURI(cloudServiceAccountURI)
 	if err != nil {
-		return resources.Secrets{}, err
+		return kubernetes.Secrets{}, err
 	}
-	return resources.Secrets{
+	return kubernetes.Secrets{
 		&k8s.Secret{
 			TypeMeta: meta.TypeMeta{
 				Kind:       "Secret",

internal/cloud/azure/autoscaler_test.go

@@ -3,7 +3,7 @@ package azure
 import (
 	"testing"
 
-	"github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi/resources"
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	k8s "k8s.io/api/core/v1"
@@ -14,13 +14,13 @@ func TestAutoscalerSecrets(t *testing.T) {
 	testCases := map[string]struct {
 		providerID             string
 		cloudServiceAccountURI string
-		wantSecrets            resources.Secrets
+		wantSecrets            kubernetes.Secrets
 		wantErr                bool
 	}{
 		"Secrets works": {
 			providerID:             "azure:///subscriptions/subscription-id/resourceGroups/resource-group/providers/Microsoft.Compute/virtualMachineScaleSets/scaleset/virtualMachines/instance-name",
 			cloudServiceAccountURI: "serviceaccount://azure?tenant_id=tenant-id&client_id=client-id&client_secret=client-secret",
-			wantSecrets: resources.Secrets{
+			wantSecrets: kubernetes.Secrets{
 				&k8s.Secret{
 					TypeMeta: meta.TypeMeta{
 						Kind:       "Secret",

internal/cloud/azure/ccm.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi/resources"
 	"github.com/edgelesssys/constellation/internal/azureshared"
 	"github.com/edgelesssys/constellation/internal/cloud/metadata"
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/edgelesssys/constellation/internal/versions"
 	k8s "k8s.io/api/core/v1"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -55,23 +55,23 @@ func (c *CloudControllerManager) ExtraArgs() []string {
 
 // ConfigMaps returns a list of ConfigMaps to deploy together with the k8s cloud-controller-manager
 // Reference: https://kubernetes.io/docs/concepts/configuration/configmap/ .
-func (c *CloudControllerManager) ConfigMaps(instance metadata.InstanceMetadata) (resources.ConfigMaps, error) {
-	return resources.ConfigMaps{}, nil
+func (c *CloudControllerManager) ConfigMaps(instance metadata.InstanceMetadata) (kubernetes.ConfigMaps, error) {
+	return kubernetes.ConfigMaps{}, nil
 }
 
 // Secrets returns a list of secrets to deploy together with the k8s cloud-controller-manager.
 // Reference: https://kubernetes.io/docs/concepts/configuration/secret/ .
-func (c *CloudControllerManager) Secrets(ctx context.Context, providerID string, cloudServiceAccountURI string) (resources.Secrets, error) {
+func (c *CloudControllerManager) Secrets(ctx context.Context, providerID string, cloudServiceAccountURI string) (kubernetes.Secrets, error) {
 	// Azure CCM expects cloud provider config to contain cluster configuration and service principal client secrets
 	// reference: https://kubernetes-sigs.github.io/cloud-provider-azure/install/configs/
 
 	subscriptionID, resourceGroup, err := azureshared.BasicsFromProviderID(providerID)
 	if err != nil {
-		return resources.Secrets{}, err
+		return kubernetes.Secrets{}, err
 	}
 	creds, err := azureshared.ApplicationCredentialsFromURI(cloudServiceAccountURI)
 	if err != nil {
-		return resources.Secrets{}, err
+		return kubernetes.Secrets{}, err
 	}
 
 	vmType := "standard"
@@ -81,12 +81,12 @@ func (c *CloudControllerManager) Secrets(ctx context.Context, providerID string,
 
 	securityGroupName, err := c.metadata.GetNetworkSecurityGroupName(ctx)
 	if err != nil {
-		return resources.Secrets{}, err
+		return kubernetes.Secrets{}, err
 	}
 
 	loadBalancerName, err := c.metadata.GetLoadBalancerName(ctx)
 	if err != nil {
-		return resources.Secrets{}, err
+		return kubernetes.Secrets{}, err
 	}
 
 	config := cloudConfig{
@@ -106,10 +106,10 @@ func (c *CloudControllerManager) Secrets(ctx context.Context, providerID string,
 
 	rawConfig, err := json.Marshal(config)
 	if err != nil {
-		return resources.Secrets{}, err
+		return kubernetes.Secrets{}, err
 	}
 
-	return resources.Secrets{
+	return kubernetes.Secrets{
 		&k8s.Secret{
 			TypeMeta: meta.TypeMeta{
 				Kind:       "Secret",

internal/cloud/azure/ccm_test.go

@@ -5,8 +5,8 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi/resources"
 	"github.com/edgelesssys/constellation/internal/cloud/metadata"
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/edgelesssys/constellation/internal/versions"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -20,14 +20,14 @@ func TestSecrets(t *testing.T) {
 		providerID             string
 		metadata               ccmMetadata
 		cloudServiceAccountURI string
-		wantSecrets            resources.Secrets
+		wantSecrets            kubernetes.Secrets
 		wantErr                bool
 	}{
 		"Secrets works for scale sets": {
 			providerID:             "azure:///subscriptions/subscription-id/resourceGroups/resource-group/providers/Microsoft.Compute/virtualMachineScaleSets/scale-set-name/virtualMachines/instance-id",
 			cloudServiceAccountURI: "serviceaccount://azure?tenant_id=tenant-id&client_id=client-id&client_secret=client-secret&location=location",
 			metadata:               &ccmMetadataStub{loadBalancerName: "load-balancer-name", networkSecurityGroupName: "network-security-group-name"},
-			wantSecrets: resources.Secrets{
+			wantSecrets: kubernetes.Secrets{
 				&k8s.Secret{
 					TypeMeta: meta.TypeMeta{
 						Kind:       "Secret",

internal/cloud/gcp/autoscaler.go

@@ -1,7 +1,7 @@
 package gcp
 
 import (
-	"github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi/resources"
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	k8s "k8s.io/api/core/v1"
 )
 
@@ -14,8 +14,8 @@ func (a *Autoscaler) Name() string {
 }
 
 // Secrets returns a list of secrets to deploy together with the k8s cluster-autoscaler.
-func (a *Autoscaler) Secrets(instance, cloudServiceAccountURI string) (resources.Secrets, error) {
-	return resources.Secrets{}, nil
+func (a *Autoscaler) Secrets(instance, cloudServiceAccountURI string) (kubernetes.Secrets, error) {
+	return kubernetes.Secrets{}, nil
 }
 
 // Volumes returns a list of volumes to deploy together with the k8s cluster-autoscaler.

internal/cloud/gcp/ccm.go

@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi/resources"
 	"github.com/edgelesssys/constellation/internal/cloud/metadata"
 	"github.com/edgelesssys/constellation/internal/gcpshared"
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/edgelesssys/constellation/internal/versions"
 	k8s "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -46,14 +46,14 @@ func (c *CloudControllerManager) ExtraArgs() []string {
 
 // ConfigMaps returns a list of ConfigMaps to deploy together with the k8s cloud-controller-manager
 // Reference: https://kubernetes.io/docs/concepts/configuration/configmap/ .
-func (c *CloudControllerManager) ConfigMaps(instance metadata.InstanceMetadata) (resources.ConfigMaps, error) {
+func (c *CloudControllerManager) ConfigMaps(instance metadata.InstanceMetadata) (kubernetes.ConfigMaps, error) {
 	// GCP CCM expects cloud config to contain the GCP project-id and other configuration.
 	// reference: https://github.com/kubernetes/cloud-provider-gcp/blob/master/cluster/gce/gci/configure-helper.sh#L791-L892
 	var config strings.Builder
 	config.WriteString("[global]\n")
 	projectID, _, _, err := gcpshared.SplitProviderID(instance.ProviderID)
 	if err != nil {
-		return resources.ConfigMaps{}, err
+		return kubernetes.ConfigMaps{}, err
 	}
 	config.WriteString(fmt.Sprintf("project-id = %s\n", projectID))
 	config.WriteString("use-metadata-server = true\n")
@@ -61,7 +61,7 @@ func (c *CloudControllerManager) ConfigMaps(instance metadata.InstanceMetadata)
 	nameParts := strings.Split(instance.Name, "-")
 	config.WriteString("node-tags = constellation-" + nameParts[len(nameParts)-2] + "\n")
 
-	return resources.ConfigMaps{
+	return kubernetes.ConfigMaps{
 		&k8s.ConfigMap{
 			TypeMeta: v1.TypeMeta{
 				Kind:       "ConfigMap",
@@ -80,17 +80,17 @@ func (c *CloudControllerManager) ConfigMaps(instance metadata.InstanceMetadata)
 
 // Secrets returns a list of secrets to deploy together with the k8s cloud-controller-manager.
 // Reference: https://kubernetes.io/docs/concepts/configuration/secret/ .
-func (c *CloudControllerManager) Secrets(ctx context.Context, _ string, cloudServiceAccountURI string) (resources.Secrets, error) {
+func (c *CloudControllerManager) Secrets(ctx context.Context, _ string, cloudServiceAccountURI string) (kubernetes.Secrets, error) {
 	serviceAccountKey, err := gcpshared.ServiceAccountKeyFromURI(cloudServiceAccountURI)
 	if err != nil {
-		return resources.Secrets{}, err
+		return kubernetes.Secrets{}, err
 	}
 	rawKey, err := json.Marshal(serviceAccountKey)
 	if err != nil {
-		return resources.Secrets{}, err
+		return kubernetes.Secrets{}, err
 	}
 
-	return resources.Secrets{
+	return kubernetes.Secrets{
 		&k8s.Secret{
 			TypeMeta: v1.TypeMeta{
 				Kind:       "Secret",

internal/cloud/gcp/ccm_test.go

@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi/resources"
 	"github.com/edgelesssys/constellation/internal/cloud/metadata"
 	"github.com/edgelesssys/constellation/internal/gcpshared"
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/edgelesssys/constellation/internal/versions"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -18,12 +18,12 @@ import (
 func TestConfigMaps(t *testing.T) {
 	testCases := map[string]struct {
 		instance       metadata.InstanceMetadata
-		wantConfigMaps resources.ConfigMaps
+		wantConfigMaps kubernetes.ConfigMaps
 		wantErr        bool
 	}{
 		"ConfigMaps works": {
 			instance: metadata.InstanceMetadata{ProviderID: "gce://project-id/zone/instanceName-UID-0", Name: "instanceName-UID-0"},
-			wantConfigMaps: resources.ConfigMaps{
+			wantConfigMaps: kubernetes.ConfigMaps{
 				&k8s.ConfigMap{
 					TypeMeta: v1.TypeMeta{
 						Kind:       "ConfigMap",
@@ -85,12 +85,12 @@ func TestSecrets(t *testing.T) {
 	testCases := map[string]struct {
 		instance               metadata.InstanceMetadata
 		cloudServiceAccountURI string
-		wantSecrets            resources.Secrets
+		wantSecrets            kubernetes.Secrets
 		wantErr                bool
 	}{
 		"Secrets works": {
 			cloudServiceAccountURI: "serviceaccount://gcp?type=type&project_id=project-id&private_key_id=private-key-id&private_key=private-key&client_email=client-email&client_id=client-id&auth_uri=auth-uri&token_uri=token-uri&auth_provider_x509_cert_url=auth-provider-x509-cert-url&client_x509_cert_url=client-x509-cert-url",
-			wantSecrets: resources.Secrets{
+			wantSecrets: kubernetes.Secrets{
 				&k8s.Secret{
 					TypeMeta: v1.TypeMeta{
 						Kind:       "Secret",

internal/cloud/qemu/autoscaler.go

@@ -1,7 +1,7 @@
 package qemu
 
 import (
-	"github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi/resources"
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	k8s "k8s.io/api/core/v1"
 )
 
@@ -14,8 +14,8 @@ func (a Autoscaler) Name() string {
 }
 
 // Secrets returns a list of secrets to deploy together with the k8s cluster-autoscaler.
-func (a Autoscaler) Secrets(providerID, cloudServiceAccountURI string) (resources.Secrets, error) {
-	return resources.Secrets{}, nil
+func (a Autoscaler) Secrets(providerID, cloudServiceAccountURI string) (kubernetes.Secrets, error) {
+	return kubernetes.Secrets{}, nil
 }
 
 // Volumes returns a list of volumes to deploy together with the k8s cluster-autoscaler.

internal/cloud/qemu/ccm.go

@@ -3,8 +3,8 @@ package qemu
 import (
 	"context"
 
-	"github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi/resources"
 	"github.com/edgelesssys/constellation/internal/cloud/metadata"
+	"github.com/edgelesssys/constellation/internal/kubernetes"
 	"github.com/edgelesssys/constellation/internal/versions"
 	k8s "k8s.io/api/core/v1"
 )
@@ -34,14 +34,14 @@ func (c CloudControllerManager) ExtraArgs() []string {
 
 // ConfigMaps returns a list of ConfigMaps to deploy together with the k8s cloud-controller-manager
 // Reference: https://kubernetes.io/docs/concepts/configuration/configmap/ .
-func (c CloudControllerManager) ConfigMaps(instance metadata.InstanceMetadata) (resources.ConfigMaps, error) {
-	return resources.ConfigMaps{}, nil
+func (c CloudControllerManager) ConfigMaps(instance metadata.InstanceMetadata) (kubernetes.ConfigMaps, error) {
+	return kubernetes.ConfigMaps{}, nil
 }
 
 // Secrets returns a list of secrets to deploy together with the k8s cloud-controller-manager.
 // Reference: https://kubernetes.io/docs/concepts/configuration/secret/ .
-func (c CloudControllerManager) Secrets(ctx context.Context, providerID, cloudServiceAccountURI string) (resources.Secrets, error) {
-	return resources.Secrets{}, nil
+func (c CloudControllerManager) Secrets(ctx context.Context, providerID, cloudServiceAccountURI string) (kubernetes.Secrets, error) {
+	return kubernetes.Secrets{}, nil
 }
 
 // Volumes returns a list of volumes to deploy together with the k8s cloud-controller-manager.

internal/kubernetes/configmaps.go

@@ -1,4 +1,4 @@
-package resources
+package kubernetes
 
 import (
 	k8s "k8s.io/api/core/v1"

internal/kubernetes/configmaps_test.go

@@ -1,4 +1,4 @@
-package resources
+package kubernetes
 
 import (
 	"testing"

internal/kubernetes/marshal.go

@@ -1,4 +1,4 @@
-package resources
+package kubernetes
 
 import (
 	"bytes"

internal/kubernetes/marshal_test.go

@@ -1,4 +1,4 @@
-package resources
+package kubernetes
 
 import (
 	"testing"

internal/kubernetes/secrets.go

@@ -1,4 +1,4 @@
-package resources
+package kubernetes
 
 import (
 	k8s "k8s.io/api/core/v1"

internal/kubernetes/secrets_test.go

@@ -1,4 +1,4 @@
-package resources
+package kubernetes
 
 import (
 	"testing"

joinservice/cmd/main.go

@@ -9,12 +9,12 @@ import (
 	"strconv"
 	"time"
 
-	azurecloud "github.com/edgelesssys/constellation/bootstrapper/cloudprovider/azure"
-	gcpcloud "github.com/edgelesssys/constellation/bootstrapper/cloudprovider/gcp"
-	qemucloud "github.com/edgelesssys/constellation/bootstrapper/cloudprovider/qemu"
 	"github.com/edgelesssys/constellation/internal/atls"
+	azurecloud "github.com/edgelesssys/constellation/internal/cloud/azure"
 	"github.com/edgelesssys/constellation/internal/cloud/cloudprovider"
+	gcpcloud "github.com/edgelesssys/constellation/internal/cloud/gcp"
 	"github.com/edgelesssys/constellation/internal/cloud/metadata"
+	qemucloud "github.com/edgelesssys/constellation/internal/cloud/qemu"
 	"github.com/edgelesssys/constellation/internal/constants"
 	"github.com/edgelesssys/constellation/internal/file"
 	"github.com/edgelesssys/constellation/internal/grpc/atlscredentials"

state/cmd/main.go

@@ -11,14 +11,14 @@ import (
 	"strings"
 	"time"
 
-	azurecloud "github.com/edgelesssys/constellation/bootstrapper/cloudprovider/azure"
-	gcpcloud "github.com/edgelesssys/constellation/bootstrapper/cloudprovider/gcp"
-	qemucloud "github.com/edgelesssys/constellation/bootstrapper/cloudprovider/qemu"
 	"github.com/edgelesssys/constellation/internal/attestation/azure"
 	"github.com/edgelesssys/constellation/internal/attestation/gcp"
 	"github.com/edgelesssys/constellation/internal/attestation/qemu"
 	"github.com/edgelesssys/constellation/internal/attestation/vtpm"
+	azurecloud "github.com/edgelesssys/constellation/internal/cloud/azure"
+	gcpcloud "github.com/edgelesssys/constellation/internal/cloud/gcp"
 	"github.com/edgelesssys/constellation/internal/cloud/metadata"
+	qemucloud "github.com/edgelesssys/constellation/internal/cloud/qemu"
 	"github.com/edgelesssys/constellation/internal/constants"
 	"github.com/edgelesssys/constellation/internal/logger"
 	"github.com/edgelesssys/constellation/state/internal/keyservice"