Обновлены IP-адреса в документации и конфигурационных файлах, изменены параметры хранилища на piraeus-storage в нескольких манифестах, добавлены зависимости для установки мониторинга и других компонентов.
This commit is contained in:
@@ -6,7 +6,6 @@ metadata:
|
|||||||
app.kubernetes.io/component: keycloak
|
app.kubernetes.io/component: keycloak
|
||||||
pod-security.kubernetes.io/enforce: privileged
|
pod-security.kubernetes.io/enforce: privileged
|
||||||
---
|
---
|
||||||
|
|
||||||
apiVersion: helm.toolkit.fluxcd.io/v2beta1
|
apiVersion: helm.toolkit.fluxcd.io/v2beta1
|
||||||
kind: HelmRelease
|
kind: HelmRelease
|
||||||
metadata:
|
metadata:
|
||||||
@@ -86,7 +85,7 @@ spec:
|
|||||||
|
|
||||||
postgresql:
|
postgresql:
|
||||||
enabled: true
|
enabled: true
|
||||||
storageClass: "nfs-client"
|
storageClass: "piraeus-storage"
|
||||||
|
|
||||||
# externalDatabase:
|
# externalDatabase:
|
||||||
# host: "keycloak-test-db-rw"
|
# host: "keycloak-test-db-rw"
|
||||||
|
@@ -14,8 +14,9 @@ metadata:
|
|||||||
namespace: flux-system
|
namespace: flux-system
|
||||||
spec:
|
spec:
|
||||||
interval: 1h
|
interval: 1h
|
||||||
install:
|
dependsOn:
|
||||||
createNamespace: true
|
- name: monitoring
|
||||||
|
- name: piraeus
|
||||||
targetNamespace: kyverno
|
targetNamespace: kyverno
|
||||||
chart:
|
chart:
|
||||||
spec:
|
spec:
|
||||||
|
@@ -6,7 +6,6 @@ metadata:
|
|||||||
app.kubernetes.io/component: loki
|
app.kubernetes.io/component: loki
|
||||||
pod-security.kubernetes.io/enforce: privileged
|
pod-security.kubernetes.io/enforce: privileged
|
||||||
---
|
---
|
||||||
|
|
||||||
apiVersion: helm.toolkit.fluxcd.io/v2
|
apiVersion: helm.toolkit.fluxcd.io/v2
|
||||||
kind: HelmRelease
|
kind: HelmRelease
|
||||||
metadata:
|
metadata:
|
||||||
@@ -16,6 +15,7 @@ spec:
|
|||||||
interval: 5m
|
interval: 5m
|
||||||
dependsOn:
|
dependsOn:
|
||||||
- name: monitoring
|
- name: monitoring
|
||||||
|
- name: piraeus
|
||||||
chart:
|
chart:
|
||||||
spec:
|
spec:
|
||||||
version: "6.x"
|
version: "6.x"
|
||||||
@@ -84,7 +84,7 @@ spec:
|
|||||||
enabled: true
|
enabled: true
|
||||||
persistence:
|
persistence:
|
||||||
enabled: true
|
enabled: true
|
||||||
storageClass: nfs-client
|
storageClass: piraeus-storage
|
||||||
size: 20Gi
|
size: 20Gi
|
||||||
lokiCanary:
|
lokiCanary:
|
||||||
enabled: false
|
enabled: false
|
||||||
@@ -93,7 +93,7 @@ spec:
|
|||||||
replicas: 1
|
replicas: 1
|
||||||
persistence:
|
persistence:
|
||||||
enabled: true
|
enabled: true
|
||||||
storageClass: nfs-client
|
storageClass: piraeus-storage
|
||||||
size: 10Gi
|
size: 10Gi
|
||||||
backend:
|
backend:
|
||||||
replicas: 0
|
replicas: 0
|
||||||
|
@@ -6,7 +6,6 @@ metadata:
|
|||||||
app.kubernetes.io/component: monitoring
|
app.kubernetes.io/component: monitoring
|
||||||
pod-security.kubernetes.io/enforce: privileged
|
pod-security.kubernetes.io/enforce: privileged
|
||||||
---
|
---
|
||||||
|
|
||||||
apiVersion: helm.toolkit.fluxcd.io/v2beta1
|
apiVersion: helm.toolkit.fluxcd.io/v2beta1
|
||||||
kind: HelmRelease
|
kind: HelmRelease
|
||||||
metadata:
|
metadata:
|
||||||
@@ -14,6 +13,8 @@ metadata:
|
|||||||
namespace: flux-system
|
namespace: flux-system
|
||||||
spec:
|
spec:
|
||||||
interval: 1h
|
interval: 1h
|
||||||
|
dependsOn:
|
||||||
|
- name: piraeus
|
||||||
chart:
|
chart:
|
||||||
spec:
|
spec:
|
||||||
chart: kube-prometheus-stack
|
chart: kube-prometheus-stack
|
||||||
@@ -32,7 +33,7 @@ spec:
|
|||||||
driftDetection:
|
driftDetection:
|
||||||
mode: enabled
|
mode: enabled
|
||||||
ignore:
|
ignore:
|
||||||
- paths: [ "/metadata/annotations/prometheus-operator-validated" ]
|
- paths: ["/metadata/annotations/prometheus-operator-validated"]
|
||||||
target:
|
target:
|
||||||
kind: PrometheusRule
|
kind: PrometheusRule
|
||||||
values:
|
values:
|
||||||
@@ -48,7 +49,7 @@ spec:
|
|||||||
storageSpec:
|
storageSpec:
|
||||||
volumeClaimTemplate:
|
volumeClaimTemplate:
|
||||||
spec:
|
spec:
|
||||||
storageClassName: nfs-client
|
storageClassName: piraeus-storage
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: 20Gi
|
storage: 20Gi
|
||||||
|
@@ -6,7 +6,6 @@ metadata:
|
|||||||
app.kubernetes.io/component: nfs-provisioner
|
app.kubernetes.io/component: nfs-provisioner
|
||||||
pod-security.kubernetes.io/enforce: privileged
|
pod-security.kubernetes.io/enforce: privileged
|
||||||
---
|
---
|
||||||
|
|
||||||
apiVersion: helm.toolkit.fluxcd.io/v2beta1
|
apiVersion: helm.toolkit.fluxcd.io/v2beta1
|
||||||
kind: HelmRelease
|
kind: HelmRelease
|
||||||
metadata:
|
metadata:
|
||||||
@@ -34,5 +33,5 @@ spec:
|
|||||||
storageClass:
|
storageClass:
|
||||||
create: true
|
create: true
|
||||||
defaultClass: true
|
defaultClass: true
|
||||||
name: nfs-client
|
name: piraeus-storage
|
||||||
archiveOnDelete: false
|
archiveOnDelete: false
|
||||||
|
@@ -6,7 +6,6 @@ metadata:
|
|||||||
app.kubernetes.io/component: pgadmin
|
app.kubernetes.io/component: pgadmin
|
||||||
pod-security.kubernetes.io/enforce: privileged
|
pod-security.kubernetes.io/enforce: privileged
|
||||||
---
|
---
|
||||||
|
|
||||||
apiVersion: helm.toolkit.fluxcd.io/v2beta1
|
apiVersion: helm.toolkit.fluxcd.io/v2beta1
|
||||||
kind: HelmRelease
|
kind: HelmRelease
|
||||||
metadata:
|
metadata:
|
||||||
@@ -14,6 +13,9 @@ metadata:
|
|||||||
namespace: flux-system
|
namespace: flux-system
|
||||||
spec:
|
spec:
|
||||||
interval: 1h
|
interval: 1h
|
||||||
|
dependsOn:
|
||||||
|
- name: monitoring
|
||||||
|
- name: piraeus
|
||||||
targetNamespace: pgadmin
|
targetNamespace: pgadmin
|
||||||
chart:
|
chart:
|
||||||
spec:
|
spec:
|
||||||
@@ -44,4 +46,4 @@ spec:
|
|||||||
accessModes:
|
accessModes:
|
||||||
- ReadWriteOnce
|
- ReadWriteOnce
|
||||||
size: 1Gi
|
size: 1Gi
|
||||||
storageClass: "nfs-client"
|
storageClass: "piraeus-storage"
|
||||||
|
@@ -6,7 +6,6 @@ metadata:
|
|||||||
app.kubernetes.io/component: redis
|
app.kubernetes.io/component: redis
|
||||||
pod-security.kubernetes.io/enforce: privileged
|
pod-security.kubernetes.io/enforce: privileged
|
||||||
---
|
---
|
||||||
|
|
||||||
apiVersion: helm.toolkit.fluxcd.io/v2beta1
|
apiVersion: helm.toolkit.fluxcd.io/v2beta1
|
||||||
kind: HelmRelease
|
kind: HelmRelease
|
||||||
metadata:
|
metadata:
|
||||||
@@ -14,6 +13,9 @@ metadata:
|
|||||||
namespace: flux-system
|
namespace: flux-system
|
||||||
spec:
|
spec:
|
||||||
interval: 1h
|
interval: 1h
|
||||||
|
dependsOn:
|
||||||
|
- name: monitoring
|
||||||
|
- name: piraeus
|
||||||
targetNamespace: redis
|
targetNamespace: redis
|
||||||
chart:
|
chart:
|
||||||
spec:
|
spec:
|
||||||
@@ -34,13 +36,13 @@ spec:
|
|||||||
count: 1
|
count: 1
|
||||||
persistence:
|
persistence:
|
||||||
enabled: true
|
enabled: true
|
||||||
storageClass: "nfs-client"
|
storageClass: "piraeus-storage"
|
||||||
size: 4Gi
|
size: 4Gi
|
||||||
replica:
|
replica:
|
||||||
replicaCount: 1
|
replicaCount: 1
|
||||||
persistence:
|
persistence:
|
||||||
enabled: true
|
enabled: true
|
||||||
storageClass: "nfs-client"
|
storageClass: "piraeus-storage"
|
||||||
size: 4Gi
|
size: 4Gi
|
||||||
metrics:
|
metrics:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
@@ -20,13 +20,13 @@ resources:
|
|||||||
# - install/nfs-provisioner.yaml
|
# - install/nfs-provisioner.yaml
|
||||||
- install/ingress-nginx.yaml
|
- install/ingress-nginx.yaml
|
||||||
- install/metrics-server.yaml
|
- install/metrics-server.yaml
|
||||||
# - install/monitoring.yaml
|
- install/monitoring.yaml
|
||||||
# - install/loki.yaml
|
# - install/loki.yaml
|
||||||
# - install/promtail.yaml
|
# - install/promtail.yaml
|
||||||
# - install/kyverno.yaml
|
# - install/kyverno.yaml
|
||||||
# - install/cpng.yaml
|
- install/cpng.yaml
|
||||||
# - install/vswh.yaml
|
# - install/vswh.yaml
|
||||||
# - install/stakater.yaml
|
- install/stakater.yaml
|
||||||
# - install/keycloak.yaml
|
# - install/keycloak.yaml
|
||||||
# - install/redis.yaml
|
# - install/redis.yaml
|
||||||
# - install/pgadmin.yaml
|
# - install/pgadmin.yaml
|
||||||
|
@@ -43,27 +43,27 @@ spec:
|
|||||||
type: DirectoryOrCreate
|
type: DirectoryOrCreate
|
||||||
---
|
---
|
||||||
|
|
||||||
# apiVersion: piraeus.io/v1
|
apiVersion: piraeus.io/v1
|
||||||
# kind: LinstorSatelliteConfiguration
|
kind: LinstorSatelliteConfiguration
|
||||||
# metadata:
|
metadata:
|
||||||
# name: storage-pool
|
name: storage-pool
|
||||||
# spec:
|
spec:
|
||||||
# storagePools:
|
storagePools:
|
||||||
# - name: pool1
|
- name: pool1
|
||||||
# lvmThinPool:
|
lvmThinPool:
|
||||||
# volumeGroup: vg1
|
volumeGroup: vg1
|
||||||
# thinPool: thin
|
thinPool: thin
|
||||||
# source:
|
source:
|
||||||
# hostDevices:
|
hostDevices:
|
||||||
# - /dev/sdb
|
- /dev/sdb
|
||||||
# ---
|
---
|
||||||
|
|
||||||
apiVersion: storage.k8s.io/v1
|
apiVersion: storage.k8s.io/v1
|
||||||
kind: StorageClass
|
kind: StorageClass
|
||||||
metadata:
|
metadata:
|
||||||
name: piraeus-storage
|
name: piraeus-storage
|
||||||
# annotations:
|
annotations:
|
||||||
# storageclass.kubernetes.io/is-default-class: "true"
|
storageclass.kubernetes.io/is-default-class: "true"
|
||||||
provisioner: linstor.csi.linbit.com
|
provisioner: linstor.csi.linbit.com
|
||||||
allowVolumeExpansion: true
|
allowVolumeExpansion: true
|
||||||
volumeBindingMode: WaitForFirstConsumer
|
volumeBindingMode: WaitForFirstConsumer
|
||||||
|
@@ -21,7 +21,7 @@ ISO-образы для архитектур amd64 и arm64 доступны н
|
|||||||
```bash
|
```bash
|
||||||
talosctl gen secrets -o config/secrets.yaml
|
talosctl gen secrets -o config/secrets.yaml
|
||||||
|
|
||||||
talosctl gen config --kubernetes-version 1.33.2 --with-secrets config/secrets.yaml talos-demo https://192.168.23.51:6443 --config-patch @patch.yaml
|
talosctl gen config --kubernetes-version 1.33.2 --with-secrets config/secrets.yaml talos-demo https://192.168.23.54:6443 --config-patch @patch.yaml
|
||||||
|
|
||||||
talosctl machineconfig patch config/controlplane.yaml --patch @cp1.patch --output config/cp1.yaml
|
talosctl machineconfig patch config/controlplane.yaml --patch @cp1.patch --output config/cp1.yaml
|
||||||
talosctl machineconfig patch config/controlplane.yaml --patch @cp2.patch --output config/cp2.yaml
|
talosctl machineconfig patch config/controlplane.yaml --patch @cp2.patch --output config/cp2.yaml
|
||||||
@@ -34,20 +34,22 @@ talosctl machineconfig patch config/worker.yaml --patch @worker2.patch --output
|
|||||||
эту часть делаем мы
|
эту часть делаем мы
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
talosctl apply-config --insecure -n 192.168.23.51 --file config/cp1.yaml
|
talosctl apply-config --insecure -n 192.168.23.54 --file config/cp1.yaml
|
||||||
talosctl bootstrap --nodes 192.168.23.51 --endpoints 192.168.23.51 --talosconfig=config/talosconfig
|
talosctl bootstrap --nodes 192.168.23.54 --endpoints 192.168.23.54 --talosconfig=config/talosconfig
|
||||||
|
|
||||||
talosctl apply-config --insecure -n 192.168.23.52 --file config/cp2.yaml
|
talosctl apply-config --insecure -n 192.168.23.52 --file config/cp2.yaml
|
||||||
talosctl apply-config --insecure -n 192.168.23.53 --file config/cp3.yaml
|
talosctl apply-config --insecure -n 192.168.23.53 --file config/cp3.yaml
|
||||||
|
|
||||||
talosctl apply-config --insecure -n 192.168.23.54 --file config/worker1.yaml
|
talosctl apply-config --insecure -n 192.168.23.55 --file config/worker1.yaml
|
||||||
talosctl apply-config --insecure -n 192.168.23.55 --file config/worker2.yaml
|
talosctl apply-config --insecure -n 192.168.23.56 --file config/worker2.yaml
|
||||||
|
|
||||||
talosctl kubeconfig ~/.kube/talos-demo.yaml --nodes 192.168.23.51 --endpoints 192.168.23.51 --talosconfig config/talosconfig
|
talosctl kubeconfig ~/.kube/talos-demo.yaml --nodes 192.168.23.54 --endpoints 192.168.23.54 --talosconfig config/talosconfig
|
||||||
```
|
```
|
||||||
|
|
||||||
## Cilium
|
## Cilium
|
||||||
|
|
||||||
|
правим api-адрес t8s в cilium/values.yaml
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
helm repo add cilium https://helm.cilium.io/
|
helm repo add cilium https://helm.cilium.io/
|
||||||
helm repo update
|
helm repo update
|
||||||
|
@@ -4,4 +4,4 @@ metadata:
|
|||||||
name: pool
|
name: pool
|
||||||
spec:
|
spec:
|
||||||
blocks:
|
blocks:
|
||||||
- cidr: 192.168.23.21/32
|
- cidr: 192.168.23.57/32
|
||||||
|
@@ -11,6 +11,6 @@ spec:
|
|||||||
- key: node-role.kubernetes.io/control-plane
|
- key: node-role.kubernetes.io/control-plane
|
||||||
operator: DoesNotExist
|
operator: DoesNotExist
|
||||||
interfaces:
|
interfaces:
|
||||||
- ^eth+
|
- ^ens+
|
||||||
externalIPs: true
|
externalIPs: true
|
||||||
loadBalancerIPs: true
|
loadBalancerIPs: true
|
||||||
|
@@ -23,7 +23,7 @@ cgroup:
|
|||||||
autoMount:
|
autoMount:
|
||||||
enabled: false
|
enabled: false
|
||||||
hostRoot: /sys/fs/cgroup
|
hostRoot: /sys/fs/cgroup
|
||||||
k8sServiceHost: 192.168.23.20
|
k8sServiceHost: 192.168.23.54
|
||||||
k8sServicePort: 6443
|
k8sServicePort: 6443
|
||||||
l2announcements:
|
l2announcements:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
@@ -9,8 +9,8 @@ vmid_template=777
|
|||||||
vmid=80
|
vmid=80
|
||||||
vm_name=t8s-demo
|
vm_name=t8s-demo
|
||||||
|
|
||||||
controllers=3
|
controllers=${2:-3}
|
||||||
workers=2
|
workers=${3:-2}
|
||||||
|
|
||||||
echo "${VERB} stand"
|
echo "${VERB} stand"
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user