26 27 fix bootstrap key and configuration (#28)

* added additionalServerConfiguration in CRD #26

* fixed bootstrap secrets bug #27

Author: akyriako

.gitignore

@@ -26,3 +26,4 @@ go.work.sum
 /bin/
 /bin/controller-gen
 /bin/controller-gen-v0.15.0
+/config/samples/ts_v1alpha1_typesensecluster_blueprints.yaml

Makefile

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

charts/typesense-operator/Chart.yaml

@@ -13,9 +13,9 @@ 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.2.7
+version: 0.2.8
 # 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.2.7"
+appVersion: "0.2.8"

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

@@ -56,6 +56,24 @@ spec:
           spec:
             description: TypesenseClusterSpec defines the desired state of TypesenseCluster
             properties:
+              additionalServerConfiguration:
+                description: |-
+                  LocalObjectReference contains enough information to let you locate the
+                  referenced object inside the same namespace.
+                properties:
+                  name:
+                    default: ""
+                    description: |-
+                      Name of the referent.
+                      This field is effectively required, but due to backwards compatibility is
+                      allowed to be empty. Instances of this type with an empty value here are
+                      almost certainly wrong.
+                      TODO: Add other useful fields. apiVersion, kind, uid?
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                      TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
               adminApiKey:
                 description: |-
                   SecretReference represents a Secret Reference. It has enough information to retrieve secret
@@ -79,6 +97,9 @@ spec:
                 type: integer
               corsDomains:
                 type: string
+              enableCors:
+                default: false
+                type: boolean
               image:
                 type: string
               ingress:
@@ -102,6 +123,10 @@ spec:
                 - host
                 - ingressClassName
                 type: object
+              nodeSelector:
+                additionalProperties:
+                  type: string
+                type: object
               peeringPort:
                 default: 8107
                 exclusiveMinimum: true
@@ -116,6 +141,61 @@ spec:
               resetPeersOnError:
                 default: true
                 type: boolean
+              resources:
+                description: ResourceRequirements describes the compute resource requirements.
+                properties:
+                  claims:
+                    description: |-
+                      Claims lists the names of resources, defined in spec.resourceClaims,
+                      that are used by this container.
+  
+  
+                      This is an alpha field and requires enabling the
+                      DynamicResourceAllocation feature gate.
+  
+  
+                      This field is immutable. It can only be set for containers.
+                    items:
+                      description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                      properties:
+                        name:
+                          description: |-
+                            Name must match the name of one entry in pod.spec.resourceClaims of
+                            the Pod where this field is used. It makes that resource available
+                            inside a container.
+                          type: string
+                      required:
+                      - name
+                      type: object
+                    type: array
+                    x-kubernetes-list-map-keys:
+                    - name
+                    x-kubernetes-list-type: map
+                  limits:
+                    additionalProperties:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                      x-kubernetes-int-or-string: true
+                    description: |-
+                      Limits describes the maximum amount of compute resources allowed.
+                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                    type: object
+                  requests:
+                    additionalProperties:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                      x-kubernetes-int-or-string: true
+                    description: |-
+                      Requests describes the minimum amount of compute resources required.
+                      If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                      otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                    type: object
+                type: object
               scrapers:
                 items:
                   properties:
@@ -149,6 +229,44 @@ spec:
                 required:
                 - storageClassName
                 type: object
+              tolerations:
+                items:
+                  description: |-
+                    The pod this Toleration is attached to tolerates any taint that matches
+                    the triple <key,value,effect> using the matching operator <operator>.
+                  properties:
+                    effect:
+                      description: |-
+                        Effect indicates the taint effect to match. Empty means match all taint effects.
+                        When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
+                      type: string
+                    key:
+                      description: |-
+                        Key is the taint key that the toleration applies to. Empty means match all taint keys.
+                        If the key is empty, operator must be Exists; this combination means to match all values and all keys.
+                      type: string
+                    operator:
+                      description: |-
+                        Operator represents a key's relationship to the value.
+                        Valid operators are Exists and Equal. Defaults to Equal.
+                        Exists is equivalent to wildcard for value, so that a pod can
+                        tolerate all taints of a particular category.
+                      type: string
+                    tolerationSeconds:
+                      description: |-
+                        TolerationSeconds represents the period of time the toleration (which must be
+                        of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default,
+                        it is not set, which means tolerate the taint forever (do not evict). Zero and
+                        negative values will be treated as 0 (evict immediately) by the system.
+                      format: int64
+                      type: integer
+                    value:
+                      description: |-
+                        Value is the taint value the toleration matches to.
+                        If the operator is Exists, the value should be empty, otherwise just a regular string.
+                      type: string
+                  type: object
+                type: array
             required:
             - image
             - storage

charts/typesense-operator/values.yaml

@@ -12,7 +12,7 @@ controllerManager:
         - ALL
     image:
       repository: akyriako78/typesense-operator
-      tag: 0.2.7
+      tag: 0.2.8
     resources:
       limits:
         cpu: 500m

config/manager/kustomization.yaml

@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: akyriako78/typesense-operator
-  newTag: 0.2.7-dev.1
+  newTag: 0.2.8

config/samples/ts_v1alpha1_typesensecluster_kind.yaml

@@ -7,6 +7,17 @@ reclaimPolicy: Delete
 allowVolumeExpansion: false
 volumeBindingMode: WaitForFirstConsumer
 ---
+apiVersion: v1
+kind: Secret
+metadata:
+  labels:
+    app.kubernetes.io/name: typesense-operator
+    app.kubernetes.io/managed-by: kustomize
+  name: typesense-common-bootstrap-key
+type: Opaque
+data:
+  typesense-api-key: SXdpVG9CcnFYTHZYeTJNMG1TS1hPaGt0dlFUY3VWUloxc1M5REtsRUNtMFFwQU93R1hoanVIVWJLQnE2ejdlSQ==
+---
 apiVersion: ts.opentelekomcloud.com/v1alpha1
 kind: TypesenseCluster
 metadata:
@@ -20,6 +31,8 @@ spec:
   storage:
     size: 10Mi
     storageClassName: typesense-local-path
+  adminApiKey:
+    name: typesense-common-bootstrap-key
   ingress:
     referer: referer.example.com
     host: host.example.com
@@ -32,7 +45,6 @@ metadata:
   name: c-kind-2-config
 data:
   TYPESENSE_ENABLE_SEARCH_ANALYTICS: "true"
-  TYPESENSE_ENABLE_CORS: "true"
 ---
 apiVersion: ts.opentelekomcloud.com/v1alpha1
 kind: TypesenseCluster

internal/controller/typesensecluster_configmap.go

@@ -7,6 +7,7 @@ import (
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/utils/ptr"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"strings"
@@ -25,6 +26,7 @@ func (r *TypesenseClusterReconciler) ReconcileConfigMap(ctx context.Context, ts
 			configMapExists = false
 		} else {
 			r.logger.Error(err, fmt.Sprintf("unable to fetch config map: %s", configMapName))
+			return ptr.To[bool](false), err
 		}
 	}
 

internal/controller/typesensecluster_constants.go

@@ -4,15 +4,18 @@ const (
 	ClusterNodesConfigMap           = "%s-nodeslist"
 	ClusterAdminApiKeySecret        = "%s-admin-key"
 	ClusterAdminApiKeySecretKeyName = "typesense-api-key"
-	ClusterHeadlessService          = "%s-sts-svc"
-	ClusterRestService              = "%s-svc"
-	ClusterStatefulSet              = "%s-sts"
-	ClusterAppLabel                 = "%s-sts"
-	ClusterReverseProxyAppLabel     = "%s-rp"
-	ClusterReverseProxyIngress      = "%s-reverse-proxy"
-	ClusterReverseProxyConfigMap    = "%s-reverse-proxy-config"
-	ClusterReverseProxy             = "%s-reverse-proxy"
-	ClusterReverseProxyService      = "%s-reverse-proxy-svc"
-	ClusterScraperCronJob           = "%s-scraper"
-	ClusterScraperCronJobContainer  = "%s-docsearch-scraper"
+
+	ClusterHeadlessService = "%s-sts-svc"
+	ClusterRestService     = "%s-svc"
+	ClusterStatefulSet     = "%s-sts"
+	ClusterAppLabel        = "%s-sts"
+
+	ClusterReverseProxyAppLabel  = "%s-rp"
+	ClusterReverseProxyIngress   = "%s-reverse-proxy"
+	ClusterReverseProxyConfigMap = "%s-reverse-proxy-config"
+	ClusterReverseProxy          = "%s-reverse-proxy"
+	ClusterReverseProxyService   = "%s-reverse-proxy-svc"
+
+	ClusterScraperCronJob          = "%s-scraper"
+	ClusterScraperCronJobContainer = "%s-docsearch-scraper"
 )

internal/controller/typesensecluster_ingress.go

@@ -50,6 +50,7 @@ func (r *TypesenseClusterReconciler) ReconcileIngress(ctx context.Context, ts ts
 			ingressExists = false
 		} else {
 			r.logger.Error(err, fmt.Sprintf("unable to fetch ingress: %s", ingressName))
+			return err
 		}
 	}