Skip to content

Commit

Permalink
Merge pull request #55 from lalithkota/1.3
Browse files Browse the repository at this point in the history
1.3 develop: Removed all dependencies as reorg in upstream. Cleaned up charts.
  • Loading branch information
lalithkota authored Dec 16, 2024
2 parents d8b7f71 + 5254ca9 commit 08c692b
Show file tree
Hide file tree
Showing 18 changed files with 14 additions and 771 deletions.
2 changes: 1 addition & 1 deletion charts/opensearch-kafka-connector/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: opensearch-kafka-connector
description: OpenSearch Kafka Connector Helm chart
type: application
version: 0.0.0-develop
version: 1.3.0-develop
dependencies:
- name: common
repository: oci://registry-1.docker.io/bitnamicharts
Expand Down
2 changes: 1 addition & 1 deletion charts/opensearch-kafka-connector/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ service:
image:
registry: docker.io
repository: openg2p/reporting-opensearch-kafka-connector
tag: develop
tag: 1.3
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
Expand Down
2 changes: 1 addition & 1 deletion charts/reporting-init/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: reporting-init
description: A Helm chart for initializing OpenG2P Reporting connectors.
type: application
version: 0.0.0-develop
version: 1.3.0-develop
dependencies:
- name: common
repository: oci://registry-1.docker.io/bitnamicharts
Expand Down
6 changes: 3 additions & 3 deletions charts/reporting-init/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
reportingInstallationName: '{{ .Release.Name }}-reporting'
debeziumInstallationName: '{{ tpl .Values.reportingInstallationName $ }}-debezium'
osKafkaConnectorInstallationName: '{{ tpl .Values.reportingInstallationName $ }}-os-kafka-connector'
opensearchInstallationName: '{{ tpl .Values.reportingInstallationName $ }}-opensearch'
opensearchInstallationName: '{{ .Release.Name }}-opensearch'
dedupeServiceInstallationName: '{{ .Release.Name }}-deduplicator-openg2p-deduplicator'
dedupeOpensearchInstallationName: '{{ .Release.Name }}-deduplicator-opensearch'
postgresqlInstallationName: '{{ .Release.Name }}-postgresql'
Expand All @@ -33,7 +33,7 @@ backoffLimit: 5
image:
registry: docker.io
repository: openg2p/reporting-init-shell-tools
tag: develop
tag: 1.3
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
Expand Down Expand Up @@ -130,7 +130,7 @@ dashboardsConnectorConfigMap: ""
gitConfig:
enabled: true
repoUrl: https://github.com/openg2p/openg2p-reporting
branch: develop
branch: 1.3
subDir: ""
envVars:
GIT_CONFIG_REPO_URL:
Expand Down
12 changes: 2 additions & 10 deletions charts/reporting/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,13 @@ apiVersion: v2
name: reporting
description: A Helm chart for OpenG2P Reporting module.
type: application
version: 0.0.0-develop
version: 1.3.0-develop
dependencies:
- name: kafka
repository: oci://registry-1.docker.io/bitnamicharts
version: 29.x.x
condition: kafka.enabled
- name: opensearch
version: 1.2.0
repository: oci://registry-1.docker.io/bitnamicharts
condition: opensearch.enabled
- name: debezium
version: 2.6.0
condition: debezium.enabled
- name: opensearch-kafka-connector
version: 0.0.0-develop
version: 1.3.0-develop
condition: opensearch-kafka-connector.enabled
icon: https://openg2p.github.io/openg2p-helm/openg2p-logo.png
annotations:
Expand Down
4 changes: 2 additions & 2 deletions charts/reporting/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Helm chart for installing reporting framework (infra for reporting).

This chart contains the following components:

- Kafka + Kafka UI
- OpenSearch
- Debezium Kafka Connector
- Opensearch Kafka Connector

Note: Reporting Charts versions lower than 1.3 install kafka and opensearch dependencies. Helm charts version 1.3.x and higher do NOT install the dependencies along with them.
21 changes: 0 additions & 21 deletions charts/reporting/templates/_helpers.tpl

This file was deleted.

15 changes: 0 additions & 15 deletions charts/reporting/templates/kafka-ui/configmap.yaml

This file was deleted.

104 changes: 0 additions & 104 deletions charts/reporting/templates/kafka-ui/deployment.yaml

This file was deleted.

42 changes: 0 additions & 42 deletions charts/reporting/templates/kafka-ui/gateway.yaml

This file was deleted.

29 changes: 0 additions & 29 deletions charts/reporting/templates/kafka-ui/service.yaml

This file was deleted.

39 changes: 0 additions & 39 deletions charts/reporting/templates/kafka-ui/virtualservice.yaml

This file was deleted.

23 changes: 0 additions & 23 deletions charts/reporting/templates/opensearch/configmap.yaml

This file was deleted.

Loading

0 comments on commit 08c692b

Please sign in to comment.