diff --git a/README.md b/README.md index 85209702..eb36d710 100644 --- a/README.md +++ b/README.md @@ -186,19 +186,13 @@ metadata: namespace: cozy-system data: cluster-name: "cozystack" - cluster-type: "baremetal" ipv4-pod-cidr: "10.244.0.0/16" ipv4-pod-gateway: "10.244.0.1" ipv4-svc-cidr: "10.96.0.0/16" ipv4-join-cidr: "100.64.0.0/16" - ipv4-external-pool-private: "192.168.100.200-192.168.100.250" - ipv4-external-pool-public: "1.2.3.4/32,1.2.3.5/32" - monitoring-remote-write-url-1: "http://vminsert-monitoring-shortterm.tenant-root.svc:8480/insert/0/prometheus/api/v1/write" - monitoring-remote-write-url-2: "http://vminsert-monitoring-longterm.tenant-root.svc:8480/insert/0/prometheus/api/v1/write" EOT ``` - Install cozystack system components: ``` kubectl apply -f cozystack-config.yaml @@ -210,6 +204,16 @@ Check the status of installation: kubectl get hr -A ``` +#### Configure Storage + +TODO + +#### Configure Networking interconnection + +TODO + +#### Setup basic applications + Get token from `tenant-root`: ``` kubectl get secret -n tenant-root tenant-root -o go-template='{{ printf "%s\n" (index .data "token" | base64decode) }}' @@ -221,6 +225,11 @@ kubectl port-forward -n cozy-dashboard svc/dashboard 8080:80 Open: http://localhost:8080/ +- Select `tenant-root` +- Click Upgrade button +- Set `etcd`, `monitoring` and `ingress` to enabled position +- Click Deploy + ### Chart Install Responsibilities #### core/installer: diff --git a/packages/apps/kubernetes/templates/cluster.yaml b/packages/apps/kubernetes/templates/cluster.yaml index 96f1a9f1..ed5fdd71 100644 --- a/packages/apps/kubernetes/templates/cluster.yaml +++ b/packages/apps/kubernetes/templates/cluster.yaml @@ -31,7 +31,8 @@ metadata: labels: cluster.x-k8s.io/role: control-plane spec: - dataStoreName: default + {{- $myNS := lookup "v1" "Namespace" "" .Release.Namespace }} + dataStoreName: "{{ index $myNS.metadata.labels "namespace.cozystack.io/etcd" }}" addons: coreDNS: {} kubeProxy: {} @@ -46,7 +47,7 @@ spec: serviceType: ClusterIP ingress: hostname: {{ .Release.Name }}.{{ .Release.Namespace }}.svc #TODO - ingressClassName: nginx + ingressClassName: "{{ index $myNS.metadata.labels "namespace.cozystack.io/ingress" }}" deployment: replicas: 2 version: 1.29.0 diff --git a/packages/system/monitoring/templates/vmagent.yaml b/packages/system/monitoring/templates/vmagent.yaml index e7698643..c9078352 100644 --- a/packages/system/monitoring/templates/vmagent.yaml +++ b/packages/system/monitoring/templates/vmagent.yaml @@ -1,4 +1,3 @@ -{{- $cozyConfig := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }} apiVersion: operator.victoriametrics.com/v1beta1 kind: VMAgent metadata: @@ -10,11 +9,8 @@ spec: extraArgs: promscrape.streamParse: "true" remoteWrite: - {{- range $k, $v := $cozyConfig.data }} - {{- if hasPrefix "monitoring-remote-write-url" $k }} - - url: "{{ $v }}" - {{- end }} - {{- end }} + - url: http://vminsert-monitoring.tenant-root.svc:8480/insert/0/prometheus/api/v1/write + - url: http://vminsert-monitoring.tenant-root.svc:8480/insert/0/prometheus/api/v1/write scrapeInterval: 30s selectAllByDefault: true additionalScrapeConfigs: