From 2948aa83dca1998b5568e753ed30e7f322d3aa90 Mon Sep 17 00:00:00 2001 From: Arthur Date: Fri, 29 Nov 2024 14:38:48 -0500 Subject: [PATCH 1/2] feat(Hardware): Tuning --- README.md | 6 +-- kubernetes/knative/base/knative-serving.yaml | 6 +-- .../loki-operator/base/kustomization.yaml | 1 + kubernetes/loki-operator/base/rbac.yaml | 26 ++++++++++ machineConfigs/desktop/home/arthur/.zshrc | 1 + main.bash | 48 +++++++++++++++++-- 6 files changed, 78 insertions(+), 10 deletions(-) create mode 100644 kubernetes/loki-operator/base/rbac.yaml diff --git a/README.md b/README.md index 3c8f9e0cb..e524a7a11 100644 --- a/README.md +++ b/README.md @@ -166,9 +166,9 @@ end | Machine | PPT | CPU Curve | GFX Curve | CPU Frequency | vMem | Memory Freq | | ------- | --- | --------- | --------- | ------------- | ---- | ----------- | -| kvm-1 | 40W | -25 | -30 | -500 | 1.35 | 3200 | -| kvm-2 | 40W | -25 | -30 | -500 | 1.35 | 3200 | -| kvm-3 | 40W | -25 | -30 | -500 | 1.35 | 3200 | +| kvm-1 | 35W | -25 | -30 | -750 | 1.35 | 3200 | +| kvm-2 | 35W | -25 | -30 | -750 | 1.35 | 3200 | +| kvm-3 | 35W | -25 | -30 | -750 | 1.35 | 3200 | **ZFS Storage:** diff --git a/kubernetes/knative/base/knative-serving.yaml b/kubernetes/knative/base/knative-serving.yaml index 003ea2072..cff20f0b2 100644 --- a/kubernetes/knative/base/knative-serving.yaml +++ b/kubernetes/knative/base/knative-serving.yaml @@ -38,7 +38,7 @@ spec: cpu: 100m memory: 256Mi requests: - cpu: 10m + cpu: 15m memory: 128Mi - name: activator resources: @@ -47,7 +47,7 @@ spec: cpu: 100m memory: 128Mi requests: - cpu: 5m + cpu: 20m memory: 64Mi - name: autoscaler resources: @@ -92,5 +92,5 @@ spec: cpu: 100m memory: 128Mi requests: - cpu: 5m + cpu: 20m memory: 64Mi diff --git a/kubernetes/loki-operator/base/kustomization.yaml b/kubernetes/loki-operator/base/kustomization.yaml index 08ebcca69..04dec306c 100644 --- a/kubernetes/loki-operator/base/kustomization.yaml +++ b/kubernetes/loki-operator/base/kustomization.yaml @@ -6,3 +6,4 @@ resources: - ./subscription.yaml - ./limit-range.yaml - ./installplan-approver.yaml + - ./rbac.yaml diff --git a/kubernetes/loki-operator/base/rbac.yaml b/kubernetes/loki-operator/base/rbac.yaml new file mode 100644 index 000000000..731128b2a --- /dev/null +++ b/kubernetes/loki-operator/base/rbac.yaml @@ -0,0 +1,26 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: loki-operator +rules: + - apiGroups: + - "policy" + resources: + - "poddisruptionbudgets" + verbs: + - "get" + - "list" + - "watch" +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: loki-operator +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: loki-operator +subjects: + - kind: ServiceAccount + name: loki-operator-controller-manager + namespace: loki-operator diff --git a/machineConfigs/desktop/home/arthur/.zshrc b/machineConfigs/desktop/home/arthur/.zshrc index bfd468312..e4c4690d7 100644 --- a/machineConfigs/desktop/home/arthur/.zshrc +++ b/machineConfigs/desktop/home/arthur/.zshrc @@ -291,4 +291,5 @@ alias l='ls -CF' alias kubectl=kubecolor alias k=kubecolor +source <(kubectl completion zsh) compdef kubecolor=kubectl diff --git a/main.bash b/main.bash index 14b1e09f9..dc5f37e19 100644 --- a/main.bash +++ b/main.bash @@ -129,6 +129,8 @@ stateful_workload_stop() { kubectl scale --replicas=0 -n photoprism statefulset/photoprism kubectl scale --replicas=0 -n prometheus statefulset/prometheus kubectl scale --replicas=0 -n prometheus statefulset/thanos-store-gateway + kubectl scale --replicas=0 -n prometheus statefulset/prometheus-truenas + kubectl scale --replicas=0 -n prometheus statefulset/thanos-truenas-store-gateway kubectl scale --replicas=0 -n uptime-kuma statefulset/uptime-kuma kubectl scale --replicas=0 -n vault statefulset/vault @@ -154,6 +156,7 @@ stateful_workload_stop() { kubectl patch postgresCluster photoprism -n postgres --type=merge -p '{"spec":{"shutdown":true}}' kubectl patch postgresCluster stackrox -n stackrox --type=merge -p '{"spec":{"shutdown":true}}' kubectl patch postgresCluster quay -n quay --type=merge -p '{"spec":{"shutdown":true}}' + kubectl patch postgresCluster awx -n awx --type=merge -p '{"spec":{"shutdown":true}}' kubectl scale --replicas=0 -n argocd deployment/argocd-operator-controller-manager kubectl scale --replicas=0 -n argocd statefulset/argocd-application-controller @@ -183,6 +186,40 @@ stateful_workload_stop() { kubectl scale --replicas=0 -n network-observability-loki deployment/netobserv-gateway kubectl scale --replicas=0 -n network-observability-loki deployment/netobserv-querier kubectl scale --replicas=0 -n network-observability-loki deployment/netobserv-query-frontend + + kubectl scale --replicas=0 -n awx deployment/awx-operator-controller-manager + kubectl scale --replicas=0 -n awx deployment/awx-task + kubectl scale --replicas=0 -n awx deployment/awx-web + + kubectl delete jobs -A --all + kubectl delete pipelineruns -A --all +} + +stateful_workload_start_pre() { + kubectl scale --replicas=1 -n cockroach-operator-system deployments/cockroach-operator-manager + kubectl scale --replicas=3 -n zitadel statefulset/crdb + + kubectl scale --replicas=1 -n mongodb-operator deployments/mongodb-kubernetes-operator + kubectl scale --replicas=3 -n unifi-network-application statefulset/mongo-unifi-network-application + + kubectl scale --replicas=1 -n influxdb statefulset/influxdb + kubectl scale --replicas=1 -n loki statefulset/loki + kubectl scale --replicas=3 -n mariadb-galera statefulset/mariadb-galera + kubectl scale --replicas=1 -n prometheus statefulset/prometheus + kubectl scale --replicas=1 -n prometheus statefulset/thanos-store-gateway + kubectl scale --replicas=1 -n quay deployment/quay-operator-tng + kubectl scale --replicas=1 -n postgres deployment/pgo + + kubectl patch postgresCluster clair -n quay --type=merge -p '{"spec":{"shutdown":false}}' + kubectl patch postgresCluster quay -n quay --type=merge -p '{"spec":{"shutdown":false}}' + kubectl patch postgresCluster homeassistant -n homeassistant --type=merge -p '{"spec":{"shutdown":false}}' + kubectl patch postgresCluster gitea -n gitea --type=merge -p '{"spec":{"shutdown":false}}' + kubectl patch postgresCluster grafana -n postgres --type=merge -p '{"spec":{"shutdown":false}}' + kubectl patch postgresCluster nextcloud -n nextcloud --type=merge -p '{"spec":{"shutdown":false}}' + kubectl patch postgresCluster photoprism -n postgres --type=merge -p '{"spec":{"shutdown":false}}' + kubectl patch postgresCluster stackrox -n stackrox --type=merge -p '{"spec":{"shutdown":false}}' + kubectl patch postgresCluster awx -n awx --type=merge -p '{"spec":{"shutdown":false}}' + } stateful_workload_start() { @@ -219,9 +256,10 @@ stateful_workload_start() { kubectl scale --replicas=1 -n photoprism statefulset/photoprism kubectl scale --replicas=1 -n prometheus statefulset/prometheus kubectl scale --replicas=1 -n prometheus statefulset/thanos-store-gateway + kubectl scale --replicas=1 -n prometheus statefulset/prometheus-truenas + kubectl scale --replicas=1 -n prometheus statefulset/thanos-truenas-store-gateway kubectl scale --replicas=1 -n uptime-kuma statefulset/uptime-kuma - kubectl scale --replicas=1 -n vault statefulset/vault - + kubectl scale --replicas=3 -n vault statefulset/vault #kubectl scale --replicas=1 -n minio-operator deployment/minio-operator kubectl scale --replicas=1 -n quay deployment/quay-operator-tng kubectl scale --replicas=2 -n quay deployment/quay-quay-app @@ -231,12 +269,13 @@ stateful_workload_start() { kubectl patch postgresCluster clair -n quay --type=merge -p '{"spec":{"shutdown":false}}' kubectl patch postgresCluster quay -n quay --type=merge -p '{"spec":{"shutdown":false}}' + kubectl patch postgresCluster homeassistant -n homeassistant --type=merge -p '{"spec":{"shutdown":false}}' kubectl patch postgresCluster gitea -n gitea --type=merge -p '{"spec":{"shutdown":false}}' kubectl patch postgresCluster grafana -n postgres --type=merge -p '{"spec":{"shutdown":false}}' - kubectl patch postgresCluster homeassistant -n homeassistant --type=merge -p '{"spec":{"shutdown":false}}' kubectl patch postgresCluster nextcloud -n nextcloud --type=merge -p '{"spec":{"shutdown":false}}' kubectl patch postgresCluster photoprism -n postgres --type=merge -p '{"spec":{"shutdown":false}}' kubectl patch postgresCluster stackrox -n stackrox --type=merge -p '{"spec":{"shutdown":false}}' + kubectl patch postgresCluster awx -n awx --type=merge -p '{"spec":{"shutdown":false}}' kubectl scale --replicas=1 -n argocd deployment/argocd-operator-controller-manager kubectl scale --replicas=1 -n argocd statefulset/argocd-application-controller @@ -254,8 +293,9 @@ stateful_workload_start() { kubectl scale --replicas=1 -n stackrox deployment/scanner-db kubectl scale --replicas=1 -n loki-operator deployment/loki-operator-controller-manager + kubectl scale --replicas=1 -n awx deployment/awx-operator-controller-manager - echo -e "\nkubectl exec -it vault-0 -n vault -- vault operator unseal --tls-skip-verify" + # echo -e "\nkubectl exec -it vault-0 -n vault -- vault operator unseal --tls-skip-verify" } kvm-infra() { From d2b09f03d376c4270b1c6152b8e00cdba2ab121a Mon Sep 17 00:00:00 2001 From: Arthur Date: Fri, 29 Nov 2024 19:44:58 +0000 Subject: [PATCH 2/2] feat(Tekton): Upgrade --- .../tekton/components/gosmee/deployment.yaml | 2 +- .../tekton/overlays/operator/operator.yaml | 88 +++++++++---------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/kubernetes/tekton/components/gosmee/deployment.yaml b/kubernetes/tekton/components/gosmee/deployment.yaml index 8932277cd..cb3b96d6a 100644 --- a/kubernetes/tekton/components/gosmee/deployment.yaml +++ b/kubernetes/tekton/components/gosmee/deployment.yaml @@ -23,7 +23,7 @@ spec: runAsNonRoot: true containers: - name: gosmeed - image: ghcr.io/chmouel/gosmee:v0.21.0@sha256:564bc28cbdf4e868066c4d9ea073fee919b54046e8144008b3a7a0e015b9b137 + image: ghcr.io/chmouel/gosmee:v0.22.1@sha256:ad2d9dd1c4538f063b9cbfd5a7c8628ff3eb5fe07ae4b0e738aaa3dd17c7cb51 imagePullPolicy: IfNotPresent args: - client diff --git a/kubernetes/tekton/overlays/operator/operator.yaml b/kubernetes/tekton/overlays/operator/operator.yaml index 7ae19dd74..9fc869d7f 100644 --- a/kubernetes/tekton/overlays/operator/operator.yaml +++ b/kubernetes/tekton/overlays/operator/operator.yaml @@ -2,8 +2,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: labels: - operator.tekton.dev/release: v0.73.1 - version: v0.73.1 + operator.tekton.dev/release: v0.74.0 + version: v0.74.0 name: manualapprovalgates.operator.tekton.dev spec: group: operator.tekton.dev @@ -42,8 +42,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: labels: - operator.tekton.dev/release: v0.73.1 - version: v0.73.1 + operator.tekton.dev/release: v0.74.0 + version: v0.74.0 name: openshiftpipelinesascodes.operator.tekton.dev spec: group: operator.tekton.dev @@ -83,8 +83,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: labels: - operator.tekton.dev/release: v0.73.1 - version: v0.73.1 + operator.tekton.dev/release: v0.74.0 + version: v0.74.0 name: tektonaddons.operator.tekton.dev spec: group: operator.tekton.dev @@ -121,8 +121,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: labels: - operator.tekton.dev/release: v0.73.1 - version: v0.73.1 + operator.tekton.dev/release: v0.74.0 + version: v0.74.0 name: tektonchains.operator.tekton.dev spec: group: operator.tekton.dev @@ -159,8 +159,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: labels: - operator.tekton.dev/release: v0.73.1 - version: v0.73.1 + operator.tekton.dev/release: v0.74.0 + version: v0.74.0 name: tektonconfigs.operator.tekton.dev spec: group: operator.tekton.dev @@ -197,8 +197,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: labels: - operator.tekton.dev/release: v0.73.1 - version: v0.73.1 + operator.tekton.dev/release: v0.74.0 + version: v0.74.0 name: tektonhubs.operator.tekton.dev spec: group: operator.tekton.dev @@ -241,8 +241,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: labels: - operator.tekton.dev/release: v0.73.1 - version: v0.73.1 + operator.tekton.dev/release: v0.74.0 + version: v0.74.0 name: tektoninstallersets.operator.tekton.dev spec: group: operator.tekton.dev @@ -276,8 +276,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: labels: - operator.tekton.dev/release: v0.73.1 - version: v0.73.1 + operator.tekton.dev/release: v0.74.0 + version: v0.74.0 name: tektonpipelines.operator.tekton.dev spec: group: operator.tekton.dev @@ -314,8 +314,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: labels: - operator.tekton.dev/release: v0.73.1 - version: v0.73.1 + operator.tekton.dev/release: v0.74.0 + version: v0.74.0 name: tektonresults.operator.tekton.dev spec: group: operator.tekton.dev @@ -352,8 +352,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: labels: - operator.tekton.dev/release: v0.73.1 - version: v0.73.1 + operator.tekton.dev/release: v0.74.0 + version: v0.74.0 name: tektontriggers.operator.tekton.dev spec: group: operator.tekton.dev @@ -1067,7 +1067,7 @@ metadata: --- apiVersion: v1 data: - version: v0.73.1 + version: v0.74.0 kind: ConfigMap metadata: labels: @@ -1110,7 +1110,7 @@ kind: ConfigMap metadata: labels: app.kubernetes.io/instance: tekton - operator.tekton.dev/release: v0.73.1 + operator.tekton.dev/release: v0.74.0 name: tekton-operator-webhook-config-leader-election namespace: openshift-pipelines-operator --- @@ -1128,7 +1128,7 @@ kind: Service metadata: labels: name: openshift-pipelines-operator - version: v0.73.1 + version: v0.74.0 name: tekton-operator namespace: openshift-pipelines-operator spec: @@ -1147,8 +1147,8 @@ metadata: labels: app: tekton-operator name: tekton-operator-webhook - operator.tekton.dev/release: v0.73.1 - version: v0.73.1 + operator.tekton.dev/release: v0.74.0 + version: v0.74.0 name: tekton-operator-webhook namespace: openshift-pipelines-operator spec: @@ -1164,8 +1164,8 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - operator.tekton.dev/release: v0.73.1 - version: v0.73.1 + operator.tekton.dev/release: v0.74.0 + version: v0.74.0 name: openshift-pipelines-operator namespace: openshift-pipelines-operator annotations: @@ -1208,13 +1208,13 @@ spec: - name: OPERATOR_NAME value: redhat-openshift-pipelines-operator - name: IMAGE_PIPELINES_PROXY - value: gcr.io/tekton-releases/github.com/tektoncd/operator/cmd/openshift/proxy-webhook:v0.73.1@sha256:d4263f723a50335cbe8a9b6aea913bbe07cd28780b98124f6f3ca3de970a5298 + value: gcr.io/tekton-releases/github.com/tektoncd/operator/cmd/openshift/proxy-webhook:v0.74.0@sha256:9394f1a77eae0b86ddd1545e1fc4cedde897e07fd8b04eb084111ee835a6b975 - name: IMAGE_JOB_PRUNER_TKN - value: gcr.io/tekton-releases/dogfooding/tkn@sha256:233de6c8b8583a34c2379fa98d42dba739146c9336e8d41b66030484357481ed + value: gcr.io/tekton-releases/dogfooding/tkn@sha256:8d4383ff675cdf42b0006fca9b5b3b0c1d6180ff0013805242c877352e03a359 - name: METRICS_DOMAIN value: tekton.dev/operator - name: VERSION - value: v0.73.1 + value: v0.74.0 - name: AUTOINSTALL_COMPONENTS valueFrom: configMapKeyRef: @@ -1230,24 +1230,24 @@ spec: - name: CONFIG_LEADERELECTION_NAME value: tekton-operator-controller-config-leader-election - name: IMAGE_HUB_TEKTON_HUB_DB - value: registry.redhat.io/rhel8/postgresql-13@sha256:a92a579f1aef66ac188d24fd489c456a1a3e311d95dcce652da6b81e28fbf725 + value: registry.redhat.io/rhel8/postgresql-13@sha256:757d8dd6f243717d820846da7144a49913f28f223b74ec305b2215f54720f8a0 - name: IMAGE_ADDONS_PARAM_BUILDER_IMAGE - value: registry.redhat.io/rhel8/buildah@sha256:3c2ea396a114221575a4031d90d28c43563f7b96288374e0ba8b22de3ed97b5a + value: registry.redhat.io/rhel8/buildah@sha256:6d2dcb651ba680cf4ec74331f8349dec43d071d420625a1703370acc8d984e9e - name: IMAGE_ADDONS_PARAM_KN_IMAGE - value: registry.redhat.io/openshift-serverless-1/client-kn-rhel8@sha256:bf6cf2e87fb19f7aa9a490b83c16af69834c0721220a643710a1b077959e91ca + value: registry.redhat.io/openshift-serverless-1/client-kn-rhel8@sha256:37109f6de75dda750496f6668164d0dceaf9db5278e8c034708436f39de3276e - name: IMAGE_ADDONS_MVN_SETTINGS - value: registry.redhat.io/ubi8/ubi-minimal@sha256:87bcbfedfd70e67aab3875fff103bade460aeff510033ebb36b7efa009ab6639 + value: registry.redhat.io/ubi8/ubi-minimal@sha256:c12e67af6a7e15113d76bc72f10bef2045c026c71ec8b7124c8a075458188a83 - name: IMAGE_ADDONS_SKOPEO_COPY - value: registry.redhat.io/rhel8/skopeo@sha256:4b8d3eeb55e243f7a8ecd375292bdb8f65a6dfc5b02addfdfec5d0aec70877f6 + value: registry.redhat.io/rhel8/skopeo@sha256:7fd65200b4847fc84fba0466519b87f915e28c0e9bc90d3022beecfebffd4af8 - name: IMAGE_ADDONS_GENERATE - value: registry.redhat.io/source-to-image/source-to-image-rhel8@sha256:6a6025914296a62fdf2092c3a40011bd9b966a6806b094d51eec5e1bd5026ef4 + value: registry.redhat.io/source-to-image/source-to-image-rhel8@sha256:3696cf724ce7865626ae408d82fd87727c741e4d3eb3475c271ec6d56f0882a4 - name: IMAGE_ADDONS_GEN_ENV_FILE - value: registry.redhat.io/source-to-image/source-to-image-rhel8@sha256:6a6025914296a62fdf2092c3a40011bd9b966a6806b094d51eec5e1bd5026ef4 + value: registry.redhat.io/source-to-image/source-to-image-rhel8@sha256:3696cf724ce7865626ae408d82fd87727c741e4d3eb3475c271ec6d56f0882a4 - name: IMAGE_ADDONS_PARAM_MAVEN_IMAGE - value: registry.redhat.io/ubi8/openjdk-17@sha256:e8cc2e476282b75d89c73057bfa713db22d72bdb2808d62d981a84c33beb2575 + value: registry.redhat.io/ubi8/openjdk-17@sha256:e5fc9e34382da41b10d4ea566639d31707493abff9e8de81f5accfd66876409e # - name: IMAGE_ADDONS_OC # value: image-registry.openshift-image-registry.svc:5000/openshift/cli:latest - image: gcr.io/tekton-releases/github.com/tektoncd/operator/cmd/openshift/operator:v0.73.1@sha256:e468f641c7eaa47b63d6422bb7894ae500412cefc4fd1554811e83905dc0358b + image: gcr.io/tekton-releases/github.com/tektoncd/operator/cmd/openshift/operator:v0.74.0@sha256:98eab2f32d955b112d319bbab709c2a6b8acb8b61205e14e6a65177c52d3a224 imagePullPolicy: IfNotPresent name: openshift-pipelines-operator-lifecycle resources: @@ -1285,12 +1285,12 @@ spec: - name: PROFILING_PORT value: "9009" - name: VERSION - value: v0.73.1 + value: v0.74.0 - name: METRICS_DOMAIN value: tekton.dev/operator - name: CONFIG_LEADERELECTION_NAME value: tekton-operator-controller-config-leader-election - image: gcr.io/tekton-releases/github.com/tektoncd/operator/cmd/openshift/operator:v0.73.1@sha256:e468f641c7eaa47b63d6422bb7894ae500412cefc4fd1554811e83905dc0358b + image: gcr.io/tekton-releases/github.com/tektoncd/operator/cmd/openshift/operator:v0.74.0@sha256:98eab2f32d955b112d319bbab709c2a6b8acb8b61205e14e6a65177c52d3a224 imagePullPolicy: IfNotPresent name: openshift-pipelines-operator-cluster-operations securityContext: @@ -1319,8 +1319,8 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - operator.tekton.dev/release: v0.73.1 - version: v0.73.1 + operator.tekton.dev/release: v0.74.0 + version: v0.74.0 name: tekton-operator-webhook namespace: openshift-pipelines-operator annotations: @@ -1364,7 +1364,7 @@ spec: value: tekton.dev/operator - name: PLATFORM value: openshift - image: gcr.io/tekton-releases/github.com/tektoncd/operator/cmd/openshift/webhook:v0.73.1@sha256:8e53d30c55ad0d49243ad5753e279d842f486ba1a1119197dd2ce93d91138607 + image: gcr.io/tekton-releases/github.com/tektoncd/operator/cmd/openshift/webhook:v0.74.0@sha256:46b29baa5b3649cf1aac6768fa61769b710802b4de39e8c0ca2a93df6d7e4adc name: tekton-operator-webhook ports: - containerPort: 8443