add: anntation

Author: MuNeNiCK

api/v1alpha1/connector_types.go

@@ -60,8 +60,12 @@ type ConnectorSpec struct {
 // ResourceMetadata contains metadata for the resource
 type ResourceMetadata struct {
 	// +optional
-	// Labels to apply to deployments
+	// Labels to apply to deployments and pods
 	Labels map[string]string `json:"labels,omitempty"`
+
+	// +optional
+	// Annotations to apply to pods
+	Annotations map[string]string `json:"annotations,omitempty"`
 }
 
 type ConnectorSpecSpec struct {

api/v1alpha1/controlserver_types.go

@@ -164,7 +164,7 @@ type TLSConfig struct {
 	// AcmePath for storing ACME generated artifacts
 	AcmePath string `json:"acmePath,omitempty"`
 
-	// +kubebuilder:default=true
+	// +kubebuilder:default=false
 	// +optional
 	// ForceHTTPS redirects HTTP requests to HTTPS when TLS is enabled
 	ForceHTTPS bool `json:"forceHttps,omitempty"`

api/v1alpha1/zz_generated.deepcopy.go

@@ -81,10 +81,15 @@ spec:
               metadata:
                 description: Metadata for the resource
                 properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    description: Annotations to apply to pods
+                    type: object
                   labels:
                     additionalProperties:
                       type: string
-                    description: Labels to apply to deployments
+                    description: Labels to apply to deployments and pods
                     type: object
                 type: object
               spec:

config/crd/bases/kodiak.mnicloud.jp_connectors.yaml

@@ -294,7 +294,7 @@ spec:
                         description: Disable TLS
                         type: boolean
                       forceHttps:
-                        default: true
+                        default: false
                         description: ForceHTTPS redirects HTTP requests to HTTPS when
                           TLS is enabled
                         type: boolean

config/crd/bases/kodiak.mnicloud.jp_controlservers.yaml

@@ -155,7 +155,7 @@ func (r *ConnectorReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 		logger.Error(err, "Failed to resolve auth key for connector")
 		return ctrl.Result{}, err
 	}
-	if authKeyResult.Requeue {
+	if authKeyResult.Requeue || authKeyResult.RequeueAfter != 0 {
 		return authKeyResult, nil
 	}
 	if resolvedAuth == nil {
@@ -647,6 +647,15 @@ func (r *ConnectorReconciler) deploymentForConnector(cr *v1alpha1.Connector, log
 		}
 	}
 
+	// Get annotations for pods
+	var annotations map[string]string
+	if cr.Spec.Metadata != nil && cr.Spec.Metadata.Annotations != nil {
+		annotations = make(map[string]string)
+		for k, v := range cr.Spec.Metadata.Annotations {
+			annotations[k] = v
+		}
+	}
+
 	deploy := &appsv1.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      cr.Name + deploymentNameSuffix,
@@ -659,7 +668,8 @@ func (r *ConnectorReconciler) deploymentForConnector(cr *v1alpha1.Connector, log
 			},
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
-					Labels: labels,
+					Labels:      labels,
+					Annotations: annotations,
 				},
 				Spec: corev1.PodSpec{
 					ServiceAccountName: "tailscale-connector",

internal/controller/connector_controller.go

@@ -944,16 +944,16 @@ func computeControlServerAddresses(resource *kodiakv1alpha1.ControlServer) (stri
 }
 
 func sanitizePublicAddr(candidate string, tlsConfig *kodiakv1alpha1.TLSConfig, namespace, svcName string, listenPort int32) string {
-	if candidate == "" {
-		host := fmt.Sprintf("%s.%s.svc.cluster.local", svcName, namespace)
-		return fmt.Sprintf("%s:%d", host, listenPort)
-	}
-
 	scheme := schemeHTTPS
 	if tlsConfig != nil && tlsConfig.Disable {
 		scheme = schemeHTTP
 	}
 
+	if candidate == "" {
+		host := fmt.Sprintf("%s.%s.svc.cluster.local", svcName, namespace)
+		return fmt.Sprintf("%s://%s:%d", scheme, host, listenPort)
+	}
+
 	addr := trimScheme(candidate)
 
 	if _, _, err := net.SplitHostPort(addr); err != nil {
@@ -964,7 +964,7 @@ func sanitizePublicAddr(candidate string, tlsConfig *kodiakv1alpha1.TLSConfig, n
 		addr = fmt.Sprintf("%s:%d", addr, defaultPort)
 	}
 
-	return addr
+	return fmt.Sprintf("%s://%s", scheme, addr)
 }
 
 func trimScheme(value string) string {