Обновить k8s/namespaces/minio/ingress.yaml

apps/ingress-private.yaml

@@ -22,9 +22,5 @@ spec:
     automated:
       prune: true
       selfHeal: true
-  ignoreDifferences:
+    syncOptions:
-    - group: ""
+      - HealthAssessmentRule=ignore
-      kind: Service
-      name: ingress-private-ingress-nginx-controller
-      jsonPointers:
-        - /status/loadBalancer

apps/rancher.yaml

@@ -0,0 +1,24 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: rancher
+  namespace: argocd
+spec:
+  project: default
+  sources:
+    - repoURL: https://releases.rancher.com/server-charts/stable
+      chart: rancher
+      targetRevision: "2.14.2"
+      helm:
+        valueFiles:
+          - $values/helm/rancher/values.yaml
+    - repoURL: http://gitea-http.gitea.svc.cluster.local:3000/admin/k8s-manifests
+      targetRevision: HEAD
+      ref: values
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: cattle-system
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true

helm/rancher/values.yaml

@@ -1,2 +1,7 @@
-bootstrapPassword: CHANGEME
 hostname: rancher.uzbutterfly.com
+bootstrapPassword: ""
+ingress:
+  ingressClassName: nginx
+  tls:
+    source: secret
+    secretName: rancher-tls

k8s/external-secrets/rancher.yaml

@@ -0,0 +1,18 @@
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: rancher-secret
+  namespace: cattle-system
+spec:
+  refreshInterval: 1h
+  secretStoreRef:
+    name: vault-backend
+    kind: ClusterSecretStore
+  target:
+    name: rancher-bootstrap-secret
+    creationPolicy: Owner
+  data:
+    - secretKey: bootstrapPassword
+      remoteRef:
+        key: secret/rancher
+        property: bootstrapPassword

k8s/namespaces/minio/ingress.yaml

@@ -8,7 +8,7 @@ items:
     name: minio-ingress
     namespace: minio
   spec:
-    ingressClassName: nginx-private
+    ingressClassName: nginx
     rules:
     - host: minio.uzbutterfly.com
       http:

k8s/namespaces/monitoring/grafana-ingress.yaml

@@ -6,7 +6,7 @@ metadata:
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-prod
 spec:
-  ingressClassName: nginx-private
+  ingressClassName: nginx
   rules:
   - host: grafana.uzbutterfly.com
     http:

k8s/namespaces/vault/ingress.yaml

@@ -8,7 +8,7 @@ items:
     name: vault-ingress
     namespace: vault
   spec:
-    ingressClassName: nginx-private
+    ingressClassName: nginx
     rules:
     - host: vault.uzbutterfly.com
       http: