added labels to ingress, fixed erroneous tls secret check #263 (#264)

Author: akyriako

Makefile

@@ -52,7 +52,7 @@ OPERATOR_SDK_VERSION ?= v1.39.0
 # Image URL to use all building/pushing image targets
 DOCKER_HUB_NAME ?= quay.io/akyriako#$(shell docker info | sed '/Username:/!d;s/.* //')
 IMG_NAME ?= typesense-operator
-IMG_TAG ?= 0.4.1-rc.2
+IMG_TAG ?= 0.4.1-rc.3
 IMG ?= $(DOCKER_HUB_NAME)/$(IMG_NAME):$(IMG_TAG)
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.

README.md

@@ -228,7 +228,7 @@ Join the conversation:
 ## 📦 Project Status
 
 TyKO is an **independently maintained** project (not affiliated with Typesense, Inc.).
-- Latest version: **0.4.1-rc.2**
+- Latest version: **0.4.1-rc.3**
 - Tested on: Kubernetes 1.35 (earliest 1.26), Typesense 30.0 (earliest 26.0)
 - Contributions welcome! See [FAQ](https://akyriako.github.io/typesense-operator-docs/docs/faq) and [Development](https://akyriako.github.io/typesense-operator-docs/docs/development)
 

api/v1alpha1/typesensecluster_types_ingress.go

@@ -27,6 +27,10 @@ type IngressSpec struct {
 	// +kubebuilder:validation:Optional
 	ServiceAnnotations map[string]string `json:"serviceAnnotations,omitempty"`
 
+	// +optional
+	Labels map[string]string `json:"labels,omitempty"`
+
+	// +optional
 	Annotations map[string]string `json:"annotations,omitempty"`
 
 	// +optional

api/v1alpha1/zz_generated.deepcopy.go

@@ -14,12 +14,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.4.1-rc.2
+version: 0.4.1-rc.3
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.4.1-rc.2"
+appVersion: "0.4.1-rc.3"
 
 maintainers:
   - name: Kyriakos Akriotis

charts/typesense-operator/Chart.yaml

@@ -1262,6 +1262,10 @@ spec:
                     type: string
                   ingressClassName:
                     type: string
+                  labels:
+                    additionalProperties:
+                      type: string
+                    type: object
                   locationDirectives:
                     type: string
                   path:

charts/typesense-operator/templates/typesensecluster-crd.yaml

@@ -12,7 +12,7 @@ controllerManager:
         - ALL
     image:
       repository: quay.io/akyriako/typesense-operator
-      tag: 0.4.1-rc.2
+      tag: 0.4.1-rc.3
     imagePullPolicy: IfNotPresent
     resources:
       limits:

charts/typesense-operator/values.yaml

@@ -1262,6 +1262,10 @@ spec:
                     type: string
                   ingressClassName:
                     type: string
+                  labels:
+                    additionalProperties:
+                      type: string
+                    type: object
                   locationDirectives:
                     type: string
                   path:

config/crd/bases/ts.opentelekomcloud.com_typesenseclusters.yaml

@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/akyriako/typesense-operator
-  newTag: 0.4.1-rc.2
+  newTag: 0.4.1-rc.3

config/manager/kustomization.yaml

@@ -93,9 +93,13 @@ func (r *TypesenseClusterReconciler) ReconcileIngress(ctx context.Context, ts *t
 			return err
 		}
 	} else {
+		lbls := r.getIngressLabels(ig, ts, ingressObjectKey)
+		anons := r.getIngressAnnotations(ig, ts)
+
 		if ts.Spec.Ingress.Host != ig.Spec.Rules[0].Host ||
 			(ts.Spec.Ingress.ClusterIssuer != nil && *ts.Spec.Ingress.ClusterIssuer != ig.Annotations[clusterIssuerAnnotationKey]) ||
-			!apiequality.Semantic.DeepEqual(ts.Spec.Ingress.Annotations, r.getIngressAnnotations(ig, ts)) ||
+			!apiequality.Semantic.DeepEqual(ts.Spec.Ingress.Labels, lbls) ||
+			!apiequality.Semantic.DeepEqual(ts.Spec.Ingress.Annotations, anons) ||
 			(ts.Spec.Ingress.TLSSecretName != nil && *ts.Spec.Ingress.TLSSecretName != ig.Spec.TLS[0].SecretName) ||
 			ts.Spec.Ingress.IngressClassName != *ig.Spec.IngressClassName ||
 			ts.Spec.Ingress.Path != ig.Spec.Rules[0].IngressRuleValue.HTTP.Paths[0].Path ||
@@ -278,10 +282,7 @@ func (r *TypesenseClusterReconciler) ReconcileIngress(ctx context.Context, ts *t
 }
 
 func (r *TypesenseClusterReconciler) createIngress(ctx context.Context, key client.ObjectKey, ts *tsv1alpha1.TypesenseCluster) (*networkingv1.Ingress, error) {
-	if ts.Spec.Ingress.ClusterIssuer != nil && ts.Spec.Ingress.TLSSecretName == nil {
-		return nil, fmt.Errorf("tls secret name is required, skipping ingress creation")
-	}
-
+	labels := map[string]string{}
 	annotations := map[string]string{}
 	var tlsSecretName string
 
@@ -290,6 +291,10 @@ func (r *TypesenseClusterReconciler) createIngress(ctx context.Context, key clie
 		tlsSecretName = fmt.Sprintf("%s-reverse-proxy-%s-certificate-tls", ts.Name, *ts.Spec.Ingress.ClusterIssuer)
 	}
 
+	if ts.Spec.Ingress.Labels != nil {
+		maps.Copy(labels, ts.Spec.Ingress.Labels)
+	}
+
 	if ts.Spec.Ingress.Annotations != nil {
 		maps.Copy(annotations, ts.Spec.Ingress.Annotations)
 	}
@@ -299,7 +304,7 @@ func (r *TypesenseClusterReconciler) createIngress(ctx context.Context, key clie
 	}
 
 	ingress := &networkingv1.Ingress{
-		ObjectMeta: getObjectMeta(ts, &key.Name, annotations),
+		ObjectMeta: getIngressObjectMeta(ts, &key.Name, ts.Spec.Ingress.Labels, ts.Spec.Ingress.Annotations),
 		Spec: networkingv1.IngressSpec{
 			IngressClassName: ptr.To(ts.Spec.Ingress.IngressClassName),
 			TLS: []networkingv1.IngressTLS{
@@ -348,9 +353,6 @@ func (r *TypesenseClusterReconciler) createIngress(ctx context.Context, key clie
 }
 
 func (r *TypesenseClusterReconciler) updateIngress(ctx context.Context, ig networkingv1.Ingress, ts *tsv1alpha1.TypesenseCluster) (*networkingv1.Ingress, error) {
-	if ts.Spec.Ingress.ClusterIssuer != nil && ts.Spec.Ingress.TLSSecretName == nil {
-		return nil, fmt.Errorf("tls secret name is required, skipping ingress update")
-	}
 	patch := client.MergeFrom(ig.DeepCopy())
 
 	ig.Spec.Rules[0].Host = ts.Spec.Ingress.Host
@@ -366,10 +368,13 @@ func (r *TypesenseClusterReconciler) updateIngress(ctx context.Context, ig netwo
 		tlsSecretName = fmt.Sprintf("%s-reverse-proxy-%s-certificate-tls", ts.Name, *ts.Spec.Ingress.ClusterIssuer)
 	}
 
+	if ts.Spec.Ingress.Labels != nil {
+		maps.Copy(ig.Labels, ts.Spec.Ingress.Labels)
+	}
+
 	if ts.Spec.Ingress.Annotations != nil {
-		maps.Copy(annotations, ts.Spec.Ingress.Annotations)
+		maps.Copy(ig.Annotations, ts.Spec.Ingress.Annotations)
 	}
-	ig.Annotations = annotations
 
 	if ts.Spec.Ingress.TLSSecretName != nil {
 		tlsSecretName = *ts.Spec.Ingress.TLSSecretName
@@ -392,6 +397,17 @@ func (r *TypesenseClusterReconciler) deleteIngress(ctx context.Context, ig *netw
 	return nil
 }
 
+func (r *TypesenseClusterReconciler) getIngressLabels(ig *networkingv1.Ingress, ts *tsv1alpha1.TypesenseCluster, key client.ObjectKey) map[string]string {
+	var filters []string
+	defaultLabels := getIngressObjectMeta(ts, &key.Name, nil, nil).Labels
+	for k := range defaultLabels {
+		filters = append(filters, k)
+	}
+
+	filtered := filterMap(ig.Labels, filters...)
+	return filtered
+}
+
 func (r *TypesenseClusterReconciler) getIngressAnnotations(ig *networkingv1.Ingress, ts *tsv1alpha1.TypesenseCluster) map[string]string {
 	filters := append([]string{clusterIssuerAnnotationKey, rancherDomainAnnotationKey}, ts.Spec.IgnoreAnnotationsFromExternalMutations...)
 	filtered := filterMap(ig.Annotations, filters...)