Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use mesosphere stable charts repo for kafka-operator (2.8) #159

Merged
merged 5 commits into from
Oct 7, 2024
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
4 changes: 2 additions & 2 deletions .bloodhound.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ k8s_versions:

# paths to load (in that order)
paths:
- helm-repositories
- services
- services/zookeeper-operator
- services/kafka-operator/0.25.1

# use strict validation (reject unknown fields in resources)
strict: true
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ RUN apt-get update && apt-get install -y \
bzip2 \
git \
build-essential \
python-dev \
python-dev-is-python3 \
python3 \
python3-pip \
shellcheck \
&& rm -rf /var/lib/apt/lists/*

RUN pip3 install --upgrade pre-commit yamale yamllint awscli gitlint
RUN pip3 install --break-system-packages --upgrade pre-commit yamale yamllint awscli gitlint

ARG DOCKER_VERSION
RUN curl -fsSL https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz | \
Expand Down
2 changes: 1 addition & 1 deletion helm-repositories/banzaicloud/banzaicloud.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ metadata:
labels:
kommander.d2iq.io/dkp-airgapped: supported
spec:
url: "${helmMirrorURL:=https://kubernetes-charts.banzaicloud.com}"
url: "${helmMirrorURL:=https://mesosphere.github.io/charts/stable}"
interval: 10m
2 changes: 1 addition & 1 deletion make/ci.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CI_DOCKER_TAG ?= $(shell (cat $(CI_DOCKERFILE) $(CI_DOCKER_EXTRA_FILES) \
| shasum | awk '{ print $$1 }')
CI_DOCKER_IMG ?= $(GITHUB_ORG)/$(GITHUB_REPOSITORY)-ci:$(CI_DOCKER_TAG)

export GOLANG_VERSION ?= 1.19.1
export GOLANG_VERSION ?= 1.23.2
DOCKER_VERSION ?= 20.10.7

.PHONY: dockerauth
Expand Down
2 changes: 2 additions & 0 deletions make/release.mk
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,10 @@ endif
release.chart-bundle: kommander-cli
$(call print-target)
echo "Building charts bundle from dkp-catalog-applications repository: "
# skip kafka-operator charts for unsupported versions
$(KOMMANDER_CLI_BIN) create chart-bundle \
--catalog-repository $(REPO_ROOT) \
--skip-charts kafka-operator:0.20.0,kafka-operator:0.20.2,kafka-operator:0.23.0-dev.0 \
--output $(CHART_BUNDLE)

.PHONY: release.s3
Expand Down
4 changes: 1 addition & 3 deletions make/tools.mk
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ $(GOJQ_BIN):
.PHONY: kommander-cli
kommander-cli:
$(call print-target)
go install golang.org/dl/go1.19@latest
go1.19 download
CGO_ENABLED=0 go1.19 install github.com/mesosphere/kommander-cli/v2@$(KOMMANDER_CLI_VERSION)
CGO_ENABLED=0 go install github.com/mesosphere/kommander-cli/v2@$(KOMMANDER_CLI_VERSION)

.PHONY: gh-dkp
gh-dkp: ; $(info $(M) installing $*)
Expand Down
Loading