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.

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

20240517 develop to release ( v4.0.0 ) #316

Merged
merged 26 commits into from
May 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f9b2e30
tks-cluster: aws: update capa chart to v0.10.0
zugwan Nov 14, 2023
039bcf4
Merge pull request #291 from openinfradev/update_capa_v0.10.0
ktkfree Nov 15, 2023
56898ef
Merge pull request #293 from openinfradev/release
ktkfree Nov 17, 2023
8e1e38b
Merge pull request #294 from openinfradev/main
ktkfree Nov 17, 2023
978dbc2
lma: fix etcd servicemonitor
zugwan Nov 24, 2023
7e07078
Merge pull request #295 from openinfradev/fix_etcd_servicemonitor
seungkyua Nov 24, 2023
bb6c69c
Merge pull request #297 from openinfradev/release
ktkfree Nov 27, 2023
ebfd543
Merge pull request #299 from openinfradev/release
ktkfree Nov 27, 2023
e2ebf17
Merge pull request #305 from openinfradev/release
ktkfree Dec 5, 2023
900a81b
resolve conflict
ktkfree Jan 15, 2024
e84fb6d
Merge pull request #307 from openinfradev/resolve_conflict
ktkfree Jan 15, 2024
ca0a970
Merge pull request #306 from openinfradev/main
ktkfree Jan 15, 2024
d0c6926
fluent-operator: bump up operator to support more input methods
Feb 21, 2024
73453b8
Merge pull request #309 from openinfradev/fluent-opeartor
ktkfree Apr 16, 2024
44bc957
fluentbit: does not support alert anymore
Apr 16, 2024
dcaca82
Merge pull request #310 from openinfradev/fluentbit-alert
bluejayA Apr 22, 2024
87d01b4
opa-exporter: add exporter for opa
Apr 24, 2024
e14345a
Merge pull request #311 from openinfradev/opa-exporter
ktkfree Apr 24, 2024
1652477
trivial. fix typo
ktkfree Apr 25, 2024
2882277
Merge pull request #312 from openinfradev/fix_opa
ktkfree Apr 25, 2024
9e0ee92
policy-serving: change the namespace for decapod randering
Apr 26, 2024
daa9070
Merge pull request #313 from openinfradev/opa-exporter
intelliguy Apr 26, 2024
dc5af5c
typo-fix: policy-serving: change the namespace for decapod randering
May 2, 2024
3a2a557
Merge pull request #314 from openinfradev/opa-exporter
intelliguy May 2, 2024
e2a4fe3
policy-serving: enable to log denies
May 6, 2024
9983c16
Merge pull request #315 from openinfradev/policy-serving
ktkfree May 16, 2024
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
44 changes: 31 additions & 13 deletions lma/base/resources.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ spec:
type: helmrepo
repository: https://harbor.taco-cat.xyz/chartrepo/tks
name: fluent-operator
version: 1.7.0
version: 2.7.0
skipDepUpdate: true
origin: https://openinfradev.github.io/helm-repo
releaseName: fluent-operator-crds
Expand All @@ -641,18 +641,18 @@ spec:
origin: https://openinfradev.github.io/helm-repo
repository: https://harbor.taco-cat.xyz/chartrepo/tks
name: fluent-operator
version: 1.7.0
version: 2.7.0
skipDepUpdate: true
releaseName: fluent-operator
targetNamespace: lma
values:
operator:
initcontainer:
repository: harbor.taco-cat.xyz/tks/docker
tag: 19.03
tag: "20.10"
container:
repository: harbor.taco-cat.xyz/tks/fluent-operator
tag: v1.5.0
tag: "v2.7.0"
# FluentBit operator resources. Usually user needn't to adjust these.
resources:
limits:
Expand All @@ -662,9 +662,10 @@ spec:
cpu: 100m
memory: 20Mi
fluentbit:
enable: false
image:
repository: harbor.taco-cat.xyz/tks/fluent-bit
tag: v1.9.7-debug
tag: v2.2.0
wait: true
---
apiVersion: helm.fluxcd.io/v1
Expand Down Expand Up @@ -692,7 +693,7 @@ spec:
tag: v0.1.1
fluentbit:
repository: harbor.taco-cat.xyz/tks/fluent-bit
tag: v2.1.4
tag: v2.2.0
elasticsearchTemplates:
repository: harbor.taco-cat.xyz/tks/curl
tag: latest
Expand Down Expand Up @@ -721,13 +722,7 @@ spec:
outputs: { }
targetLogs: [ ]
alerts:
enabled: true
namespace: taco-system
message: |-
{{ $labels.container }} in {{ $labels.pod }} ({{ $labels.taco_cluster }}/{{ $labels.namespace }} ) generate a error due to log = {{ $labels.log }}
summary: |-
{{ $labels.container }} in {{ $labels.pod }} ({{ $labels.taco_cluster }}/{{ $labels.namespace }} ) generate a error
rules: [ ]
enabled: false
clusterName: TO_BE_FIXED
exclude:
- key: $kubernetes['container_name']
Expand Down Expand Up @@ -1250,3 +1245,26 @@ spec:
s3:
enabled: true
buckets: [ ]
---
apiVersion: helm.fluxcd.io/v1
kind: HelmRelease
metadata:
labels:
name: opa-exporter
name: opa-exporter
spec:
helmVersion: v3
chart:
type: helmrepo
repository: https://harbor.taco-cat.xyz/chartrepo/tks
name: opa-scorecard
version: 0.1.0
releaseName: opa-exporter
targetNamespace: lma
values:
gatekeeper:
namespace: gatekeeper-system
metrics:
podmonitor: true
servicemonitor:
enabled: true
1 change: 1 addition & 0 deletions policy/base/resources.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ spec:
releaseName: opa-gatekeeper
targetNamespace: gatekeeper-system
values:
logDenies: true
enableDeleteOperations: true
---
apiVersion: helm.fluxcd.io/v1
Expand Down
Loading