diff --git a/charts/topology-discovery/Chart.yaml b/charts/topology-discovery/Chart.yaml index 4b293b1c..ddffa9c6 100644 --- a/charts/topology-discovery/Chart.yaml +++ b/charts/topology-discovery/Chart.yaml @@ -3,14 +3,14 @@ name: topology-discovery description: A Helm chart for Kubernetes deployment of the Topology Discovery icon: https://avatars.githubusercontent.com/u/23452093?s=200&v=4 type: application -version: 3.1.1 -appVersion: "6.2.5" +version: 4.0.0 +appVersion: "7.0.3" maintainers: - name: FRINX annotations: artifacthub.io/changes: | - kind: changed - description: curls are performed using custom utilities image + description: Compatible with 7.0.0 release. Environment variable changes links: - name: GitHub PR - url: https://github.com/FRINXio/helm-charts/pull/413 + url: https://github.com/FRINXio/helm-charts/pull/428 diff --git a/charts/topology-discovery/README.md b/charts/topology-discovery/README.md index 80aa7998..21871e69 100644 --- a/charts/topology-discovery/README.md +++ b/charts/topology-discovery/README.md @@ -2,7 +2,7 @@ A Helm chart for Kubernetes deployment of the Topology Discovery -![Version: 3.1.1](https://img.shields.io/badge/Version-3.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.2.5](https://img.shields.io/badge/AppVersion-6.2.5-informational?style=flat-square) +![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.0.3](https://img.shields.io/badge/AppVersion-7.0.3-informational?style=flat-square) ## Get Repo Info @@ -40,7 +40,7 @@ helm uninstall [RELEASE_NAME] | dbPersistence.ARANGO_USERNAME | string | `"root"` | Database credentials. Exposed when existing dbPersistence.existingSecret.secretName is empty | | dbPersistence.existingSecret | object | `{"arangoRootPasswordKey":null,"arangoUsernameKey":null,"secretName":null}` | Existing database credentials | | deployment.annotations | object | `{}` | Deployment annotations | -| env | object | `{"ADMIN":"admin","BGPLS_ENABLED":false,"BGPLS_LOCAL_AS":100,"BGPLS_NEIGHBOR_IP":"192.168.99.100","BGPLS_NETWORK":"172.18.0.0/16","BGPLS_PEER_AS":100,"BGPLS_ROUTER_ID":"192.168.99.1","CONDUCTOR_URL":"http://conductor-server:8080","EDITOR":"editor","IMPORT_ARANGO_DEMO_DATA":false,"IMPORT_DEVICE_INVENTORY_DATA":false,"TD_KAFKA__API_VERSION":"[\"0\", \"11\", \"5\"]","TD_KAFKA__BOOTSTRAP_SERVERS":"[\"kafka:9092\"]","TD_KAFKA__TOPICS__DEVICE_EVENTS_TOPIC":"device-events","TD_KAFKA__TOPICS__DEVICE_INVENTORY_TOPIC":"device-inventory","UC_URL_BASE":"http://uniconfig:8181/rests/","VIEWER":"viewer","X_TENANT_ID":"frinx"}` | Application environment variables | +| env | object | `{"ADMIN":"admin","CONDUCTOR_URL":"http://conductor-server:8080","EDITOR":"editor","IMPORT_ARANGO_DEMO_DATA":false,"IMPORT_DEVICE_INVENTORY_DATA":false,"TD_BGPLS__ENABLED":false,"TD_BGPLS__LOCAL_AS":100,"TD_BGPLS__NEIGHBOR_IP":"192.168.99.100","TD_BGPLS__NETWORK":"172.18.0.0/16","TD_BGPLS__PEER_AS":100,"TD_BGPLS__ROUTER_ID":"192.168.99.1","TD_KAFKA__API_VERSION":"[\"0\", \"11\", \"5\"]","TD_KAFKA__BOOTSTRAP_SERVERS":"[\"kafka:9092\"]","TD_KAFKA__TOPICS__DEVICE_INVENTORY_TOPIC":"device-inventory","TD_SYNC__APPEND_PROTOCOL_TO_DEVICE_NAMES":true,"TD_UNICONFIG__URL_BASE":"http://uniconfig:8181/rests/","VIEWER":"viewer","X_TENANT_ID":"frinx"}` | Application environment variables | | fullnameOverride | string | `""` | String to partially override app name | | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | | image.repository | string | `"frinx/topology-discovery"` | topology-discovery image repository | @@ -71,5 +71,3 @@ helm uninstall [RELEASE_NAME] | utilitiesImage.repository | string | `"frinx/utilities-alpine"` | utilities image repository | | utilitiesImage.tag | string | `"1.2"` | Overrides the image tag. | ----------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/topology-discovery/values.yaml b/charts/topology-discovery/values.yaml index b04c5350..3b7fec00 100644 --- a/charts/topology-discovery/values.yaml +++ b/charts/topology-discovery/values.yaml @@ -135,13 +135,14 @@ dbPersistence: # -- Application environment variables env: CONDUCTOR_URL: 'http://conductor-server:8080' - UC_URL_BASE: http://uniconfig:8181/rests/ - BGPLS_ENABLED: false - BGPLS_NETWORK: 172.18.0.0/16 - BGPLS_ROUTER_ID: 192.168.99.1 - BGPLS_NEIGHBOR_IP: 192.168.99.100 - BGPLS_LOCAL_AS: 100 - BGPLS_PEER_AS: 100 + TD_UNICONFIG__URL_BASE: http://uniconfig:8181/rests/ + TD_BGPLS__ENABLED: false + TD_BGPLS__NETWORK: 172.18.0.0/16 + TD_BGPLS__ROUTER_ID: 192.168.99.1 + TD_BGPLS__NEIGHBOR_IP: 192.168.99.100 + TD_BGPLS__LOCAL_AS: 100 + TD_BGPLS__PEER_AS: 100 + TD_SYNC__APPEND_PROTOCOL_TO_DEVICE_NAMES: true ADMIN: admin EDITOR: editor VIEWER: viewer @@ -149,7 +150,6 @@ env: IMPORT_DEVICE_INVENTORY_DATA: false X_TENANT_ID: "frinx" TD_KAFKA__TOPICS__DEVICE_INVENTORY_TOPIC: device-inventory - TD_KAFKA__TOPICS__DEVICE_EVENTS_TOPIC: device-events TD_KAFKA__BOOTSTRAP_SERVERS: '["kafka:9092"]' TD_KAFKA__API_VERSION: '["0", "11", "5"]' diff --git a/charts/uniconfig/Chart.yaml b/charts/uniconfig/Chart.yaml index d50591ea..dc65b11f 100644 --- a/charts/uniconfig/Chart.yaml +++ b/charts/uniconfig/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: uniconfig -version: 8.2.1 -appVersion: "6.1.1" +version: 8.2.2 +appVersion: "7.0.0" description: A Helm chart for UniConfig Kubernetes deployment type: application home: https://github.com/FRINXio/helm-charts @@ -22,7 +22,12 @@ icon: https://avatars.githubusercontent.com/u/23452093?s=200&v=4 annotations: artifacthub.io/changes: | - kind: changed - description: Monitoring to metrics configuration + description: Bump appVersion links: - name: GitHub PR - url: https://github.com/FRINXio/helm-charts/pull/418 + url: https://github.com/FRINXio/helm-charts/pull/429 + - kind: fixed + description: Fix extraContainers templating + links: + - name: GitHub PR + url: https://github.com/FRINXio/helm-charts/pull/429 diff --git a/charts/uniconfig/README.md b/charts/uniconfig/README.md index a4d4aad5..df6ca765 100644 --- a/charts/uniconfig/README.md +++ b/charts/uniconfig/README.md @@ -2,7 +2,7 @@ A Helm chart for UniConfig Kubernetes deployment -![Version: 8.2.1](https://img.shields.io/badge/Version-8.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.1.1](https://img.shields.io/badge/AppVersion-6.1.1-informational?style=flat-square) +![Version: 8.2.2](https://img.shields.io/badge/Version-8.2.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.0.0](https://img.shields.io/badge/AppVersion-7.0.0-informational?style=flat-square) ## Get Repo Info diff --git a/charts/uniconfig/templates/deployment.yaml b/charts/uniconfig/templates/deployment.yaml index 55a6ae79..1ecadecf 100644 --- a/charts/uniconfig/templates/deployment.yaml +++ b/charts/uniconfig/templates/deployment.yaml @@ -237,33 +237,5 @@ spec: readOnly: {{ .readOnly }} {{- end }} {{- with .Values.extraContainers }} - {{- range . }} - - name: {{ .name }} - image: {{ .image | quote }} - imagePullPolicy: {{ .imagePullPolicy | quote }} - {{- if .command }} - command: - {{- toYaml .command | nindent 12 }} - {{- end }} - {{- if .args }} - args: - {{- toYaml .args | nindent 12 }} - {{- end }} - {{- if .ports }} - ports: - {{- toYaml .ports | nindent 12 }} - {{- end }} - {{- if .env }} - env: - {{- toYaml .env | nindent 12 }} - {{- end }} - {{- if .resources }} - resources: - {{- toYaml .resources | nindent 12 }} - {{- end }} - {{- if .volumeMounts }} - volumeMounts: - {{- toYaml .volumeMounts | nindent 12 }} - {{- end }} + {{- toYaml . | nindent 8 }} {{- end }} - {{- end }} \ No newline at end of file