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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

馃尡 sync helm version and remove format-yaml #228

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

馃尡 sync helm version and remove format-yaml #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions .github/renovate/groups.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
{
packageRules: [
{
"description": "disable helm image update",
"matchManagers": ["dockerfile"],
"matchDepNames": ["docker.io/alpine/helm"],
"enabled": false
},
{
description: "Update Builder Image",
groupName: "Builder Image",
Expand Down
14 changes: 1 addition & 13 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,18 +405,6 @@ else
GO111MODULE=on golangci-lint run -v --fix
endif

.PHONY: format-yaml
format-yaml: ## Lint YAML files
ifeq ($(BUILD_IN_CONTAINER),true)
docker run --rm -t -i \
-v $(shell go env GOPATH)/pkg:/go/pkg$(MOUNT_FLAGS) \
-v $(shell pwd):/src/cluster-stack-operator$(MOUNT_FLAGS) \
$(BUILDER_IMAGE):$(BUILDER_IMAGE_VERSION) $@;
else
yamlfixer --version
yamlfixer -c .yamllint.yaml .
endif

##@ Lint
########
# Lint #
Expand Down Expand Up @@ -502,7 +490,7 @@ endif
lint: lint-golang lint-yaml lint-dockerfile lint-links ## Lint Codebase

.PHONY: format
format: format-golang format-yaml ## Format Codebase
format: format-golang ## Format Codebase

.PHONY: generate
generate: generate-manifests generate-go-deepcopy generate-modules ## Generate Files
Expand Down
4 changes: 2 additions & 2 deletions Tiltfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def fixup_yaml_empty_arrays(yaml_str):
## This should have the same versions as the Dockerfile
if settings.get("local_mode"):
tilt_dockerfile_header_cso = """
FROM docker.io/alpine/helm:3.12.2 as helm
FROM docker.io/alpine/helm:3.15.1 as helm

FROM docker.io/library/alpine:3.18.0 as tilt
WORKDIR /
Expand All @@ -124,7 +124,7 @@ if settings.get("local_mode"):
"""
else:
tilt_dockerfile_header_cso = """
FROM docker.io/alpine/helm:3.12.2 as helm
FROM docker.io/alpine/helm:3.15.1 as helm

FROM docker.io/library/alpine:3.18.0 as tilt
WORKDIR /
Expand Down
8 changes: 2 additions & 6 deletions images/builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,8 @@ RUN apk add --no-cache curl && \
FROM cgr.dev/chainguard/wolfi-base:latest as wolfi

# update: datasource=github-tags depName=kubernetes-sigs/cluster-api
ARG CLUSTERCTL_VERSION="v1.6.2"
# update: datasource=github-tags depName=helm/helm
ENV HELM_VERSION="v3.14.1"
ARG CLUSTERCTL_VERSION="v1.7.2"
ENV HELM_VERSION="v3.15.1"
# update: datasource=github-tags depName=kubernetes-sigs/kind
ARG KIND_VERSION="v0.20.0"
# update: datasource=github-tags depName=kubernetes/kubernetes
Expand Down Expand Up @@ -79,8 +78,6 @@ FROM docker.io/library/golang:1.21.6-bullseye

# update: datasource=github-tags depName=adrienverge/yamllint versioning=semver
ENV YAMLLINT_VERSION="v1.35.1"
# update: datasource=github-tags depName=opt-nc/yamlfixer versioning=semver
ENV YAMLFIXER_VERSION="0.9.15"

# hadolint ignore=DL3008
RUN apt-get update && \
Expand All @@ -91,7 +88,6 @@ RUN apt-get update && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
pip install --no-cache-dir \
yamllint==${YAMLLINT_VERSION} \
yamlfixer-opt-nc==${YAMLFIXER_VERSION}

COPY --from=wolfi /usr/bin/clusterctl /usr/bin/clusterctl
COPY --from=wolfi /usr/bin/controller-gen /usr/bin/controller-gen
Expand Down