diff --git a/kustomize/bases/nextcloud/nextcloud-deployment.yaml b/kustomize/bases/nextcloud/nextcloud-deployment.yaml index 55630ad..6aca935 100644 --- a/kustomize/bases/nextcloud/nextcloud-deployment.yaml +++ b/kustomize/bases/nextcloud/nextcloud-deployment.yaml @@ -67,10 +67,10 @@ spec: resources: requests: cpu: 1500m - memory: 1.5Gi + memory: 1Gi limits: cpu: 2000m - memory: 2Gi + memory: 1.5Gi volumeMounts: - name: nextcloud-pv mountPath: /var/www/html diff --git a/kustomize/bases/prometheus/servicemonitors/kubelet.yaml b/kustomize/bases/prometheus/servicemonitors/kubelet.yaml index e1711dc..f4247ff 100644 --- a/kustomize/bases/prometheus/servicemonitors/kubelet.yaml +++ b/kustomize/bases/prometheus/servicemonitors/kubelet.yaml @@ -16,7 +16,7 @@ spec: scheme: https path: /metrics honorLabels: true - interval: 60s + interval: 30s bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token tlsConfig: caFile: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt @@ -25,8 +25,8 @@ spec: scheme: https path: /metrics/cadvisor honorLabels: true - interval: 60s + interval: 10s bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token tlsConfig: caFile: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt - insecureSkipVerify: true \ No newline at end of file + insecureSkipVerify: true diff --git a/kustomize/overlays/dev/kustomization.yaml b/kustomize/overlays/dev/kustomization.yaml index 77b2471..e1151c8 100644 --- a/kustomize/overlays/dev/kustomization.yaml +++ b/kustomize/overlays/dev/kustomization.yaml @@ -17,7 +17,8 @@ images: - name: drone/drone-runner-kube newTag: 1.0.0-beta.9 - name: nextcloud - newTag: 22.1.0 + newName: badjware/nextcloud-tweak + newTag: 22.1.0-2 - name: postgres newTag: 9.6.23 - name: redis @@ -30,6 +31,7 @@ secretGenerator: behavior: replace literals: - rpc_secret=9128146e66f104873df80dad3ef12cf0 + - database_secret=a5dbfbc0577505041759fcf6f87598bf # https://docs.drone.io/server/provider/gitea/ - name: drone-gitea-oauth-secret type: Opaque diff --git a/kustomize/overlays/prod-cluster/kustomization.yaml b/kustomize/overlays/prod-cluster/kustomization.yaml index 63fb3af..83b61ab 100644 --- a/kustomize/overlays/prod-cluster/kustomization.yaml +++ b/kustomize/overlays/prod-cluster/kustomization.yaml @@ -2,7 +2,6 @@ bases: - ../../namespaces/kube-system - ../../namespaces/operators - ../../bases/longhorn - # - ../../namespaces/cert-manager # allow "kubectl apply -l managed-by=cluster --prune ..." commonlabels: