Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(emqx): update database and init user scripts #3863

Merged
merged 1 commit into from
Dec 19, 2024
Merged
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
25 changes: 21 additions & 4 deletions kubernetes/apps/database/emqx/app/externalsecret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,27 @@ spec:
data:
EMQX_DASHBOARD__DEFAULT_USERNAME: "{{ .EMQX_DASHBOARD__DEFAULT_USERNAME }}"
EMQX_DASHBOARD__DEFAULT_PASSWORD: "{{ .EMQX_DASHBOARD__DEFAULT_PASSWORD }}"
X_EMQX_MQTT_USERNAME: "{{ .X_EMQX_MQTT_USERNAME }}"
X_EMQX_MQTT_PASSWORD: "{{ .X_EMQX_MQTT_PASSWORD }}"
X_EMQX_APIKEY_KEY: "{{ .X_EMQX_APIKEY_KEY }}"
X_EMQX_APIKEY_SECRET: "{{ .X_EMQX_APIKEY_SECRET }}"
dataFrom:
- extract:
key: emqx
---
# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/external-secrets.io/externalsecret_v1beta1.json
apiVersion: external-secrets.io/v1beta1
kind: ExternalSecret
metadata:
name: emqx-init-user
spec:
refreshInterval: 5m
secretStoreRef:
kind: ClusterSecretStore
name: onepassword-connect
target:
name: emqx-init-user-secret
template:
engineVersion: v2
data:
init-user.json: |
[{"user_id": "{{ .X_EMQX_MQTT_USERNAME }}", "password": "{{ .X_EMQX_MQTT_PASSWORD }}", "is_superuser": true}]
dataFrom:
- extract:
key: emqx
1 change: 1 addition & 0 deletions kubernetes/apps/database/emqx/app/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@ spec:
namespace: cert-manager
values:
fullnameOverride: emqx-operator
replicaCount: 2
image:
repository: ghcr.io/emqx/emqx-operator
37 changes: 12 additions & 25 deletions kubernetes/apps/database/emqx/cluster/cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ spec:
backend = "built_in_database"
mechanism = "password_based"
password_hash_algorithm {
name = "bcrypt",
name = "bcrypt"
}
user_id_type = "username"
bootstrap_file = "/opt/init-user.json"
bootstrap_type = "plain"
}
authorization {
sources = [
Expand All @@ -25,39 +27,24 @@ spec:
]
no_match: "deny"
}
bootstrapAPIKeys:
- secretRef:
key:
secretName: emqx-secret
secretKey: X_EMQX_APIKEY_KEY
secret:
secretName: emqx-secret
secretKey: X_EMQX_APIKEY_SECRET
coreTemplate:
metadata:
annotations:
reloader.stakater.com/auto: "true"
spec:
replicas: 3
envFrom: &envFrom
envFrom:
- secretRef:
name: emqx-secret
extraContainers:
- name: init-mqtt
image: docker.io/library/python:3.13-alpine
env:
- name: X_EMQX_ADDRESS
value: emqx-dashboard.database.svc.cluster.local:18083
envFrom: *envFrom
command: ["python", "/init-mqtt.py"]
volumeMounts:
- name: init-mqtt
mountPath: /init-mqtt.py
subPath: init-mqtt.py
extraVolumeMounts:
- name: init-user
mountPath: /opt/init-user.json
subPath: init-user.json
readOnly: true
extraVolumes:
- name: init-mqtt
configMap:
name: emqx-init-mqtt-configmap
- name: init-user
secret:
secretName: emqx-init-user-secret
listenersServiceTemplate:
metadata:
annotations:
Expand Down
6 changes: 0 additions & 6 deletions kubernetes/apps/database/emqx/cluster/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,3 @@ resources:
- ./cluster.yaml
- ./ingress.yaml
- ./podmonitor.yaml
configMapGenerator:
- name: emqx-init-mqtt-configmap
files:
- init-mqtt.py=./resources/init-mqtt.py
generatorOptions:
disableNameSuffixHash: true
78 changes: 0 additions & 78 deletions kubernetes/apps/database/emqx/cluster/resources/init-mqtt.py

This file was deleted.

25 changes: 0 additions & 25 deletions kubernetes/apps/database/emqx/exporter/externalsecret.yaml

This file was deleted.

111 changes: 0 additions & 111 deletions kubernetes/apps/database/emqx/exporter/helmrelease.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions kubernetes/apps/database/emqx/exporter/kustomization.yaml

This file was deleted.

24 changes: 0 additions & 24 deletions kubernetes/apps/database/emqx/ks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,27 +42,3 @@ spec:
wait: true
interval: 30m
timeout: 5m
# ---
# # yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
# apiVersion: kustomize.toolkit.fluxcd.io/v1
# kind: Kustomization
# metadata:
# name: &app emqx-exporter
# namespace: flux-system
# spec:
# targetNamespace: database
# commonMetadata:
# labels:
# app.kubernetes.io/name: *app
# dependsOn:
# - name: emqx-cluster
# - name: external-secrets-stores
# path: ./kubernetes/main/apps/database/emqx/exporter
# prune: true
# sourceRef:
# kind: GitRepository
# name: home-kubernetes
# wait: false
# interval: 30m
#
# timeout: 5m
Loading