forked from kubernetes-sigs/cluster-api
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #210 from spectrocloud/PCP-3412
PCP-3412 && PCP-3565 Cherry Pick
- Loading branch information
Showing
10 changed files
with
268 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| { | ||
| "repoOwner": "spectrocloud", | ||
| "repoName": "cluster-api", | ||
| "editor": "code", | ||
|
|
||
| "targetBranchChoices": ["spectro-master", "spectro-release-4.5"], | ||
| "mainline": 1, | ||
| "autoMerge": false, | ||
| "autoMergeMethod": "squash", | ||
| "targetPRLabels": ["ok-to-test"], | ||
| "commitConflicts": true, | ||
| "branchLabelMapping": { | ||
| "^backport-(.+)$": "$1" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| name: Backport | ||
|
|
||
| on: | ||
| pull_request_target: | ||
| types: ["labeled", "closed"] | ||
|
|
||
| jobs: | ||
| backport: | ||
| name: Backport PR | ||
| runs-on: ubuntu-latest | ||
| if: | | ||
| github.event.pull_request.merged == true | ||
| && contains(github.event.pull_request.labels.*.name, 'auto-backport') | ||
| && ( | ||
| (github.event.action == 'labeled' && github.event.label.name == 'auto-backport') | ||
| || (github.event.action == 'closed') | ||
| ) | ||
| steps: | ||
| - name: Backport Action | ||
| uses: sqren/backport-github-action@v9.2.2 | ||
| with: | ||
| github_token: ${{ secrets.GITHUB_TOKEN }} | ||
| auto_backport_label_prefix: backport- | ||
| add_original_reviewers: true | ||
|
|
||
| - name: Info log | ||
| if: ${{ success() }} | ||
| run: cat ~/.backport/backport.info.log | ||
|
|
||
| - name: Debug log | ||
| if: ${{ failure() }} | ||
| run: cat ~/.backport/backport.debug.log |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
137 changes: 137 additions & 0 deletions
137
bootstrap/kubeadm/internal/cloudinit/kubeadm-bootstrap-script-pre-k8s-1-31.sh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| #!/bin/bash | ||
| # Copyright 2020 The Kubernetes Authors. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| # Log an error and exit. | ||
| # Args: | ||
| # $1 Message to log with the error | ||
| # $2 The error code to return | ||
| log::error_exit() { | ||
| local message="${1}" | ||
| local code="${2}" | ||
|
|
||
| log::error "${message}" | ||
| # {{ if .ControlPlane }} | ||
| log::info "Removing member from cluster status" | ||
| kubeadm reset -f update-cluster-status || true | ||
| log::info "Removing etcd member" | ||
| kubeadm reset -f remove-etcd-member || true | ||
| # {{ end }} | ||
| log::info "Resetting kubeadm" | ||
| kubeadm reset -f || true | ||
| log::error "cluster.x-k8s.io kubeadm bootstrap script $0 exiting with status ${code}" | ||
| exit "${code}" | ||
| } | ||
|
|
||
| log::success_exit() { | ||
| log::info "cluster.x-k8s.io kubeadm bootstrap script $0 finished" | ||
| exit 0 | ||
| } | ||
|
|
||
| # Log an error but keep going. | ||
| log::error() { | ||
| local message="${1}" | ||
| timestamp=$(date --iso-8601=seconds) | ||
| echo "!!! [${timestamp}] ${1}" >&2 | ||
| shift | ||
| for message; do | ||
| echo " ${message}" >&2 | ||
| done | ||
| } | ||
|
|
||
| # Print a status line. Formatted to show up in a stream of output. | ||
| log::info() { | ||
| timestamp=$(date --iso-8601=seconds) | ||
| echo "+++ [${timestamp}] ${1}" | ||
| shift | ||
| for message; do | ||
| echo " ${message}" | ||
| done | ||
| } | ||
|
|
||
| check_kubeadm_command() { | ||
| local command="${1}" | ||
| local code="${2}" | ||
| case ${code} in | ||
| "0") | ||
| log::info "kubeadm reported successful execution for ${command}" | ||
| ;; | ||
| "1") | ||
| log::error "kubeadm reported failed action(s) for ${command}" | ||
| ;; | ||
| "2") | ||
| log::error "kubeadm reported preflight check error during ${command}" | ||
| ;; | ||
| "3") | ||
| log::error_exit "kubeadm reported validation error for ${command}" "${code}" | ||
| ;; | ||
| *) | ||
| log::error "kubeadm reported unknown error ${code} for ${command}" | ||
| ;; | ||
| esac | ||
| } | ||
|
|
||
| function retry-command() { | ||
| n=0 | ||
| local kubeadm_return | ||
| until [ $n -ge 5 ]; do | ||
| log::info "running '$*'" | ||
| # shellcheck disable=SC1083 | ||
| "$@" --config=/run/kubeadm/kubeadm-join-config.yaml {{.KubeadmVerbosity}} | ||
| kubeadm_return=$? | ||
| check_kubeadm_command "'$*'" "${kubeadm_return}" | ||
| if [ ${kubeadm_return} -eq 0 ]; then | ||
| break | ||
| fi | ||
| # We allow preflight errors to pass | ||
| if [ ${kubeadm_return} -eq 2 ]; then | ||
| break | ||
| fi | ||
| n=$((n + 1)) | ||
| sleep 15 | ||
| done | ||
| if [ ${kubeadm_return} -ne 0 ]; then | ||
| log::error_exit "too many errors, exiting" "${kubeadm_return}" | ||
| fi | ||
| } | ||
|
|
||
| # {{ if .ControlPlane }} | ||
| function try-or-die-command() { | ||
| local kubeadm_return | ||
| log::info "running '$*'" | ||
| # shellcheck disable=SC1083 | ||
| "$@" --config=/run/kubeadm/kubeadm-join-config.yaml {{.KubeadmVerbosity}} | ||
| kubeadm_return=$? | ||
| check_kubeadm_command "'$*'" "${kubeadm_return}" | ||
| if [ ${kubeadm_return} -ne 0 ]; then | ||
| log::error_exit "fatal error, exiting" "${kubeadm_return}" | ||
| fi | ||
| } | ||
| # {{ end }} | ||
|
|
||
| retry-command kubeadm join phase preflight --ignore-preflight-errors=DirAvailable--etc-kubernetes-manifests | ||
| # {{ if .ControlPlane }} | ||
| retry-command kubeadm join phase control-plane-prepare download-certs | ||
| retry-command kubeadm join phase control-plane-prepare certs | ||
| retry-command kubeadm join phase control-plane-prepare kubeconfig | ||
| retry-command kubeadm join phase control-plane-prepare control-plane | ||
| # {{ end }} | ||
| retry-command kubeadm join phase kubelet-start | ||
| # {{ if .ControlPlane }} | ||
| try-or-die-command kubeadm join phase control-plane-join etcd | ||
| retry-command kubeadm join phase control-plane-join update-status | ||
| retry-command kubeadm join phase control-plane-join mark-control-plane | ||
| # {{ end }} | ||
|
|
||
| log::success_exit |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.