move resources out

Author: yaacov

controllers/deployment.go

@@ -0,0 +1,90 @@
+package controllers
+
+import (
+	"fmt"
+
+	appsv1 "k8s.io/api/apps/v1"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+
+	ocgatev1beta1 "github.com/yaacov/oc-gate-operator/api/v1beta1"
+)
+
+func (r *GateServerReconciler) deployment(s *ocgatev1beta1.GateServer) (*appsv1.Deployment, error) {
+	image := s.Spec.IMG
+	replicas := int32(1)
+	labels := map[string]string{
+		"app": s.Name,
+	}
+	matchlabels := map[string]string{
+		"app": s.Name,
+	}
+
+	deployment := &appsv1.Deployment{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      s.Name,
+			Namespace: s.Namespace,
+			Labels:    labels,
+		},
+		Spec: appsv1.DeploymentSpec{
+			Replicas: &replicas,
+			Selector: &metav1.LabelSelector{
+				MatchLabels: matchlabels,
+			},
+			Template: corev1.PodTemplateSpec{
+				ObjectMeta: metav1.ObjectMeta{
+					Labels: matchlabels,
+				},
+				Spec: corev1.PodSpec{
+					Containers: []corev1.Container{{
+						Image: image,
+						Name:  "kube-gateway",
+
+						Ports: []corev1.ContainerPort{{
+							ContainerPort: 8080,
+							Name:          "https",
+						}},
+						VolumeMounts: []corev1.VolumeMount{
+							{
+								Name:      "serving-cert",
+								MountPath: "/var/run/secrets/serving-cert",
+							},
+						},
+						Command: []string{
+							"./kube-gateway",
+							"-api-server=https://kubernetes.default.svc",
+							"-gateway-listen=https://0.0.0.0:8080",
+							"-api-server-ca-file=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt",
+							"-api-server-bearer-token-file=/var/run/secrets/kubernetes.io/serviceaccount/token",
+							"-gateway-key-file=/var/run/secrets/serving-cert/tls.key",
+							"-gateway-cert-file=/var/run/secrets/serving-cert/tls.crt",
+							fmt.Sprintf("-jwt-public-key-name=%s-secret", s.Name),
+							fmt.Sprintf("-jwt-public-key-namespace=%s", s.Namespace),
+							"-jwt-request-enable=true",
+							fmt.Sprintf("-jwt-private-key-name=%s-secret", s.Name),
+							fmt.Sprintf("-jwt-private-key-namespace=%s", s.Namespace),
+						},
+					}},
+
+					Volumes: []corev1.Volume{
+						{
+							Name: "serving-cert",
+							VolumeSource: corev1.VolumeSource{
+								Secret: &corev1.SecretVolumeSource{
+									SecretName: fmt.Sprintf("%s-secret", s.Name),
+								},
+							},
+						},
+					},
+
+					ServiceAccountName: s.Name,
+				},
+			},
+		},
+	}
+
+	controllerutil.SetControllerReference(s, deployment, r.Scheme)
+
+	return deployment, nil
+}

controllers/gateserver_controller.go

