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

fix: grafana pvc config not working #737

Open
wants to merge 8 commits into
base: master
Choose a base branch
from

Conversation

karl-chanel
Copy link

Description of your changes

How has this code been tested?

Checklist

I have:

  • Title of the PR starts with type (e.g. [Addon] , [example] or [Doc]).
  • Updated/Added any relevant documentation and examples.
  • New addon should be put in experimental.
  • Update addon should modify the version in metadata.yaml to generate a new version.

Verified Addon promotion rules

If this pr wants to promote an experimental addon to verified, you must check whether meet these conditions too:

  • This addon must be tested by addon's e2e-test to guarantee this addon can be enabled successfully.
  • This addon must have some basic but necessary information.
    • An accessible icon url and source url defined in addon's metadata.yaml.
    • A detail introduction include a basic example about how to use and what's the benefit of this addon in README.md.
    • Also provide an introduction in KubeVela documentation.
    • It's more likely to be accepted if useful examples provided in example dir.

@karl-chanel
Copy link
Author

grafana在配置使用pvc时,例如设置为1G的存储时,并不会生效使用PVC,而是使用emptydir,这个问题在prometheus和loki上没有,这个问题很久就存在了,我改了几个地方就可以了

// +usage=Specify the storage size to use. If empty, emptyDir will be used. Otherwise pvc will be used.
storage?: =~"^([1-9][0-9]{0,63})(E|P|T|G|M|K|Ei|Pi|Ti|Gi|Mi|Ki)$"
// +usage=Specify the storage class to use.
storageClassName?: string
// +usage=Specify the admin user for grafana
adminUser: *"admin" | string
// +usage=Specify the admin password for grafana
adminPassword: *"kubevela" | string
adminPassword: *"admin" | string
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we keep the same password?

// +usage=Specify the imagePullPolicy of the image
imagePullPolicy: *"IfNotPresent" | "Never" | "Always"
// +usage=Specify the number of CPU units
cpu: *0.5 | number
// +usage=Specifies the attributes of the memory resource required for the container.
memory: *"1024Mi" | string
// +usage=Specify the service type for expose prometheus server. Default to be ClusterIP.
serviceType: *"ClusterIP" | "NodePort" | "LoadBalancer"
serviceType: *"NodePort" | "ClusterIP" | "LoadBalancer"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we keep the same default type?

Copy link
Collaborator

@wonderflow wonderflow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@wonderflow
Copy link
Collaborator

please sign DCO

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants