Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/ci_chart_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ jobs:
strategy:
matrix:
kubernetes-version:
- 'kindest/node:v1.14.10'
- 'kindest/node:v1.18.20'
- 'kindest/node:v1.21.10'
- 'kindest/node:v1.23.4'
steps:
Expand Down
1 change: 1 addition & 0 deletions docker/docker-compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ services:
container_name: pulsar
ports:
- "6650:6650"
- "8080:8080"
volumes:
- ./pulsar/data:/pulsar/data
command: bin/pulsar standalone
Expand Down
5 changes: 3 additions & 2 deletions docker/kubernetes/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,12 @@ keywords:

# The chart version number should be incremented each time you make changes
# to the chart and its templates.
version: 2.0.2
# x.y.z format, x.y keep same with the InLong version
version: 1.6.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: 1.2.0
appVersion: 1.6.0-SNAPSHOT

maintainers:
- name: dockerzhang
Expand Down
78 changes: 39 additions & 39 deletions docker/kubernetes/templates/NOTES.txt

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions docker/kubernetes/templates/agent-statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,18 +58,18 @@ spec:
{{- end }}
terminationGracePeriodSeconds: {{ .Values.agent.terminationGracePeriodSeconds }}
initContainers:
- name: wait-{{ .Values.dashboard.component }}-ready
- name: wait-{{ .Values.manager.component }}-ready
image: {{ .Values.images.initContainer.repository }}:{{ .Values.images.initContainer.tag }}
imagePullPolicy: {{ .Values.images.pullPolicy }}
command: [ "/bin/sh", "-c" ]
args:
- |
count={{ .Values.dashboard.replicas }}
count={{ .Values.manager.replicas }}
for i in $(seq 0 $(expr $count - 1))
do
replica="{{ template "inlong.fullname" . }}-{{ .Values.dashboard.component }}-$i"
host="$replica.{{ template "inlong.dashboard.hostname" . }}"
port={{ .Values.dashboard.port }}
replica="{{ template "inlong.fullname" . }}-{{ .Values.manager.component }}-$i"
host="$replica.{{ template "inlong.manager.hostname" . }}"
port={{ .Values.manager.port }}
until nc -z $host $port 2>/dev/null
do
echo "waiting for $replica to be ready"
Expand Down
1 change: 0 additions & 1 deletion docker/kubernetes/templates/zookeeper-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,5 @@ data:
export ZOO_MY_ID=$MY_POD_ID
export ZOO_DATA_DIR="/data/zoo_data/"
export ZOO_DATA_LOG_DIR="/data/zoo_log/"
export SERVER_JVMFLAGS="-Xmx1g -Xms1g"
/docker-entrypoint.sh zkServer.sh start-foreground
{{- end }}
2 changes: 1 addition & 1 deletion inlong-audit/audit-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>audit-common</artifactId>
<name>Apache InLong - Audit common</name>
<name>Apache InLong - Audit Common</name>

<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion inlong-audit/audit-sdk/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

<artifactId>audit-sdk</artifactId>
<packaging>jar</packaging>
<name>Apache InLong - Audit Sdk</name>
<name>Apache InLong - Audit SDK</name>

<dependencies>
<dependency>
Expand Down