Fix resource types

Signed-off-by: Arthur Silva Sens <[email protected]>

Author: ArthurSens

installer/pkg/common/types.go

@@ -12,7 +12,7 @@ var (
 		Kind:       "Deployment",
 	}
 	ServiceType = metav1.TypeMeta{
-		APIVersion: "apps/v1",
+		APIVersion: "v1",
 		Kind:       "Service",
 	}
 )

installer/pkg/components/alertmanager/serviceaccount.go

@@ -11,7 +11,7 @@ func serviceAccount(ctx *common.RenderContext) ([]runtime.Object, error) {
 	return []runtime.Object{
 		&corev1.ServiceAccount{
 			TypeMeta: metav1.TypeMeta{
-				APIVersion: "apps/v1",
+				APIVersion: "v1",
 				Kind:       "ServiceAccount",
 			},
 			ObjectMeta: metav1.ObjectMeta{

installer/pkg/components/prometheusOperator/service.go

@@ -12,7 +12,7 @@ func service(ctx *common.RenderContext) ([]runtime.Object, error) {
 	return []runtime.Object{
 		&corev1.Service{
 			TypeMeta: metav1.TypeMeta{
-				APIVersion: "apps/v1",
+				APIVersion: "v1",
 				Kind:       "Service",
 			},
 			ObjectMeta: metav1.ObjectMeta{

installer/pkg/components/prometheusOperator/serviceaccount.go

@@ -11,7 +11,7 @@ func serviceAccount(ctx *common.RenderContext) ([]runtime.Object, error) {
 	return []runtime.Object{
 		&corev1.ServiceAccount{
 			TypeMeta: metav1.TypeMeta{
-				APIVersion: "apps/v1",
+				APIVersion: "v1",
 				Kind:       "ServiceAccount",
 			},
 			ObjectMeta: metav1.ObjectMeta{

installer/pkg/components/pyrra/clusterrole.go

@@ -64,7 +64,7 @@ func clusterRoleBinding(ctx *common.RenderContext) ([]runtime.Object, error) {
 		&rbacv1.ClusterRoleBinding{
 			TypeMeta: metav1.TypeMeta{
 				APIVersion: "rbac.authorization.k8s.io/v1",
-				Kind:       "ClusterRole",
+				Kind:       "ClusterRoleBinding",
 			},
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      componentName(kubernetesComponent),

installer/pkg/components/pyrra/deployment.go

@@ -27,7 +27,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 		&appsv1.Deployment{
 			TypeMeta: common.DeploymentType,
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      Name,
+				Name:      fmt.Sprintf("%s-%s", Name, "api"),
 				Namespace: Namespace,
 				Labels:    pyrraLabels(apiComponent),
 			},
@@ -67,7 +67,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 		&appsv1.Deployment{
 			TypeMeta: common.DeploymentType,
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      Name,
+				Name:      fmt.Sprintf("%s-%s", Name, "kubernetes"),
 				Namespace: Namespace,
 				Labels:    pyrraLabels(kubernetesComponent),
 			},

installer/pkg/components/pyrra/serviceaccount.go

@@ -11,7 +11,7 @@ func serviceAccount(ctx *common.RenderContext) ([]runtime.Object, error) {
 	return []runtime.Object{
 		&corev1.ServiceAccount{
 			TypeMeta: metav1.TypeMeta{
-				APIVersion: "apps/v1",
+				APIVersion: "v1",
 				Kind:       "ServiceAccount",
 			},
 			ObjectMeta: metav1.ObjectMeta{