Skip to content

Commit

Permalink
test auto-merge
Browse files Browse the repository at this point in the history
Signed-off-by: André Martins <andre@cilium.io>
  • Loading branch information
aanm committed Jun 18, 2024
1 parent 1391f81 commit cd193df
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 3 deletions.
31 changes: 31 additions & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,37 @@
"^make manifests$"
],
"packageRules": [
{
"matchPackageNames": [
"go", // golang version directive upgrade in go.mod
],
"matchPackagePrefixes": [
"docker.io/library/", // official Docker images
"github.com/golang/", // Golang official org
"golang.org/x/", // Golang official experimental org
"google.golang.org/", // Google official repo for api/genproto/grpc/protobuf
"github.com/google/", // Google official github org
"k8s.io/", // Kubernetes official repo
"sigs.k8s.io/", // Kubernetes official SIG repo
"quay.io/lvh-images/", // LVH images
"quay.io/cilium/", // LVH images
"github.com/cilium/", // Any Cilium dependency
"renovatebot/renovate", // Renovate bot
],
"matchUpdateTypes": [
"patch",
"pin",
"pinDigest",
"digest",
"lockFileMaintenance",
"rollback",
"bump",
"replacement"
],
"automerge": true,
"automergeType": "pr-comment",
"automergeComment": "/test"
},
{
// Try to group all updates for all dependencies in a single PR. More
// specific packageRules are followed by this one.
Expand Down
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -263,10 +263,9 @@ manifests: ## Generate K8s manifests e.g. CRD, RBAC etc.
$(eval TMPDIR := $(shell mktemp -d -t cilium.tmpXXXXXXXX))
$(QUIET)$(GO) run sigs.k8s.io/controller-tools/cmd/controller-gen $(CRD_OPTIONS) paths=$(CRD_PATHS) output:crd:artifacts:config="$(TMPDIR)"
$(QUIET)$(GO) run ./tools/crdcheck "$(TMPDIR)"

# Clean up old CRD state and start with a blank state.
@
for path in $(CRDS_CILIUM_PATHS); do rm -rf $${path} && mkdir $${path}; done

@
for file in $(CRDS_CILIUM_V2); do mv ${TMPDIR}/cilium.io_$${file}.yaml ./pkg/k8s/apis/cilium.io/client/crds/v2/$${file}.yaml; done
for file in $(CRDS_CILIUM_V2ALPHA1); do mv ${TMPDIR}/cilium.io_$${file}.yaml ./pkg/k8s/apis/cilium.io/client/crds/v2alpha1/$${file}.yaml; done
rm -rf $(TMPDIR)
Expand Down

0 comments on commit cd193df

Please sign in to comment.