Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions charts/typesense-operator/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ If release name contains chart name it will be used as a full name.
{{- end }}
{{- end }}

{{/*
Allow the release namespace to be overridden for multi-namespace deployments in combined charts.
*/}}
{{- define "typesense-operator.namespace" -}}
{{- default .Release.Namespace .Values.namespaceOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}

{{/*
Create chart name and version as used by the chart label.
*/}}
Expand Down
3 changes: 2 additions & 1 deletion charts/typesense-operator/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "typesense-operator.fullname" . }}-controller-manager
namespace: {{ include "typesense-operator.namespace" . | quote }}
labels:
control-plane: controller-manager
{{- include "typesense-operator.labels" . | nindent 4 }}
Expand Down Expand Up @@ -49,4 +50,4 @@ spec:
securityContext: {{- toYaml .Values.controllerManager.podSecurityContext | nindent
8 }}
serviceAccountName: {{ include "typesense-operator.fullname" . }}-controller-manager
terminationGracePeriodSeconds: 10
terminationGracePeriodSeconds: 10
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: {{ include "typesense-operator.fullname" . }}-leader-election-role
namespace: {{ include "typesense-operator.namespace" . | quote }}
labels:
{{- include "typesense-operator.labels" . | nindent 4 }}
rules:
Expand Down Expand Up @@ -50,4 +51,4 @@ roleRef:
subjects:
- kind: ServiceAccount
name: '{{ include "typesense-operator.fullname" . }}-controller-manager'
namespace: '{{ .Release.Namespace }}'
namespace: {{ include "typesense-operator.namespace" . | quote }}
3 changes: 2 additions & 1 deletion charts/typesense-operator/templates/manager-rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: {{ include "typesense-operator.fullname" . }}-manager-role
namespace: {{ include "typesense-operator.namespace" . | quote }}
labels:
{{- include "typesense-operator.labels" . | nindent 4 }}
rules:
Expand Down Expand Up @@ -179,4 +180,4 @@ roleRef:
subjects:
- kind: ServiceAccount
name: '{{ include "typesense-operator.fullname" . }}-controller-manager'
namespace: '{{ .Release.Namespace }}'
namespace: {{ include "typesense-operator.namespace" . | quote }}
3 changes: 2 additions & 1 deletion charts/typesense-operator/templates/metrics-auth-rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: {{ include "typesense-operator.fullname" . }}-metrics-auth-role
namespace: {{ include "typesense-operator.namespace" . | quote }}
labels:
{{- include "typesense-operator.labels" . | nindent 4 }}
rules:
Expand Down Expand Up @@ -31,4 +32,4 @@ roleRef:
subjects:
- kind: ServiceAccount
name: '{{ include "typesense-operator.fullname" . }}-controller-manager'
namespace: '{{ .Release.Namespace }}'
namespace: {{ include "typesense-operator.namespace" . | quote }}
3 changes: 2 additions & 1 deletion charts/typesense-operator/templates/metrics-reader-rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: {{ include "typesense-operator.fullname" . }}-metrics-reader
namespace: {{ include "typesense-operator.namespace" . | quote }}
labels:
{{- include "typesense-operator.labels" . | nindent 4 }}
rules:
- nonResourceURLs:
- /metrics
verbs:
- get
- get
3 changes: 2 additions & 1 deletion charts/typesense-operator/templates/metrics-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ include "typesense-operator.fullname" . }}-controller-manager-metrics-service
namespace: {{ include "typesense-operator.namespace" . | quote }}
labels:
control-plane: controller-manager
{{- include "typesense-operator.labels" . | nindent 4 }}
Expand All @@ -11,4 +12,4 @@ spec:
control-plane: controller-manager
{{- include "typesense-operator.selectorLabels" . | nindent 4 }}
ports:
{{- .Values.metricsService.ports | toYaml | nindent 2 }}
{{- .Values.metricsService.ports | toYaml | nindent 2 }}
3 changes: 2 additions & 1 deletion charts/typesense-operator/templates/serviceaccount.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "typesense-operator.fullname" . }}-controller-manager
namespace: {{ include "typesense-operator.namespace" . | quote }}
labels:
{{- include "typesense-operator.labels" . | nindent 4 }}
annotations:
{{- toYaml .Values.controllerManager.serviceAccount.annotations | nindent 4 }}
{{- toYaml .Values.controllerManager.serviceAccount.annotations | nindent 4 }}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: {{ include "typesense-operator.fullname" . }}-typesensecluster-editor-role
namespace: {{ include "typesense-operator.namespace" . | quote }}
labels:
{{- include "typesense-operator.labels" . | nindent 4 }}
rules:
Expand All @@ -22,4 +23,4 @@ rules:
resources:
- typesenseclusters/status
verbs:
- get
- get
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: {{ include "typesense-operator.fullname" . }}-typesensecluster-viewer-role
namespace: {{ include "typesense-operator.namespace" . | quote }}
labels:
{{- include "typesense-operator.labels" . | nindent 4 }}
rules:
Expand All @@ -18,4 +19,4 @@ rules:
resources:
- typesenseclusters/status
verbs:
- get
- get
2 changes: 2 additions & 0 deletions charts/typesense-operator/values.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
namespaceOverride: ""

controllerManager:
manager:
args:
Expand Down
3 changes: 2 additions & 1 deletion internal/controller/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import (
"crypto/rand"
"encoding/base64"
"fmt"
"sort"

tsv1alpha1 "github.com/akyriako/typesense-operator/api/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sort"
)

const (
Expand Down