Skip to content

Commit 55179fc

Browse files
damdodamdo
committed
merge upstream/v1.6.4 into master
2 parents bb7f378 + 36c0e55 commit 55179fc

File tree

25,981 files changed

+3252
-7959732
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

25,981 files changed

+3252
-7959732
lines changed

‎.ci-operator.yaml‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎.dockerignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ Makefile
2222
# We need the following yaml files while building clusterctl in the container
2323
!cmd/clusterctl/config/manifest/clusterctl-api.yaml
2424
!cmd/clusterctl/client/cluster/assets/cert-manager-test-resources.yaml
25-
!openshift/manifests/*.yaml
2625

2726
# ignores changes to test-only code to avoid extra rebuilds
2827
test/e2e/**

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<!-- Thanks for sending a pull request! Here are some tips for you:
2+
1. If this is your first time, please read our contributor guidelines: https://github.com/kubernetes-sigs/cluster-api/blob/main/CONTRIBUTING.md#contributing-a-patch and developer guide https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/book/src/developer/guide.md
3+
4+
2. Please add an icon to the title of this PR (see https://sigs.k8s.io/cluster-api/CONTRIBUTING.md#contributing-a-patch), and delete this line and similar ones
5+
the icon will be either ⚠️ (:warning:, major or breaking changes), ✨ (:sparkles:, feature additions), 🐛 (:bug:, patch and bugfixes), 📖 (:book:, documentation or proposals), or 🌱 (:seedling:, minor or other)
6+
-->
7+
8+
**What this PR does / why we need it**:
9+
10+
**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
11+
Fixes #
12+
13+
<!--
14+
Please label this pull request according to what area(s) you are addressing. For reference on PR/issue labels, see: https://github.com/kubernetes-sigs/cluster-api/labels?q=area+
15+
16+
Area example:
17+
/area runtime-sdk
18+
-->

‎.github/workflows/pr-dependabot.yaml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: PR dependabot code generation and go modules fix
2+
3+
# This action runs on other PRs opened by dependabot. It updates modules and generated code on PRs opened by dependabot.
4+
on:
5+
pull_request:
6+
branches:
7+
- dependabot/**
8+
push:
9+
branches:
10+
- dependabot/**
11+
workflow_dispatch:
12+
13+
permissions:
14+
contents: write # Allow to update the PR.
15+
16+
jobs:
17+
build:
18+
name: Build
19+
runs-on: ubuntu-latest
20+
steps:
21+
- name: Check out code into the Go module directory
22+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4.1.1
23+
- name: Calculate go version
24+
id: vars
25+
run: echo "go_version=$(make go-version)" >> $GITHUB_OUTPUT
26+
- name: Set up Go
27+
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # tag=v4.1.0
28+
with:
29+
go-version: ${{ steps.vars.outputs.go_version }}
30+
- uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # tag=v3.3.2
31+
name: Restore go cache
32+
with:
33+
path: |
34+
~/.cache/go-build
35+
~/go/pkg/mod
36+
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
37+
restore-keys: |
38+
${{ runner.os }}-go-
39+
- name: Update all modules
40+
run: make generate-modules
41+
- name: Update generated code
42+
run: make generate
43+
- uses: EndBug/add-and-commit@1bad3abcf0d6ec49a5857d124b0bfb52dc7bb081 # tag=v9.1.3
44+
name: Commit changes
45+
with:
46+
author_name: dependabot[bot]
47+
author_email: 49699333+dependabot[bot]@users.noreply.github.com
48+
default_author: github_actor
49+
message: 'Update generated code'

‎.github/workflows/pr-golangci-lint.yaml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: PR golangci-lint
2+
3+
on:
4+
pull_request:
5+
types: [opened, edited, synchronize, reopened]
6+
7+
# Remove all permissions from GITHUB_TOKEN except metadata.
8+
permissions: {}
9+
10+
jobs:
11+
golangci:
12+
name: lint
13+
runs-on: ubuntu-latest
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
working-directory:
18+
- ""
19+
- test
20+
- hack/tools
21+
steps:
22+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4.1.1
23+
- name: Calculate go version
24+
id: vars
25+
run: echo "go_version=$(make go-version)" >> $GITHUB_OUTPUT
26+
- name: Set up Go
27+
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # tag=v4.1.0
28+
with:
29+
go-version: ${{ steps.vars.outputs.go_version }}
30+
- name: golangci-lint
31+
uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc # tag=v3.7.0
32+
with:
33+
version: v1.55.2
34+
args: --out-format=colored-line-number
35+
working-directory: ${{matrix.working-directory}}

‎.github/workflows/pr-md-link-check.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ jobs:
2020
use-quiet-mode: 'yes'
2121
config-file: .markdownlinkcheck.json
2222
check-modified-files-only: 'yes'
23-
base-branch: main
23+
base-branch: release-1.6

‎.github/workflows/pr-verify.yaml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: PR verify
2+
3+
on:
4+
pull_request_target:
5+
types: [opened, edited, synchronize, reopened]
6+
7+
permissions:
8+
checks: write # Allow access to checks to write check runs.
9+
10+
jobs:
11+
verify:
12+
runs-on: ubuntu-latest
13+
name: verify PR contents
14+
steps:
15+
- name: Verifier action
16+
id: verifier
17+
uses: kubernetes-sigs/kubebuilder-release-tools@3c3411345eedc489d1022288aa844691e92a9c29 # tag=v0.4.2
18+
with:
19+
github_token: ${{ secrets.GITHUB_TOKEN }}

‎.gitignore‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ cmd/clusterctl/config/manifest
6060

6161
# The golang vendor directory that contains local copies of external
6262
# dependencies that satisfy Go imports in this project.
63-
# vendor
63+
vendor
6464

6565
# User-supplied Tiltfile extensions, settings, and builds
6666
tilt.d
@@ -79,3 +79,13 @@ out
7979

8080
# Helm
8181
.helm
82+
83+
# Used during parts of the build process. Files _should_ get cleaned up automatically.
84+
# This is also a good location for any temporary manfiests used during development
85+
tmp
86+
87+
# asdf (not a typo! ;) used to manage multiple versions of tools
88+
.tool-versions
89+
90+
# Development container configurations (https://containers.dev/)
91+
.devcontainer

‎.snyk‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎CHANGELOG/OWNERS‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# See the OWNERS docs at https://go.k8s.io/owners
2+
3+
approvers:
4+
- cluster-api-release-lead
5+
6+
reviewers:
7+
- cluster-api-release-team

0 commit comments

Comments
 (0)