@@ -19,21 +19,15 @@ package controllers
 import (
 	"context"
 	"fmt"
-	"strings"
 	"time"
 
 	"github.com/go-logr/logr"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/util/intstr"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
-	routev1 "github.com/openshift/api/route/v1"
-	appsv1 "k8s.io/api/apps/v1"
-	corev1 "k8s.io/api/core/v1"
-	rbacv1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	ocgatev1beta1 "github.com/yaacov/oc-gate-operator/api/v1beta1"
@@ -285,235 +279,3 @@ func (r *GateServerReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		For(&ocgatev1beta1.GateServer{}).
 		Complete(r)
 }
-
-func (r *GateServerReconciler) service(s *ocgatev1beta1.GateServer) (*corev1.Service, error) {
-	labels := map[string]string{
-		"app": s.Name,
-	}
-	annotations := map[string]string{
-		"service.alpha.openshift.io/serving-cert-secret-name": fmt.Sprintf("%s-secret", s.Name),
-	}
-
-	service := &corev1.Service{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:        s.Name,
-			Namespace:   s.Namespace,
-			Labels:      labels,
-			Annotations: annotations,
-		},
-		Spec: corev1.ServiceSpec{
-			Selector: labels,
-			Ports: []corev1.ServicePort{
-				{
-					Port:       8080,
-					Protocol:   corev1.ProtocolTCP,
-					TargetPort: intstr.FromInt(8080),
-				},
-			},
-		},
-	}
-
-	controllerutil.SetControllerReference(s, service, r.Scheme)
-
-	return service, nil
-}
-
-func (r *GateServerReconciler) route(s *ocgatev1beta1.GateServer) (*routev1.Route, error) {
-	labels := map[string]string{
-		"app": s.Name,
-	}
-
-	route := &routev1.Route{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      s.Name,
-			Namespace: s.Namespace,
-			Labels:    labels,
-		},
-		Spec: routev1.RouteSpec{
-			Host: s.Spec.Route,
-			To: routev1.RouteTargetReference{
-				Kind: "Service",
-				Name: s.Name,
-			},
-			TLS: &routev1.TLSConfig{
-				Termination: routev1.TLSTerminationReencrypt,
-			},
-			Port: &routev1.RoutePort{
-				TargetPort: intstr.FromInt(8080),
-			},
-			WildcardPolicy: routev1.WildcardPolicyNone,
-		},
-	}
-
-	controllerutil.SetControllerReference(s, route, r.Scheme)
-
-	return route, nil
-}
-
-func (r *GateServerReconciler) serviceaccount(s *ocgatev1beta1.GateServer) (*corev1.ServiceAccount, error) {
-	labels := map[string]string{
-		"app": s.Name,
-	}
-
-	serviceaccount := &corev1.ServiceAccount{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      s.Name,
-			Namespace: s.Namespace,
-			Labels:    labels,
-		},
-		Secrets: []corev1.ObjectReference{
-			{
-				Name: fmt.Sprintf("%s-secret", s.Name),
-			},
-		},
-	}
-	controllerutil.SetControllerReference(s, serviceaccount, r.Scheme)
-
-	return serviceaccount, nil
-}
-
-func (r *GateServerReconciler) role(s *ocgatev1beta1.GateServer) (*rbacv1.Role, error) {
-	var verbs []string
-	var resources []string
-
-	labels := map[string]string{
-		"app": s.Name,
-	}
-
-	if s.Spec.AdminRole == "admin" {
-		verbs = []string{"get", "list", "watch", "create", "delete", "patch", "update"}
-	} else {
-		verbs = []string{"get", "list", "watch"}
-	}
-	if s.Spec.AdminResources == "" {
-		resources = []string{"*"}
-	} else {
-		resources = strings.Split(s.Spec.AdminResources, ",")
-	}
-
-	role := &rbacv1.Role{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      s.Name,
-			Namespace: s.Namespace,
-			Labels:    labels,
-		},
-		Rules: []rbacv1.PolicyRule{
-			{
-				APIGroups: []string{"*"},
-				Resources: resources,
-				Verbs:     verbs,
-			},
-		},
-	}
-
-	controllerutil.SetControllerReference(s, role, r.Scheme)
-
-	return role, nil
-}
-
-func (r *GateServerReconciler) rolebinding(s *ocgatev1beta1.GateServer) (*rbacv1.RoleBinding, error) {
-	labels := map[string]string{
-		"app": s.Name,
-	}
-
-	rolebinding := &rbacv1.RoleBinding{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      s.Name,
-			Namespace: s.Namespace,
-			Labels:    labels,
-		},
-		Subjects: []rbacv1.Subject{
-			{
-				Kind: "ServiceAccount",
-				Name: s.Name,
-			},
-		},
-		RoleRef: rbacv1.RoleRef{
-			APIGroup: "rbac.authorization.k8s.io",
-			Kind:     "Role",
-			Name:     s.Name,
-		},
-	}
-
-	controllerutil.SetControllerReference(s, rolebinding, r.Scheme)
-
-	return rolebinding, nil
-}
-
-func (r *GateServerReconciler) deployment(s *ocgatev1beta1.GateServer) (*appsv1.Deployment, error) {
-	image := s.Spec.IMG
-	replicas := int32(1)
-	labels := map[string]string{
-		"app": s.Name,
-	}
-	matchlabels := map[string]string{
-		"app": s.Name,
-	}
-
-	deployment := &appsv1.Deployment{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      s.Name,
-			Namespace: s.Namespace,
-			Labels:    labels,
-		},
-		Spec: appsv1.DeploymentSpec{
-			Replicas: &replicas,
-			Selector: &metav1.LabelSelector{
-				MatchLabels: matchlabels,
-			},
-			Template: corev1.PodTemplateSpec{
-				ObjectMeta: metav1.ObjectMeta{
-					Labels: matchlabels,
-				},
-				Spec: corev1.PodSpec{
-					Containers: []corev1.Container{{
-						Image: image,
-						Name:  "kube-gateway",
-
-						Ports: []corev1.ContainerPort{{
-							ContainerPort: 8080,
-							Name:          "https",
-						}},
-						VolumeMounts: []corev1.VolumeMount{
-							{
-								Name:      "serving-cert",
-								MountPath: "/var/run/secrets/serving-cert",
-							},
-						},
-						Command: []string{
-							"./kube-gateway",
-							"-api-server=https://kubernetes.default.svc",
-							"-gateway-listen=https://0.0.0.0:8080",
-							"-api-server-ca-file=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt",
-							"-api-server-bearer-token-file=/var/run/secrets/kubernetes.io/serviceaccount/token",
-							"-gateway-key-file=/var/run/secrets/serving-cert/tls.key",
-							"-gateway-cert-file=/var/run/secrets/serving-cert/tls.crt",
-							fmt.Sprintf("-jwt-public-key-name=%s-secret", s.Name),
-							fmt.Sprintf("-jwt-public-key-namespace=%s", s.Namespace),
-							"-jwt-request-enable=true",
-							fmt.Sprintf("-jwt-private-key-name=%s-secret", s.Name),
-							fmt.Sprintf("-jwt-private-key-namespace=%s", s.Namespace),
-						},
-					}},
-
-					Volumes: []corev1.Volume{
-						{
-							Name: "serving-cert",
-							VolumeSource: corev1.VolumeSource{
-								Secret: &corev1.SecretVolumeSource{
-									SecretName: fmt.Sprintf("%s-secret", s.Name),
-								},
-							},
-						},
-					},
-
-					ServiceAccountName: s.Name,
-				},
-			},
-		},
-	}
-
-	controllerutil.SetControllerReference(s, deployment, r.Scheme)
-
-	return deployment, nil
-}

