Skip to content

Commit fcb8750

Browse files
committed
fix: fluent-bit sidecar and distributed logs service are not generated
1 parent 0ccdeed commit fcb8750

3 files changed

Lines changed: 3 additions & 5 deletions

File tree

stackgres-k8s/ci/utils/glabw

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/sh
22

33
mkdir -p ~/.config/glab-cli
4-
docker run -u "$(id -u):$(id -g)" -v /etc/passwd:/etc/passwd:ro -v "$HOME":"$HOME":ro -e PROMPT_COMMAND= --rm $([ -t 1 ] && printf %s -t) -i -v "$(pwd):$(pwd)" -w "$(pwd)" -v "$HOME/.config/glab-cli:$HOME/.config/glab-cli" registry.gitlab.com/gitlab-org/cli glab "$@"
4+
docker run -u "$(id -u):$(id -g)" -v /etc/passwd:/etc/passwd:ro -v "$HOME":"$HOME":ro -e PROMPT_COMMAND= --rm $([ -t 0 ] && printf %s -t) -i -v "$(pwd):$(pwd)" -w "$(pwd)" -v "$HOME/.config/glab-cli:$HOME/.config/glab-cli" registry.gitlab.com/gitlab-org/cli glab "$@"

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/fluentbit/FluentBit.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import io.stackgres.common.StackGresContainer;
2727
import io.stackgres.common.StackGresContext;
2828
import io.stackgres.common.StackGresUtil;
29-
import io.stackgres.common.StackGresVersion;
3029
import io.stackgres.common.StackGresVolume;
3130
import io.stackgres.common.crd.sgcluster.StackGresCluster;
3231
import io.stackgres.common.labels.LabelFactoryForCluster;
@@ -54,7 +53,7 @@
5453

5554
@Sidecar(StackGresContainer.FLUENT_BIT)
5655
@Singleton
57-
@OperatorVersionBinder(stopAt = StackGresVersion.V_1_15)
56+
@OperatorVersionBinder
5857
@RunningContainer(StackGresContainer.FLUENT_BIT)
5958
public class FluentBit implements
6059
ContainerFactory<ClusterContainerContext>,

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsService.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import io.fabric8.kubernetes.api.model.ServiceBuilder;
1515
import io.stackgres.common.PatroniUtil;
1616
import io.stackgres.common.StackGresUtil;
17-
import io.stackgres.common.StackGresVersion;
1817
import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs;
1918
import io.stackgres.common.labels.LabelFactoryForDistributedLogs;
2019
import io.stackgres.operator.conciliation.OperatorVersionBinder;
@@ -26,7 +25,7 @@
2625
import org.jooq.lambda.Seq;
2726

2827
@Singleton
29-
@OperatorVersionBinder(stopAt = StackGresVersion.V_1_15)
28+
@OperatorVersionBinder
3029
public class DistributedLogsService
3130
implements ResourceGenerator<StackGresDistributedLogsContext> {
3231

0 commit comments

Comments
 (0)