diff --git a/charts/kof-mothership/templates/promxy/operator-deployment.yaml b/charts/kof-mothership/templates/promxy/operator-deployment.yaml new file mode 100644 index 0000000..05efdb1 --- /dev/null +++ b/charts/kof-mothership/templates/promxy/operator-deployment.yaml @@ -0,0 +1,84 @@ +{{- if .Values.promxy.enabled }} +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "chart.fullname" . }}-promxy-operator + namespace: {{ .Release.Namespace }} + labels: + {{- include "chart.labels" . | nindent 4 }} + {{- if .Values.promxy.operator.extraLabels}} + {{ toYaml .Values.promxy.operator.extraLabels | nindent 4 }} + {{- end}} + {{- with .Values.promxy.operator.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.promxy.operator.replicaCount }} + {{- if (.Values.promxy.operator.deployment | default dict).strategy }} + strategy: + {{- toYaml .Values.promxy.operator.deployment.strategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + app.kubernetes.io/name: {{ include "chart.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }}-operator + template: + metadata: + labels: + app.kubernetes.io/name: {{ include "chart.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }}-operator + {{- if .Values.promxy.operator.extraLabels}} + {{ toYaml .Values.promxy.operator.extraLabels | nindent 8 }} + {{- end}} + spec: + {{- with .Values.promxy.operator.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "chart.serviceAccountName" . }} + {{- if .Values.promxy.operator.nodeSelector }} + nodeSelector: +{{ toYaml .Values.promxy.operator.nodeSelector | indent 8 }} + {{- end }} + {{- with .Values.promxy.operator.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- if .Values.promxy.operator.affinity }} + affinity: +{{ toYaml .Values.promxy.operator.affinity | indent 8 }} + {{- end }} + containers: + - name: operator + command: + - "/manager" + env: + - name: "PROMXY_RELOAD_ENDPOINT" + value: "http://{{ .Release.Name }}-promxy:{{ .Values.promxy.service.servicePort }}/-/reload" + image: "{{ .Values.promxy.operator.image.repository }}:{{ .Values.promxy.operator.image.tag }}" + imagePullPolicy: {{ .Values.promxy.operator.image.pullPolicy }} + livenessProbe: + failureThreshold: 6 + httpGet: + path: /healthz + port: http + scheme: HTTP + periodSeconds: 5 + successThreshold: 1 + timeoutSeconds: 3 + readinessProbe: + failureThreshold: 120 + httpGet: + path: /readyz + port: http + scheme: HTTP + periodSeconds: 5 + successThreshold: 1 + timeoutSeconds: 3 + ports: + - containerPort: 8081 + name: http + resources: + {{- toYaml .Values.promxy.operator.resources | nindent 12 }} +{{- end }} diff --git a/charts/kof-mothership/templates/promxy/deployment.yaml b/charts/kof-mothership/templates/promxy/promxy-deployment.yaml similarity index 80% rename from charts/kof-mothership/templates/promxy/deployment.yaml rename to charts/kof-mothership/templates/promxy/promxy-deployment.yaml index ba866e5..65d9557 100644 --- a/charts/kof-mothership/templates/promxy/deployment.yaml +++ b/charts/kof-mothership/templates/promxy/promxy-deployment.yaml @@ -52,34 +52,6 @@ spec: {{ toYaml .Values.promxy.affinity | indent 8 }} {{- end }} containers: - - name: operator - command: - - "/manager" - image: "{{ .Values.promxy.operator.image.repository }}:{{ .Values.promxy.operator.image.tag }}" - imagePullPolicy: {{ .Values.promxy.operator.image.pullPolicy }} - livenessProbe: - failureThreshold: 6 - httpGet: - path: /healthz - port: operator-http - scheme: HTTP - periodSeconds: 5 - successThreshold: 1 - timeoutSeconds: 3 - readinessProbe: - failureThreshold: 120 - httpGet: - path: /readyz - port: operator-http - scheme: HTTP - periodSeconds: 5 - successThreshold: 1 - timeoutSeconds: 3 - ports: - - containerPort: 8081 - name: operator-http - resources: - {{- toYaml .Values.promxy.operator.resources | nindent 12 }} - name: promxy args: - "--config=/etc/promxy/config.yaml" diff --git a/charts/kof-mothership/templates/promxy/secret.yaml b/charts/kof-mothership/templates/promxy/secret.yaml deleted file mode 100644 index c63b369..0000000 --- a/charts/kof-mothership/templates/promxy/secret.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "chart.secretname" . }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "chart.labels" . | nindent 4 }} -stringData: - config.yaml: | - global: - evaluation_interval: 5s - external_labels: - source: promxy - remote_write: - - url: {{ .Values.promxy.config.remoteWriteUrl | default | quote }} - promxy: - server_groups: [] diff --git a/promxy-operator/cmd/main.go b/promxy-operator/cmd/main.go index 72a7304..bfa3191 100644 --- a/promxy-operator/cmd/main.go +++ b/promxy-operator/cmd/main.go @@ -79,6 +79,10 @@ func main() { opts.BindFlags(flag.CommandLine) flag.Parse() + if endpoint, ok := os.LookupEnv("PROMXY_RELOAD_ENDPOINT"); ok { + promxyReloadEnpoint = endpoint + } + ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts))) // if the enable-http2 flag is false (the default), http/2 should be disabled