controllers/role.go

@@ -0,0 +1,50 @@
+package controllers
+
+import (
+	"strings"
+
+	rbacv1 "k8s.io/api/rbac/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+
+	ocgatev1beta1 "github.com/yaacov/oc-gate-operator/api/v1beta1"
+)
+
+func (r *GateServerReconciler) role(s *ocgatev1beta1.GateServer) (*rbacv1.Role, error) {
+	var verbs []string
+	var resources []string
+
+	labels := map[string]string{
+		"app": s.Name,
+	}
+
+	if s.Spec.AdminRole == "admin" {
+		verbs = []string{"get", "list", "watch", "create", "delete", "patch", "update"}
+	} else {
+		verbs = []string{"get", "list", "watch"}
+	}
+	if s.Spec.AdminResources == "" {
+		resources = []string{"*"}
+	} else {
+		resources = strings.Split(s.Spec.AdminResources, ",")
+	}
+
+	role := &rbacv1.Role{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      s.Name,
+			Namespace: s.Namespace,
+			Labels:    labels,
+		},
+		Rules: []rbacv1.PolicyRule{
+			{
+				APIGroups: []string{"*"},
+				Resources: resources,
+				Verbs:     verbs,
+			},
+		},
+	}
+
+	controllerutil.SetControllerReference(s, role, r.Scheme)
+
+	return role, nil
+}