generated from amazon-archives/__template_MIT-0
-
Notifications
You must be signed in to change notification settings - Fork 55
Added GuanceCloud partner #419
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
Open
baihongru
wants to merge
33
commits into
aws-samples:main
Choose a base branch
from
baihongru:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
33 commits
Select commit
Hold shift + click to select a range
4c66596
Add addons datakit
baihongru ef5825d
Update secret config
baihongru 3376228
Update secret config
baihongru c3c5489
Update interval
baihongru cb68abe
Update version
baihongru 54532e3
Update version and secret
baihongru f9d5766
Downgraded version
baihongru 6056c9a
Downgraded version
baihongru 94029a2
Downgraded version
baihongru e82246a
Update version
baihongru 1cdc0e9
Downgraded version
baihongru 347a2a1
Update version
baihongru 36e785f
Add tester
baihongru da489a0
Update tester
baihongru 55f64c4
Update tester
baihongru 682ec8c
Update version
baihongru 53ee756
Update tester
baihongru e434fa7
Update tester
baihongru d443fa9
Update tester
baihongru afa8f3d
Merge branch 'aws-samples:main' into main
baihongru 481fee5
Update remote secret name
baihongru 41fd93f
Update external-secrets api version
baihongru 1f249f7
fix conjob to stop running every minute
zjaco13 e2e6b85
Update test job schedule
baihongru 385ca5f
Merge branch 'main' of https://github.com/baihongru/eks-anywhere-addons
baihongru a559ef1
Update test job add debug info
baihongru ffd06aa
Update datakit version
baihongru 7a22727
Update datakit version
baihongru 480a5d6
Update heml repo url
baihongru 063ecba
Merge branch 'aws-samples:main' into main
baihongru e74b74a
Update test job
baihongru ea040d3
Merge branch 'main' of https://github.com/baihongru/eks-anywhere-addons
baihongru 24cac59
Update test job
baihongru File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
28 changes: 28 additions & 0 deletions
28
eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| --- | ||
| apiVersion: helm.toolkit.fluxcd.io/v2beta1 | ||
| kind: HelmRelease | ||
| metadata: | ||
| name: datakit | ||
| namespace: datakit | ||
| spec: | ||
| chart: | ||
| spec: | ||
| chart: datakit | ||
| reconcileStrategy: ChartVersion | ||
| sourceRef: | ||
| kind: HelmRepository | ||
| name: datakit-charts | ||
| namespace: flux-system | ||
| version: 1.85.0 | ||
| interval: 1m | ||
| targetNamespace: datakit | ||
| valuesFrom: | ||
| - kind: Secret | ||
| name: datakit-secret | ||
| valuesKey: dataway_url | ||
| targetPath: datakit.dataway_url | ||
| - kind: Secret | ||
| name: datakit-secret | ||
| valuesKey: cluster_name_k8s | ||
| targetPath: datakit.cluster_name_k8s | ||
|
|
||
9 changes: 9 additions & 0 deletions
9
eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-source.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| --- | ||
| apiVersion: source.toolkit.fluxcd.io/v1beta2 | ||
| kind: HelmRepository | ||
| metadata: | ||
| name: datakit-charts | ||
| namespace: flux-system | ||
| spec: | ||
| interval: 1m | ||
| url: https://pubrepo.jiagouyun.com/chartrepo/datakit |
22 changes: 22 additions & 0 deletions
22
eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/external-secret.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| --- | ||
| apiVersion: external-secrets.io/v1 | ||
| kind: ExternalSecret | ||
| metadata: | ||
| name: datakit-external-secret | ||
| namespace: datakit | ||
| spec: | ||
| refreshInterval: 1m | ||
| secretStoreRef: | ||
| name: eksa-secret-store # The secret store name we have just created. | ||
| kind: ClusterSecretStore | ||
| target: | ||
| name: datakit-secret # Secret name in k8s | ||
| data: | ||
| - secretKey: dataway_url # Which key it's going to be stored | ||
| remoteRef: | ||
| key: datakit-secrets # Our secret-name goes here | ||
| property: dataway_url | ||
| - secretKey: cluster_name_k8s # Which key it's going to be stored | ||
| remoteRef: | ||
| key: datakit-secrets # Our secret-name goes here | ||
| property: cluster_name_k8s |
9 changes: 9 additions & 0 deletions
9
eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| --- | ||
| apiVersion: v1 | ||
| kind: Namespace | ||
| metadata: | ||
| name: datakit | ||
| labels: | ||
| aws.conformance.vendor: guancecloud | ||
| aws.conformance.vendor-solution: datakit | ||
| aws.conformance.vendor-solution-version: 1.85.0 |
35 changes: 35 additions & 0 deletions
35
eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| apiVersion: batch/v1 | ||
| kind: CronJob | ||
| metadata: | ||
| name: datakit-test-cronjob | ||
| namespace: datakit | ||
| spec: | ||
| schedule: "0 */12 * * *" | ||
| jobTemplate: | ||
| spec: | ||
| template: | ||
| spec: | ||
| containers: | ||
| - name: datakit-test-cronjob | ||
| image: busybox:1.36 | ||
| command: ["/bin/sh", "-c"] | ||
| args: | ||
| - | | ||
| URL="http://datakit-service.datakit.svc.cluster.local:9529/v1/write/logging" | ||
| DATA='[{"measurement":"test_log","tags":{"foo":"bar"},"fields":{"message":"This log from aws service ready tester."}}]' | ||
|
|
||
| response=$(wget -O /dev/null --server-response --post-data "$DATA" \ | ||
| --header "Content-Type: application/json" "$URL" 2>&1) | ||
|
|
||
| http_code=$(echo "$response" | awk '/^ HTTP/{print $2}' | head -n 1) | ||
|
|
||
| if [ $? -eq 0 ] && [ -n "$http_code" ] && [ "$http_code" -ge 200 ] && [ "$http_code" -lt 300 ]; then | ||
| echo "Write log success." | ||
| else | ||
| echo "Write log failed." | ||
| echo "$response" | ||
| exit 1 | ||
| fi | ||
| restartPolicy: Never | ||
| successfulJobsHistoryLimit: 3 | ||
| failedJobsHistoryLimit: 1 |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@baihongru I'm getting an error on our hardened BottleRocket images that the datakit daemonset is trying to mount from /root, which is a read only fs for those clusters. When I updated the value for the datakit cache, I was able to get it to run. Could you add this block in under line 18?:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is because Datakit uses the WAL disk queue, and it requires a writable path to store the WAL log files. Can this path be specified as /var/datakit_cache? Compared to /tmp/datakit_cache, it is less likely to be deleted. I did this on the EKS self-managed cluster.