Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

20240115 main to develop #306

Merged
merged 19 commits into from
Jan 15, 2024
Merged

20240115 main to develop #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
e258c47
lma: fix etcd servicemonitor
zugwan Nov 24, 2023
066fefb
Merge pull request #296 from openinfradev/fix_etcd
ktkfree Nov 27, 2023
bb6c69c
Merge pull request #297 from openinfradev/release
ktkfree Nov 27, 2023
58d3377
feature. update helm-chart version for cluster_api_aws
ktkfree Nov 27, 2023
73ca599
Merge pull request #298 from openinfradev/update_cluster_aws_version
zugwan Nov 27, 2023
ebfd543
Merge pull request #299 from openinfradev/release
ktkfree Nov 27, 2023
8f32ad9
update chart version cluster-api-aws
ktkfree Nov 29, 2023
7dd8f84
Merge pull request #300 from openinfradev/update_cluster_api_aws
ktkfree Nov 29, 2023
c1cafe3
argo-rollout: metrics
Dec 4, 2023
f2cd1d6
Merge pull request #301 from openinfradev/servicemonitor
ktkfree Dec 4, 2023
8eaef35
servicemonitor: enable servicemonitor on kubeControllerManager and ku…
Dec 4, 2023
8f764fa
Merge pull request #302 from openinfradev/servicemonitor
zugwan Dec 4, 2023
a62aac6
argo-rollout: bugfix: duplicated keys
Dec 4, 2023
87a4b83
Merge pull request #303 from openinfradev/servicemonitor
intelliguy Dec 4, 2023
53191ba
argo-rollouts: add servicemonitor for argo-rollouts at lma-addons
Dec 5, 2023
bf02cdb
argo-rollouts: remove servicemonitor at the argo-rollouts chart
Dec 5, 2023
bd9628d
argo-rollouts: add scrape interval
Dec 5, 2023
4312dc1
Merge pull request #304 from openinfradev/servicemonitor
ktkfree Dec 5, 2023
e2ebf17
Merge pull request #305 from openinfradev/release
ktkfree Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions lma/base/resources.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,28 +195,23 @@ spec:
kubelet:
enabled: false
kubeControllerManager:
enabled: false
enabled: true
coreDns:
enabled: true
serviceMonitor:
interval: TO_BE_FIXED
kubeDns:
enabled: false
enabled: true
serviceMonitor:
interval: TO_BE_FIXED
kubeEtcd:
enabled: true
endpoints: []
serviceMonitor:
interval: TO_BE_FIXED
caFile: /etc/prometheus/secrets/etcd-client-cert/etcd-ca
certFile: /etc/prometheus/secrets/etcd-client-cert/etcd-client
insecureSkipVerify: false
keyFile: /etc/prometheus/secrets/etcd-client-cert/etcd-client-key
scheme: https
serverName: localhost
scheme: http
kubeScheduler:
enabled: false
enabled: true
kubeProxy:
enabled: true
serviceMonitor:
Expand Down Expand Up @@ -758,7 +753,7 @@ spec:
type: helmrepo
repository: https://harbor.taco-cat.xyz/chartrepo/tks
name: lma-addons
version: 1.8.6
version: 1.8.7
origin: https://openinfradev.github.io/helm-repo
releaseName: addons
targetNamespace: lma
Expand Down Expand Up @@ -804,6 +799,9 @@ spec:
argocd:
enabled: true
interval: TO_BE_FIXED
argoRollout:
enabled: true
interval: TO_BE_FIXED
argowf:
enabled: true
interval: TO_BE_FIXED
Expand Down
1 change: 1 addition & 0 deletions lma/base/site-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ charts:
serviceMonitor.grafana.interval: $(serviceScrapeInterval)
serviceMonitor.argocd.interval: $(serviceScrapeInterval)
serviceMonitor.argowf.interval: $(serviceScrapeInterval)
serviceMonitor.argoRollout.interval: $(serviceScrapeInterval)
serviceMonitor.processExporter.interval: $(serviceScrapeInterval)
serviceMonitor.ceph.interval: $(serviceScrapeInterval)
serviceMonitor.calico.interval: $(serviceScrapeInterval)
Expand Down
8 changes: 8 additions & 0 deletions tks-cluster/base/resources.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,14 @@ spec:
registry: harbor.taco-cat.xyz
repository: tks/argo-rollouts
tag: v1.4.1
metrics:
enabled: true
serviceMonitor:
enabled: false
podAnnotations:
prometheus.io/scrape: "true"
prometheus.io/path: /metrics
prometheus.io/port: "8090"
dashboard:
enabled: false
nodeSelector:
Expand Down
2 changes: 1 addition & 1 deletion tks-cluster/infra/aws/resources.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
type: helmrepo
repository: https://harbor.taco-cat.xyz/chartrepo/tks
name: cluster-api-aws
version: 0.8.3
version: 0.10.1
releaseName: cluster-api-aws
targetNamespace: argo
values:
Expand Down
Loading