* telegraf merge conflicts

* remove ent specific configs from oss and move to ent chart

* Revert "telegraf merge conflicts"

This reverts commit 5b9d593cde41ab8443826cea30dcb3f1d8a3047c.

* removes extra whitespace

* version bumps

* Use only values different from default in CI check test

* bump chart version

* feat(influxdb-enterprise): allow to specify meta service type

* feat(influxdb-enterprise): use meta service properties from Values

* feat(influxdb-enterprise): allow to specify meta and data service nodePort

* chore: bump chart version

* feat(enable-flux): add flux-enabled property

* feat(enable-flux): bump chart version

* add annotations to influxdb-enterprise/data-service

* bump influxdb-enterprise chart version

bump influxdb-enterprise chart version to v0.1.16

* adding annotations to meta.service

as proposed by tomklapka also meta services should have the option to have annotations

https://github.com/influxdata/helm-charts/pull/426#issuecomment-1050005446

* Update values.yaml

adding commet on meta.service.annotations

* Update meta-service.yaml

adding missing {{- end }}

* fixing serve.annotations in values.yaml

influxdb-enterprise
commenting in "annotations: {}" for data.service: and meta.service to prevent nil pointer evaluating

* adding meta.service.type to value.yaml

for influxdb-enterprise: adding meta.service.type to value.yaml to align with data.service:
commenting out service.annotations because now service has at least the type element, so no nil rendering should occure

* Update for InfluxDB Enterprise 1.9.6

* update certificate manager API to v1
Co-authored-by: Ales Pour <ales.pour@bonitoo.io>

* Update to InfluxDB Enterprise 1.9.5

* Update Chart.yaml

* switch back to v1 API

* Remove type

* add curly brackets to license

* set namespace to default

* enterprise license key via env secret
Co-authored-by: Ales Pour <ales.pour@bonitoo.io>

* update enterprise version to latest release

* Update Chart.yaml

version bump

* add space for failing lint

* add service account configuration for influxdb deployment

* bump chart version

* feat(influxdb-enterprise): add nodeport service

* feat(influxdb-enterprise): add nodeport service

```
        resources:
                    limits:
            cpu: 750m
            memory: 600Mi
          requests:
            cpu: 500m
            memory: 600Mi
```
corrects it to:
```
        resources:
          limits:
            cpu: 750m
            memory: 600Mi
          requests:
            cpu: 500m
            memory: 600Mi
```
Assuming your values file is set to:
```
bootstrap:
  auth:
    # A secret with keys "username" and "password" is required
    secretName: mysecret
  ddldml:
    configMap: my-ddl-dml-config
    resources:
      requests:
        memory: "600Mi"
        cpu: "500m"
      limits:
        memory: "600Mi"
        cpu: "750m"
```

* chore:update maintainers

* chore:bump version

* chore:bump version

* chore: version bump

* chore: version bump

* fix: add nodes/proxy permission for kubelet pod request

* fix: node/stats was incorrectly removed

* Update chart to try to resolve conflict

* Trying to resolve conflict

* Update where self-signed cert is mounted
Co-authored-by: David McKay <rawkode@pm.me>
Co-authored-by: David McKay <david@rawkode.com>

* feat: support mounting a ca bundle into the certs directory

* feat: support alternative secret for CA

* fix: don't strip newline

* Changing how images are passed in

* Add conditional to override tag as per fede

* Update to handle external commands and top level image

* Updating changes

* Fixed tagging

* Adding helper named template to get the image

* Template working

* chore: version bump

* fix: revert values.yaml changes
Co-authored-by: James Nieper <james.nieper@gmail.com>

* chore: remove verbose curl logging

* chore: add debugging comment to values.yaml

* fix: https for data port (#140)

* fix: https for data port (#140)

* fix(Enterprise): https for data port (#140)

fix: https for data port (#140)