fix: single endpoint for vm (#299)

immich-app · Dec 6, 2024 · ae64d32 · ae64d32
1 parent 0c802ed
commit ae64d32
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 76 deletions.
diff --git a/kubernetes/apps/monitoring-dev/victoria-metrics/ingress/ingress.yaml b/kubernetes/apps/monitoring-dev/victoria-metrics/ingress/ingress.yaml
@@ -0,0 +1,17 @@
+apiVersion: operator.victoriametrics.com/v1beta1
+kind: VMAuth
+metadata:
+  name: vmetrics-ingress
+  namespace: monitoring-dev
+spec:
+  userSelector: {}
+  userNamespaceSelector: {}
+  selectAllByDefault: true
+  ingress:
+    tlsSecretName: vmetrics-tls
+    annotations:
+      cert-manager.io/cluster-issuer: letsencrypt-production
+    class_name: nginx
+    tlsHosts:
+      - api.monitoring.dev.immich.cloud
+      - cf-workers.monitoring.dev.immich.cloud
diff --git a/kubernetes/apps/monitoring-dev/victoria-metrics/ingress/kustomization.yaml b/kubernetes/apps/monitoring-dev/victoria-metrics/ingress/kustomization.yaml
@@ -2,5 +2,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
+  - ./ingress.yaml
   - ./write.yaml
   - ./read.yaml
diff --git a/kubernetes/apps/monitoring-dev/victoria-metrics/ingress/read.yaml b/kubernetes/apps/monitoring-dev/victoria-metrics/ingress/read.yaml
@@ -11,8 +11,6 @@ kind: VMUser
 metadata:
   name: read
   namespace: monitoring-dev
-  labels:
-    vm-user: "read"
 spec:
   tokenRef:
     name: vmetrics-read-token
@@ -23,20 +21,3 @@ spec:
         name: vmetrics-dev
         namespace: monitoring-dev
       paths: ["/api/v1/query","/api/v1/query_range","/api/v1/series","/api/v1/labels"]
----
-apiVersion: operator.victoriametrics.com/v1beta1
-kind: VMAuth
-metadata:
-  name: vmetrics-read-ingress
-  namespace: monitoring-dev
-spec:
-  userSelector:
-    matchLabels:
-      vm-user: "read"
-  ingress:
-    tlsSecretName: vmetrics-read-tls
-    annotations:
-      cert-manager.io/cluster-issuer: letsencrypt-production
-    class_name: nginx
-    tlsHosts:
-      - read.monitoring.dev.immich.cloud
diff --git a/kubernetes/apps/monitoring-dev/victoria-metrics/ingress/write.yaml b/kubernetes/apps/monitoring-dev/victoria-metrics/ingress/write.yaml
@@ -11,8 +11,6 @@ kind: VMUser
 metadata:
   name: write
   namespace: monitoring-dev
-  labels:
-    vm-user: "write"
 spec:
   tokenRef:
     name: vmetrics-write-token
@@ -23,21 +21,3 @@ spec:
         name: vmetrics-dev
         namespace: monitoring-dev
       paths: ["/write"]
----
-apiVersion: operator.victoriametrics.com/v1beta1
-kind: VMAuth
-metadata:
-  name: vmetrics-write-ingress
-  namespace: monitoring-dev
-spec:
-  userSelector:
-    matchLabels:
-      vm-user: "write"
-  ingress:
-    tlsSecretName: vmetrics-write-tls
-    annotations:
-      cert-manager.io/cluster-issuer: letsencrypt-production
-    class_name: nginx
-    tlsHosts:
-      - write.monitoring.dev.immich.cloud
-      - cf-workers.monitoring.dev.immich.cloud
diff --git a/kubernetes/apps/monitoring/victoria-metrics/ingress/ingress.yaml b/kubernetes/apps/monitoring/victoria-metrics/ingress/ingress.yaml
@@ -0,0 +1,17 @@
+apiVersion: operator.victoriametrics.com/v1beta1
+kind: VMAuth
+metadata:
+  name: vmetrics-ingress
+  namespace: monitoring
+spec:
+  userSelector: {}
+  userNamespaceSelector: {}
+  selectAllByDefault: true
+  ingress:
+    tlsSecretName: vmetrics-tls
+    annotations:
+      cert-manager.io/cluster-issuer: letsencrypt-production
+    class_name: nginx
+    tlsHosts:
+      - api.monitoring.immich.cloud
+      - cf-workers.monitoring.immich.cloud
diff --git a/kubernetes/apps/monitoring/victoria-metrics/ingress/kustomization.yaml b/kubernetes/apps/monitoring/victoria-metrics/ingress/kustomization.yaml
@@ -2,5 +2,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
+  - ./ingress.yaml
   - ./write.yaml
   - ./read.yaml
diff --git a/kubernetes/apps/monitoring/victoria-metrics/ingress/read.yaml b/kubernetes/apps/monitoring/victoria-metrics/ingress/read.yaml
@@ -11,8 +11,6 @@ kind: VMUser
 metadata:
   name: read
   namespace: monitoring
-  labels:
-    vm-user: "read"
 spec:
   tokenRef:
     name: vmetrics-read-token
@@ -23,20 +21,4 @@ spec:
         name: vmetrics
         namespace: monitoring
       paths: ["/api/v1/query","/api/v1/query_range","/api/v1/series","/api/v1/labels"]
----
-apiVersion: operator.victoriametrics.com/v1beta1
-kind: VMAuth
-metadata:
-  name: vmetrics-read-ingress
-  namespace: monitoring
-spec:
-  userSelector:
-    matchLabels:
-      vm-user: "read"
-  ingress:
-    tlsSecretName: vmetrics-read-tls
-    annotations:
-      cert-manager.io/cluster-issuer: letsencrypt-production
-    class_name: nginx
-    tlsHosts:
-      - read.monitoring.immich.cloud
+
diff --git a/kubernetes/apps/monitoring/victoria-metrics/ingress/write.yaml b/kubernetes/apps/monitoring/victoria-metrics/ingress/write.yaml
@@ -23,21 +23,3 @@ spec:
         name: vmetrics
         namespace: monitoring
       paths: ["/write"]
----
-apiVersion: operator.victoriametrics.com/v1beta1
-kind: VMAuth
-metadata:
-  name: vmetrics-write-ingress
-  namespace: monitoring
-spec:
-  userSelector:
-    matchLabels:
-      vm-user: "write"
-  ingress:
-    tlsSecretName: vmetrics-write-tls
-    annotations:
-      cert-manager.io/cluster-issuer: letsencrypt-production
-    class_name: nginx
-    tlsHosts:
-      - write.monitoring.immich.cloud
-      - cf-workers.monitoring.immich.cloud