From ad3721dce85c3662564e17b45513d6903988ce97 Mon Sep 17 00:00:00 2001 From: Patryk Matuszak <305846+pmtk@users.noreply.github.com> Date: Wed, 15 Mar 2023 16:05:22 +0100 Subject: [PATCH 1/8] backport rebase.py and edit KAS defaultconfig --- scripts/auto-rebase/create_pr.py | 125 ------ scripts/auto-rebase/rebase.py | 424 +++++++++++++++++++ scripts/auto-rebase/rebase.sh | 7 +- scripts/auto-rebase/rebase_job_entrypoint.sh | 22 +- 4 files changed, 440 insertions(+), 138 deletions(-) delete mode 100755 scripts/auto-rebase/create_pr.py create mode 100755 scripts/auto-rebase/rebase.py diff --git a/scripts/auto-rebase/create_pr.py b/scripts/auto-rebase/create_pr.py deleted file mode 100755 index b921a4b16a..0000000000 --- a/scripts/auto-rebase/create_pr.py +++ /dev/null @@ -1,125 +0,0 @@ -#!/usr/bin/env python - -"""Pull Request Creator - -This script pushes current branch and creates GitHub Pull Request. -It's intended to be used as a GitHub App and requires following environment variables: -- APP_ID - application id, get from app's about page (https://github.com/settings/apps/$APP_NAME) -- KEY - path to application's private key - generate on app's about page -- ORG - organization -- REPO - repository - -App requires following permissions: -- Contents Read+Write - to push branches -- Pull requests Read+Write - to create PRs -""" - -import os -import re -import sys -from git import Repo, PushInfo # GitPython -from github import GithubIntegration, Github, GithubException # pygithub -from pathlib import Path - -APP_ID_ENV = "APP_ID" -KEY_ENV = "KEY" -ORG_ENV = "ORG" -REPO_ENV = "REPO" -JOB_NAME_ENV = "JOB_NAME" - -BOT_REMOTE_NAME = "bot-creds" -JOB_NAME_REGEXP = "periodic-ci-openshift-microshift-(.+)-periodics-rebase-on-nightlies" - - -def try_get_env(var_name): - val = os.getenv(var_name) - if val is None or val == "": - sys.exit(f"Env var {var_name} is empty") - return val - - -def get_expected_base_branch(): - return re.search(JOB_NAME_REGEXP, try_get_env(JOB_NAME_ENV)).group(1) - - -app_id = try_get_env(APP_ID_ENV) -key_path = try_get_env(KEY_ENV) -org = try_get_env(ORG_ENV) -repo = try_get_env(REPO_ENV) -expected_base = get_expected_base_branch() - - -def commit_str(commit): - return f"{commit.hexsha[:8]} - {commit.summary}" - - -def create_or_get_pr_url(ghrepo): - prs = ghrepo.get_pulls( - base=expected_base, head=f"{org}:{r.active_branch.name}", state="all") - if prs.totalCount == 1: - print( - f"{prs[0].state.capitalize()} pull request exists already: {prs[0].html_url}") - elif prs.totalCount > 1: - print( - f"Found several existing PRs for '{r.active_branch.name}': {[(x.state, x.html_url) for x in prs]}") - else: - body = f"{r.active_branch.name}\n\n/label tide/merge-method-squash" - pr = ghrepo.create_pull(title=r.active_branch.name, body=body, - base=expected_base, head=r.active_branch.name, maintainer_can_modify=True) - print(f"Created pull request: {pr.html_url}") - - -integration = GithubIntegration(app_id, Path(key_path).read_text()) -app_installation = integration.get_installation(org, repo) -if app_installation == None: - sys.exit( - f"Failed to get app_installation for {org}/{repo}. Response: {app_installation.raw_data}") -installation_access_token = integration.get_access_token( - app_installation.id).token -gh = Github(installation_access_token) -ghrepo = gh.get_repo(f"{org}/{repo}") - -r = Repo('.') -if r.active_branch.commit == r.branches[expected_base].commit: - print( - f"There's no new commit on branch {r.active_branch} compared to '{expected_base}'.\nLast commit: {r.active_branch.commit.hexsha[:8]} - \n\n{r.active_branch.commit.summary}'") - sys.exit(0) - -remote_url = f"https://x-access-token:{installation_access_token}@github.com/{org}/{repo}" -try: - remote = r.remote(BOT_REMOTE_NAME) - remote.set_url(remote_url) -except ValueError: - r.create_remote(BOT_REMOTE_NAME, remote_url) - -remote = r.remote(BOT_REMOTE_NAME) -remote.fetch() - -# Check if branch with the same name exists in remote -matching_remote_branches = [ - ref for ref in remote.refs if BOT_REMOTE_NAME + "/" + r.active_branch.name == ref.name] -if len(matching_remote_branches) == 1: - # Compare local and remote rebase branches by looking at their start on {expected_base} branch (commit from which they branched off) - merge_base_prev_rebase = r.merge_base( - expected_base, matching_remote_branches[0].name) - merge_base_cur_rebase = r.merge_base(expected_base, r.active_branch.name) - if merge_base_prev_rebase[0] == merge_base_cur_rebase[0]: - print(f"Branch {r.active_branch} already exists on remote and it's up to date.\n\ -Branch-off commit: {commit_str(merge_base_cur_rebase[0])}\n") - create_or_get_pr_url(ghrepo) - sys.exit(0) - else: - print(f"Branch {r.active_branch} already exists on remote but it's out of date.\n\ -Old branch-off commit: {commit_str(merge_base_prev_rebase[0])}\n\ -New branch-off commit: {commit_str(merge_base_cur_rebase[0])}\n") - -push_result = remote.push(r.active_branch.name, force=True) -if len(push_result) != 1: - sys.exit( - f"Unexpected amount ({len(push_result)}) of items in push_result: {push_result}") -if push_result[0].flags & PushInfo.ERROR: - sys.exit(f"Pushing branch failed: {push_result[0].summary}") -if push_result[0].flags & PushInfo.FORCED_UPDATE: - print("Branch was updated (force push)") - -create_or_get_pr_url(ghrepo) diff --git a/scripts/auto-rebase/rebase.py b/scripts/auto-rebase/rebase.py new file mode 100755 index 0000000000..785efe4f35 --- /dev/null +++ b/scripts/auto-rebase/rebase.py @@ -0,0 +1,424 @@ +#!/usr/bin/env python + +import json +import logging +import os +import subprocess +import sys +import textwrap +from collections import namedtuple +from pathlib import Path +from timeit import default_timer as timer + +from git import PushInfo, Repo # GitPython +from github import Github, GithubException, GithubIntegration # pygithub + +APP_ID_ENV = "APP_ID" # GitHub App's ID +KEY_ENV = "KEY" # Path to GitHub App's key +PAT_ENV = "TOKEN" # Personal Access Token +ORG_ENV = "ORG" +REPO_ENV = "REPO" +AMD64_RELEASE_ENV = "AMD64_RELEASE" +ARM64_RELEASE_ENV = "ARM64_RELEASE" +JOB_NAME_ENV = "JOB_NAME" +BUILD_ID_ENV = "BUILD_ID" +DRY_RUN_ENV = "DRY_RUN" +BASE_BRANCH_ENV = "BASE_BRANCH" + +BOT_REMOTE_NAME = "bot-creds" +REMOTE_ORIGIN = "origin" + +# List of reviewers to always requestes review from +REVIEWERS = [] + +# If True, then just log action such as branch push and PR or comment creation +REMOTE_DRY_RUN = False + +_extra_msgs = [] + +logging.basicConfig(level=logging.INFO, format='%(asctime)s %(levelname)s %(message)s') + + +RebaseScriptResult = namedtuple("RebaseScriptResult", ["success", "output"]) + + +def try_get_env(var_name, die=True): + val = os.getenv(var_name) + if val is None or val == "": + if die: + logging.error(f"Could not get environment variable '{var_name}'") + sys.exit(f"Could not get environment variable '{var_name}'") + else: + logging.info(f"Could not get environment variable '{var_name}' - ignoring") + return "" + return val + + +def run_rebase_sh(release_amd64, release_arm64): + script_dir = os.path.abspath(os.path.dirname(__file__)) + args = [f"{script_dir}/rebase.sh", "to", release_amd64, release_arm64] + logging.info(f"Running: '{' '.join(args)}'") + start = timer() + result = subprocess.run(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True) + logging.info(f"Return code: {result.returncode}. Output:\n" + + "==================================================\n" + + f"{result.stdout}" + + "==================================================\n") + end = timer() - start + logging.info(f"Script returned code: {result.returncode}. It ran for {end/60:.0f}m{end%60:.0f}s.") + return RebaseScriptResult(success=result.returncode == 0, output=result.stdout) + + +def commit_str(commit): + return f"{commit.hexsha[:8]} - {commit.summary}" + + +def get_installation_access_token(app_id, key_path, org, repo): + integration = GithubIntegration(app_id, Path(key_path).read_text()) + app_installation = integration.get_installation(org, repo) + if app_installation == None: + sys.exit(f"Failed to get app_installation for {org}/{repo}. Response: {app_installation.raw_data}") + return integration.get_access_token(app_installation.id).token + + +def make_sure_rebase_script_created_new_commits_or_exit(git_repo, base_branch): + if git_repo.active_branch.commit == git_repo.branches[base_branch].commit: + logging.info(f"There's no new commit on branch {git_repo.active_branch} compared to '{base_branch}' " + "meaning that the rebase.sh script didn't create any commits and " + "MicroShift is already rebased on top of given release.\n" + f"Last commit: {commit_str(git_repo.active_branch.commit)}") + sys.exit(0) + + +def rebase_script_made_changes_considered_functional(git_repo, base_branch): + logging.info(f"Deciding if PR should be created by diffing against {base_branch} branch") + diffs = git_repo.active_branch.commit.diff(base_branch) + logging.info(f"Following files changed: {[ d.a_path for d in diffs ]}") + + for d in diffs: + if 'scripts/auto-rebase/' in d.a_path: + logging.info(f" - {d.a_path} - ignoring") + continue + + if "assets/release/release-" in d.a_path: + old_images = set(json.loads(d.a_blob.data_stream.read())['images'].items()) + new_images = set(json.loads(d.b_blob.data_stream.read())['images'].items()) + diff = old_images ^ new_images + if not diff: + logging.info(f" - {d.a_path} - images did not change - ignoring") + continue + logging.info(f" - {d.a_path} - images changed") + return True + + logging.info(f" - File {d.a_path} is considered functional") + return True + + return False + + +def get_remote_with_token(git_repo, token, org, repo): + remote_url = f"https://x-access-token:{token}@github.com/{org}/{repo}" + try: + remote = git_repo.remote(BOT_REMOTE_NAME) + remote.set_url(remote_url) + except ValueError: + git_repo.create_remote(BOT_REMOTE_NAME, remote_url) + + return git_repo.remote(BOT_REMOTE_NAME) + + +def try_get_rebase_branch_ref_from_remote(remote, branch_name): + remote.fetch() + matching_remote_refs = [ref for ref in remote.refs if BOT_REMOTE_NAME + "/" + branch_name == ref.name] + + if len(matching_remote_refs) == 0: + logging.info(f"Branch '{branch_name}' does not exist on remote") + return None + + if len(matching_remote_refs) > 1: + matching_branches = ", ".join([r.name for r in matching_remote_refs]) + logging.warning(f"Found more than one branch matching '{branch_name}' on remote: {matching_branches}. Taking first one") + _extra_msgs.append(f"Found more than one branch matching '{branch_name}' on remote: {matching_branches}.") + return matching_remote_refs[0] + + if len(matching_remote_refs) == 1: + logging.info(f"Branch '{branch_name}' already exists on remote") + return matching_remote_refs[0] + + +def is_local_branch_based_on_newer_base_branch_commit(git_repo, base_branch_name, remote_branch_name, local_branch_name): + """ + Compares local and remote rebase branches by looking at their start on base branch. + Returns True if local branch is starts on newer commit and needs to be pushed to remote, otherwise False. + """ + remote_merge_base = git_repo.merge_base(base_branch_name, remote_branch_name) + local_merge_base = git_repo.merge_base(base_branch_name, local_branch_name) + + if remote_merge_base[0] == local_merge_base[0]: + logging.info(f"Remote branch is up to date. Branch-off commit: {commit_str(remote_merge_base[0])}") + return False + else: + logging.info(f"Remote branch is older - it needs updating. " + f"Remote branch is on top of {base_branch_name}'s commit: '{commit_str(remote_merge_base[0])}'. " + f"Local branch is on top of {base_branch_name}'s commit '{commit_str(local_merge_base[0])}'") + return True + + +def try_get_pr(gh_repo, org, base_branch, branch_name): + prs = gh_repo.get_pulls(base=base_branch, head=f"{org}:{branch_name}", state="all") + + if prs.totalCount == 0: + logging.info(f"PR for branch {branch_name} does not exist yet on {gh_repo.full_name}") + return None + + pr = None + if prs.totalCount > 1: + pr = prs[0] + logging.warning(f"Found more than one PR for branch {branch_name} on {gh_repo.full_name} - this is unexpected, continuing with first one of: {[(x.state, x.html_url) for x in prs]}") + + if prs.totalCount == 1: + pr = prs[0] + logging.info(f"Found PR #{pr.number} for branch {branch_name} on {gh_repo.full_name}: {pr.html_url}") + + if pr.state == 'closed': + logging.warning(f"PR #{pr.number} is not open - new PR will be created") + if pr.is_merged(): + logging.warning(f"PR #{pr.number} for '{branch_name}' branch is already merged but rebase.sh produced results") + _extra_msgs.append(f"PR #{pr.number} for '{branch_name}' was already merged but rebase.sh produced results") + else: + _extra_msgs.append(f"PR #{pr.number} for '{branch_name}' exists already but was closed") + return None + return pr + + +def generate_pr_description(branch_name, amd_tag, arm_tag, prow_job_url, rebase_script_succeded): + try: + with open("scripts/auto-rebase/changelog.txt", "r") as f: + changelog = f.read() + except Exception as e: + logging.warn(f"Unable to read changelog file: {e}") + changelog = "" + + base = textwrap.dedent(f""" + amd64: {amd_tag} + arm64: {arm_tag} + prow job: {prow_job_url} + + {changelog} + + /label tide/merge-method-squash + """) + return (base if rebase_script_succeded + else "# rebase.sh failed - check committed rebase_sh.log\n\n" + base) + + +def create_pr(gh_repo, base_branch, branch_name, title, desc): + if REMOTE_DRY_RUN: + logging.info(f"[DRY RUN] Create PR: branch='{branch_name}', title='{title}', desc='{desc}'") + logging.info(f"[DRY RUN] Requesting review from {REVIEWERS}") + return + + pr = gh_repo.create_pull(title=title, body=desc, base=base_branch, head=branch_name, maintainer_can_modify=True) + logging.info(f"Created pull request: {pr.html_url}") + try: + pr.create_review_request(reviewers=REVIEWERS) + logging.info(f"Requested review from {REVIEWERS}") + except GithubException as e: + logging.info(f"Failed to request review from {REVIEWERS} because: {e}") + return pr + + +def update_pr(pr, title, desc): + if REMOTE_DRY_RUN: + logging.info(f"[DRY RUN] Update PR #{pr.number}: {title}\n{desc}") + return + + pr.edit(title=title, body=desc) + pr.update() # arm64 release or prow job url might've changed + logging.info(f"Updated PR #{pr.number}: {title}\n{desc}") + + +def post_comment(pr, comment=""): + if len(_extra_msgs) != 0: + if comment != "": + comment += "\n\n" + comment += "Extra messages:\n - " + "\n - ".join(_extra_msgs) + + if comment.strip() != "": + logging.info(f"Comment to post: {comment}") + if REMOTE_DRY_RUN: + logging.info(f"[DRY RUN] Posted a comment") + return + issue = pr.as_issue() + issue.create_comment(comment) + else: + logging.info(f"No content for comment") + + +def push_branch_or_die(remote, branch_name): + if REMOTE_DRY_RUN: + logging.info(f"[DRY RUN] git push --force {branch_name}") + return + + # TODO add retries + push_result = remote.push(branch_name, force=True) + + if len(push_result) != 1: + sys.exit(f"Unexpected amount ({len(push_result)}) of items in push_result: {push_result}") + if push_result[0].flags & PushInfo.ERROR: + sys.exit(f"Pushing branch failed: {push_result[0].summary}") + if push_result[0].flags & PushInfo.FORCED_UPDATE: + logging.info(f"Branch '{branch_name}' existed and was updated (force push)") + + +def get_release_tag(release): + parts = release.split(":") + if len(parts) == 2: + return parts[1] + else: + logging.error(f"Couldn't find tag in '{release}' - using it as is as branch name") + _extra_msgs.append(f"Couldn't find tag in '{release}' - using it as is as branch name") + return release + + +def try_create_prow_job_url(): + job_name = try_get_env(JOB_NAME_ENV, False) + build_id = try_get_env(BUILD_ID_ENV, False) + if job_name != "" and build_id != "": + url = f"https://prow.ci.openshift.org/view/gs/origin-ci-test/logs/{job_name}/{build_id}" + logging.info(f"Inferred probable prow job url: {url}") + return url + else: + logging.warning(f"Couldn't infer prow job url. Env vars: '{JOB_NAME_ENV}'='{job_name}', '{BUILD_ID_ENV}'='{build_id}'") + _extra_msgs.append(f"Couldn't infer prow job url. Env vars: '{JOB_NAME_ENV}'='{job_name}', '{BUILD_ID_ENV}'='{build_id}'") + return "-" + + +def create_pr_title(branch_name, successful_rebase): + return branch_name if successful_rebase else f"**FAILURE** {branch_name}" + + +def get_expected_branch_name(amd, arm): + amd_tag, arm_tag = get_release_tag(amd), get_release_tag(arm) + import re + rx = "(?P.+)-(?P[0-9]{4}-[0-9]{2}-[0-9]{2}-[0-9]{6})" + match_amd, match_arm = re.match(rx, amd_tag), re.match(rx, arm_tag) + return f"rebase-{match_amd['version_stream']}_amd64-{match_amd['date']}_arm64-{match_arm['date']}" + + +def cleanup_branches(gh_repo): + logging.info("Cleaning up branches for closed PRs") + rebase_branches = [b for b in gh_repo.get_branches() if b.name.startswith("rebase-4")] + deleted_branches = [] + for branch in rebase_branches: + prs = gh_repo.get_pulls(head=f"{gh_repo.owner.login}:{branch.name}", state="all") + all_prs_are_closed = all([pr.state == "closed" for pr in prs]) + logging.info(f"'{branch.name}' is referenced in following PRs: " + ", ".join([f"#{pr.number} ({pr.state})" for pr in prs])) + if all_prs_are_closed: + ref = gh_repo.get_git_ref(f"heads/{branch.name}") + if REMOTE_DRY_RUN: + logging.info(f"[DRY RUN] Delete '{ref.ref}'") + deleted_branches.append(branch.name) + else: + try: + ref.delete() + logging.info(f"Deleted '{ref.ref}'") + deleted_branches.append(branch.name) + except GithubException as e: + logging.warning(f"Failed to delete '{ref.ref}' because: {e}") + _extra_msgs.append(f"Failed to delete '{ref.ref}' because: {e}") + + if len(deleted_branches) != 0: + _extra_msgs.append(f"Deleted following branches: " + ", ".join(deleted_branches)) + + +def get_token(org, repo): + """ + Returns a token to be used with GitHub API. + It's either Personal Access Token if TOKEN env is set, + or Installation Access Token which is intended to be used with GitHub Apps. + """ + personal_access_token = try_get_env(PAT_ENV, die=False) + if personal_access_token != "": + logging.info("Using Personal Access Token to access GitHub API") + return personal_access_token + + app_id = try_get_env(APP_ID_ENV) + key_path = try_get_env(KEY_ENV) + return get_installation_access_token(app_id, key_path, org, repo) + + +def main(): + org = try_get_env(ORG_ENV) + repo = try_get_env(REPO_ENV) + release_amd = try_get_env(AMD64_RELEASE_ENV) + release_arm = try_get_env(ARM64_RELEASE_ENV) + base_branch_override = try_get_env(BASE_BRANCH_ENV, die=False) + + global REMOTE_DRY_RUN + REMOTE_DRY_RUN = False if try_get_env(DRY_RUN_ENV, die=False) == "" else True + if REMOTE_DRY_RUN: + logging.info("Dry run mode") + + token = get_token(org, repo) + gh_repo = Github(token).get_repo(f"{org}/{repo}") + git_repo = Repo('.') + base_branch = (git_repo.active_branch.name + if base_branch_override == "" + else base_branch_override) + + rebase_result = run_rebase_sh(release_amd, release_arm) + if rebase_result.success: + # TODO How can we inform team that rebase job ran successfully just there was nothing new? + make_sure_rebase_script_created_new_commits_or_exit(git_repo, base_branch) + if rebase_script_made_changes_considered_functional(git_repo, base_branch): + logging.info("Detected functional changes made by rebase script - proceeding with creating PR") + else: + logging.info("Rebase did not produce any change considered to be functional - quiting") + sys.exit(0) + else: + logging.warning("Rebase script failed - everything will be committed") + with open('rebase_sh.log', 'w') as writer: + writer.write(rebase_result.output) + if git_repo.active_branch.name == base_branch: + # rebase.sh didn't reach the step that would create a branch + # so script needs to create it + branch = git_repo.create_head(get_expected_branch_name(release_amd, release_arm)) + branch.checkout() + git_repo.git.add(A=True) + git_repo.index.commit("rebase.sh failure artifacts") + + rebase_branch_name = git_repo.active_branch.name + git_remote = get_remote_with_token(git_repo, token, org, repo) + remote_branch = try_get_rebase_branch_ref_from_remote(git_remote, rebase_branch_name) # {BOT_REMOTE_NAME}/{rebase_branch_name} + + rbranch_does_not_exists = remote_branch == None + rbranch_exists_and_needs_update = ( + remote_branch != None and + is_local_branch_based_on_newer_base_branch_commit(git_repo, base_branch, remote_branch.name, rebase_branch_name) + ) + if rbranch_does_not_exists or rbranch_exists_and_needs_update: + push_branch_or_die(git_remote, rebase_branch_name) + + prow_job_url = try_create_prow_job_url() + pr_title = create_pr_title(rebase_branch_name, rebase_result.success) + desc = generate_pr_description(rebase_branch_name, get_release_tag(release_amd), get_release_tag(release_arm), prow_job_url, rebase_result.success) + + comment = "" + pr = try_get_pr(gh_repo, org, base_branch, rebase_branch_name) + if pr == None: + pr = create_pr(gh_repo, base_branch, rebase_branch_name, pr_title, desc) + else: + update_pr(pr, pr_title, desc) + comment = f"Rebase job updated the branch\n{desc}" + + if base_branch == "main": + cleanup_branches(gh_repo) + post_comment(pr, comment) + + git_remote.remove(git_repo, BOT_REMOTE_NAME) + sys.exit(0 if rebase_result.success else 1) + + +if __name__ == "__main__": + main() diff --git a/scripts/auto-rebase/rebase.sh b/scripts/auto-rebase/rebase.sh index 8385b2d527..57084f90d2 100755 --- a/scripts/auto-rebase/rebase.sh +++ b/scripts/auto-rebase/rebase.sh @@ -59,7 +59,7 @@ clone_repo() { git init "${repodir}" pushd "${repodir}" >/dev/null git remote add origin "${repo}" - git fetch origin --filter=tree:0 --tags "${commit}" + git fetch origin --quiet --filter=tree:0 --tags "${commit}" git checkout "${commit}" popd >/dev/null } @@ -539,6 +539,9 @@ update_manifests() { # The following manifests are just MicroShift specific and are not present in any other OpenShift repo. # - assets/core/securityv1-local-apiservice.yaml (local API service for security API group, needed if OpenShift API server is not present) + yq -i 'with(.admission.pluginConfig.PodSecurity.configuration.defaults; + .enforce = "restricted" | .audit = "restricted" | .warn = "restricted" | + .enforce-version = "latest" | .audit-version = "latest" | .warn-version = "latest")' "${REPOROOT}"/assets/controllers/kube-apiserver/defaultconfig.yaml yq -i 'del(.extendedArguments.pv-recycler-pod-template-filepath-hostpath)' "${REPOROOT}"/assets/controllers/kube-controller-manager/defaultconfig.yaml yq -i 'del(.extendedArguments.pv-recycler-pod-template-filepath-nfs)' "${REPOROOT}"/assets/controllers/kube-controller-manager/defaultconfig.yaml yq -i 'del(.extendedArguments.flex-volume-plugin-dir)' "${REPOROOT}"/assets/controllers/kube-controller-manager/defaultconfig.yaml @@ -560,7 +563,7 @@ update_manifests() { # 1) Adopt resource manifests # Replace all openshift-dns operand manifests rm -f "${REPOROOT}"/assets/components/openshift-dns/dns/* - cp "${STAGING_DIR}"/cluster-dns-operator/assets/dns/* "${REPOROOT}"/assets/components/openshift-dns/dns || true + cp "${STAGING_DIR}"/cluster-dns-operator/assets/dns/* "${REPOROOT}"/assets/components/openshift-dns/dns || true rm -f "${REPOROOT}"/assets/components/openshift-dns/node-resolver/* cp "${STAGING_DIR}/"cluster-dns-operator/assets/node-resolver/* "${REPOROOT}"/assets/components/openshift-dns/node-resolver || true # Restore the openshift-dns ConfigMap. It's content is the Corefile that the operator generates diff --git a/scripts/auto-rebase/rebase_job_entrypoint.sh b/scripts/auto-rebase/rebase_job_entrypoint.sh index f6e6158380..478edca6fa 100755 --- a/scripts/auto-rebase/rebase_job_entrypoint.sh +++ b/scripts/auto-rebase/rebase_job_entrypoint.sh @@ -12,20 +12,20 @@ cp /secrets/ci-pull-secret/.dockercfg "$HOME/.pull-secret.json" || { echo "WARN: Could not copy registry secret file" } -release_amd64="$(oc get configmap/release-release-images-nightly-amd64 -o yaml \ - | yq '.data."release-images-nightly-amd64.yaml"' \ - | jq -r '.metadata.name')" -release_arm64="$(oc get configmap/release-release-images-nightly-arm64 -o yaml \ - | yq '.data."release-images-nightly-arm64.yaml"' \ - | jq -r '.metadata.name')" +release_amd64="$(oc get configmap/release-release-images-nightly-amd64 -o yaml | + yq '.data."release-images-nightly-amd64.yaml"' | + jq -r '.metadata.name')" +release_arm64="$(oc get configmap/release-release-images-nightly-arm64 -o yaml | + yq '.data."release-images-nightly-arm64.yaml"' | + jq -r '.metadata.name')" pullspec_release_amd64="registry.ci.openshift.org/ocp/release:${release_amd64}" pullspec_release_arm64="registry.ci.openshift.org/ocp-arm64/release-arm64:${release_arm64}" -./scripts/auto-rebase/rebase.sh to "${pullspec_release_amd64}" "${pullspec_release_arm64}" - APP_ID=$(cat /secrets/pr-creds/app_id) \ KEY=/secrets/pr-creds/key.pem \ -ORG=openshift \ -REPO=microshift \ -./scripts/auto-rebase/create_pr.py +ORG=${ORG:-openshift} \ +REPO=${REPO:-microshift} \ +AMD64_RELEASE=${pullspec_release_amd64} \ +ARM64_RELEASE=${pullspec_release_arm64} \ + ./scripts/auto-rebase/rebase.py From b2ee67a96b27b71a6a42d128e8d3fb29aac17088 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 15 Mar 2023 17:12:03 +0000 Subject: [PATCH 2/8] update last_rebase.sh --- scripts/auto-rebase/last_rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index e1f9d2b5c5..7a6efb3a8c 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.12.0-0.nightly-2023-03-06-151602" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-03-07-014438" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.12.0-0.nightly-2023-03-15-050003" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-03-15-103235" From bec484dfaaa4a8820e03036b6dc25ffc23d92a27 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 15 Mar 2023 17:12:03 +0000 Subject: [PATCH 3/8] update changelog --- scripts/auto-rebase/changelog.txt | 271 +++++++++++++++++++++++++++++- scripts/auto-rebase/commits.txt | 16 +- 2 files changed, 270 insertions(+), 17 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index f8d1f58cf2..9d6ec1c697 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,9 +1,262 @@ -# cluster-kube-apiserver-operator embedded-component a9a4df5f0cedeba2868a6ceb63ab58f67a0cdbf2 to e840002d36b0daeccfb040dabc1f37f309b7207b -613faf75924e311f3af87fbe1d1d99503a522431 2023-02-01T11:12:25+01:00 make the bootstrap kube-apiserver honor cluster-wide featuregates -# cluster-policy-controller embedded-component a78a00b3632f2c5a977ca200bf2b7a421eb121a8 to 139ac0499ac4d744023827ceb6d16aa6b467be27 -938944b9accb838dc7cd98e5f5f3399c332efed1 2023-02-22T13:01:35+01:00 psalabelsyncer: invert the enforce/log logic to default to logging -300027404416cb1ce35e484707f6621aee732c99 2023-02-01T11:35:27+01:00 enforce pod security admission when techpreview is enabled -# oc image-amd64 b05f7d40f9a2dac30771be620e9e9148d26ffd07 to 846602e50eb29ecdc7441ebed2fc846048959eaa -2466e48e0833c33adda7c733cae9c7933ac58368 2023-02-24T18:27:49+00:00 pkg/cli/admin/upgrade/channel: Use PATCH instead of POST for spec updates -# oc image-arm64 b05f7d40f9a2dac30771be620e9e9148d26ffd07 to 846602e50eb29ecdc7441ebed2fc846048959eaa -2466e48e0833c33adda7c733cae9c7933ac58368 2023-02-24T18:27:49+00:00 pkg/cli/admin/upgrade/channel: Use PATCH instead of POST for spec updates +# cluster-kube-apiserver-operator embedded-component e840002d36b0daeccfb040dabc1f37f309b7207b to 2076f3d0e4fea6fca54028ec7831407173ea81f5 +a35955936d4e41f05bb1ded408b97eab1b3e9762 2023-03-01T10:29:22+01:00 psaconfig: invert the enforce/log logic to default to logging +c6dd9ce2760e68c5ce60240c7024559fc3f2b86f 2023-03-01T10:29:22+01:00 enable pod security admission for techpreview +f95ad9e5eb5c17fe105b209149773b9628f3ad07 2023-03-01T10:29:09+01:00 bump lib-go for exposed featuregates, o/api for PSa featuregate +# cluster-kube-controller-manager-operator embedded-component 73f7ea7014f57cc37d6f2c720d3bcc00c7d4718b to b108134de5b1c7ef179fc523ffd62bc5898106a3 +0a5d2bdd2a28257880c89269e3c3703c617ceacc 2023-03-06T13:42:32+01:00 honor feature gates during bootstrapping +# kubernetes embedded-component 18eadcaadf0be77350013c8911ca953bc2ca3778 to eab9cc98fe4c002916621ace6cdd623afa519203 +2162dd7c74bdb9456b7d536b156c94ce839b9b8c 2023-03-08T15:00:13+00:00 UPSTREAM: 116227: Fix mounted volume expansion tests +daefbf97b63b9ab0c68e8ee350670f1173a537f5 2023-03-06T13:17:12+01:00 UPSTREAM: : hack/update-vendor.sh, make update and update image +65a16f0401684c6dee81907dc8a01dc9a575d719 2023-03-03T15:04:16+01:00 UPSTREAM: : manually resolve conflicts +723bcdb232300aaf5e147ff19b4df7ec8a20278d 2023-02-22T13:56:50+00:00 Release commit for Kubernetes v1.25.7 +aa2a12b44ff4e4e3e608809a43bb2cd8d8df22b5 2023-02-16T14:07:34+01:00 releng: Update images, dependencies and version to Go 1.19.6 +fc043497d870b68ba35701a42c06071340b68bb2 2023-02-14T23:25:58-05:00 Update golang.org/x/net to v0.7.0 +cd5e3b8a1f65c464168093ef516726d3b603d011 2023-02-08T17:57:20-08:00 Pin golang.org/x/net to v0.4.0 in 1.25 +2fe98e9c00d6a084b482fa337acf5fe4f2fdedeb 2023-02-08T11:38:28-05:00 kubelet/client: collapse transport wiring onto standard approach +e1d69200e554debbf0df381e5104227980142a3b 2023-02-08T11:35:58+05:30 *: Fix linter warnings +d5e6674030cedccbe47c698a0d21b782d3296721 2023-02-08T10:48:44+05:30 hack/tools: Bump golangci-lint version +9b369325b9ddc00a264f7294060e668a1e253a81 2023-02-02T12:06:51-05:00 apiserver: remove 34s from DELETECOLLECTION rest handler +e87b26dba208b2f8dddd4f672ad3834b6ab55740 2023-02-01T23:08:06+00:00 update prev succeeded indexes for indexed jobs unconditionally +064f5b91b0e27983c55db9a79f5fa11d61ae2fc6 2023-01-29T19:56:05-05:00 Avoid typechecking stdlib +7772e6e03d53cfed5e1950b181f805320f619d84 2023-01-26T21:53:59+00:00 Fix nil pointer error in nodevolumelimits csi logging +d33d8f86438a2baeaa08433fe1f4026102c88ff1 2023-01-26T21:29:43+00:00 add scale test for probes +42ea921ff62f09cf8dff0f913e74271c027e8f16 2023-01-26T11:24:10+00:00 Fix panic on ClusterIP allocation for /28 subnets +4c8462121bdffecebadde1123f2040fc326ce4f1 2023-01-23T21:29:40+00:00 use custom dialer for http probes +fa7529eb168a3f6c99599902f3867f19d0a41efd 2023-01-23T21:29:40+00:00 use custom dialer for tcp probes +99c3686b4f6c256db1fc79ab5a9ca1778eebd874 2023-01-23T21:29:40+00:00 add custom dialer optimized for probes +53e030727db838f0b9d24ffad072147fd8f56de2 2023-01-18T17:13:08-05:00 Resolve never used staticcheck error +200f2309324b8c1c39ec1288bbeccc3be477f98a 2023-01-18T20:14:37+00:00 Update CHANGELOG/CHANGELOG-1.25.md for v1.25.6 +b7289d4ba2cc2f8bb181e37acbf51f2ce37146c4 2023-01-18T19:13:56+00:00 Release commit for Kubernetes v1.25.7-rc.0 +ff2c119726cc1f8926fb0585c74b25921e866a28 2023-01-18T19:13:56+00:00 Release commit for Kubernetes v1.25.6 +9e9b92bb1a4b81dbb6cdf7c1195f7ac16cb1a0cd 2023-01-18T12:05:08-05:00 Fix shadowing lint error +0772bda66269fec1351cbf306c599f299be95c14 2023-01-18T12:05:07-05:00 bump honnef.co/go/tools to support go1.20 +6ad6f93b7345f09ae0ddd762082f7f8651aee2d7 2023-01-17T20:02:31-08:00 Fixes the issue #114145 +99763f992b5a3faa4f6e5c1942cf999df0088f8a 2023-01-12T16:51:13+01:00 Do not include scheduler name in the preemption event message +5b920e09e598dd95065846187df709a6337e420d 2023-01-12T16:49:39+01:00 Do not leak cross namespace pod metadata in preemption events +d67d1793a4ec04af77cb25096321a4f956d4e3af 2023-01-12T20:44:45+05:30 pkg/controller/job: re-honor exponential backoff +1adaea32daa86657ed4665d4aec7381ebdb58b5b 2023-01-12T13:53:38+01:00 releng: Update images, dependencies and version to Go 1.19.5 +fce4a9ad7588311664319d8dd7b45fbe06bc9764 2023-01-11T23:00:58-08:00 Explicitly call rand.Seed() method +2ea334e9e0368a8752e21cc4e9bf46cc75af5c26 2023-01-10T19:33:17+00:00 Exports WarningPrinter field in DeleteOptions +172676c88d1aaa0daa94e10e8a8122f7702524c4 2023-01-10T12:22:20-05:00 Improve vendor verification works for each staging repo +126c178743e188e385d4c20de5464c7897365684 2023-01-09T20:14:59+00:00 Bump konnectivity-client to v0.0.35 +647e31009fda5d0f22e70d1ad9125846af4e5dec 2023-01-05T16:02:20-05:00 Cherry pick 114857 to release-1.25 +974ac815c4382fc6ca95eae0f1df9d0276a626c0 2023-01-04T22:21:44+09:00 Update daemonSet status even if syncDaemonSet fails +0cd2c85f38f2c20d9d9b0965cb91b52fc53bbf23 2023-01-04T12:24:53+01:00 Licensing: skip modules with fewer subdirs than mods +33ab2207e5ffcbfd53521c0e83703dd850869f92 2023-01-03T21:04:59+00:00 Fix issues in volumesnapshot test for ephemeral storage +c9a3790f704e997698d9b7bb36191940a9bf5e88 2022-12-28T21:56:29+00:00 Add pod to dsw if termination is not completed during reconstruction #issues/113979 +6ff8325993e6bbf0a1a57c5634970e6e5f21d496 2022-12-22T13:23:39-05:00 Add .go-version file containing build go version +929b68af47aab48be1e9e48b1e6d3d9ee82c8c05 2022-12-16T07:43:57+05:30 Windows Kube-Proxy implementation for internal traffic policy. +0a5198ee20ccb24598790803681aa1d482ae11b5 2022-12-15T15:45:52-08:00 Fix a regression that scheduler always go through all Filter plugins +d2ee5b6f0ec7ec41d8137992ebf7fcc9202c032d 2022-12-15T22:13:08+02:00 Fix SPDY proxy authentication with special chars +f4171b73a59c32bf78f6a31a792b0eb97d1e0b51 2022-12-15T22:13:08+02:00 Improve error message when proxy connection fails +f48125431993a0cfca337737eff038dbf9d212de 2022-12-13T19:59:22+05:30 Creating Ingress IP loadbalancer alone when all the endpoints are terminating. KEP1669 +e14b33c96d906c2e95ec1727165992746f26e302 2022-12-08T11:08:11+00:00 Update CHANGELOG/CHANGELOG-1.25.md for v1.25.5 +9be6c1da9454f0ef5c670ef7fcf170a4e90ef682 2022-12-08T10:06:36+00:00 Release commit for Kubernetes v1.25.6-rc.0 +804d6167111f6858541cef440ccc53887fbbc96a 2022-12-08T10:06:36+00:00 Release commit for Kubernetes v1.25.5 +73c3dcb6558eeeea9e77940dde525a81d7e0bc1d 2022-12-06T17:35:53-05:00 Update golang.org/x/net 1e63c2f +f5c0a385f82efdd532f802230d3e4d3429b89fb3 2022-12-05T12:43:07+01:00 releng: Update images, dependencies and version to Go 1.19.4 +b163ce9c4bb4cd8d08d287755dcb88f197900f1a 2022-12-03T21:00:42+08:00 image pull event include duration with waiting +6b8222c6fd947062ed3863388510b991cda0f94b 2022-12-03T20:59:58+08:00 kubelet: make the image pull time more accurate in event +14b42385ac340dfde396d1167e209ea2af95a6e5 2022-12-02T16:46:21-05:00 Reduce load of Job integration test +17d8eb80d2e9f41a44ca179aca67c167394cddf2 2022-11-25T15:34:49+00:00 Fix endpoint reconciler failing to delete masterlease +6376007b4eee22c0923ae85e1bb86c41b26ad5a6 2022-11-24T17:17:55+08:00 use etcd 3.5.6-0 after promotion +71d6c2b83cfc4cefca43833e0bea3b89509aa3c8 2022-11-24T16:51:25+08:00 changelog: CVE-2022-3294 and CVE-2022-3162 were fixed in v1.23.14 +49b04e3152dd3e44744b0ebb34ea0b8823be86a4 2022-11-22T15:12:30+08:00 upgrade system-validators to v1.8.0 for a bugfix of cgroupv2 io check +483d0e17f023451bd6d6cfe98805b0b6c7ad9e7c 2022-11-21T17:26:18+02:00 fix endpoint slice controller logging format error +0ed8d22c3a864bf4dfa93fe766ad396a144ae957 2022-11-21T17:01:55+05:30 Introducing LoadbalancerPortMapping flags for VipExternalIP +8573b52b31e8dc794ff68183ad16400679ee6582 2022-11-18T14:33:12-08:00 egress_selector: prevent goroutines leak on connect() step. +1e5e5330df628ca5fb1306b8fcaf3a1231ae536c 2022-11-17T22:08:31-05:00 Limit request retrying to []byte request bodies +f4caae793e5b5ec38ba229b57d04c3cdee930ce5 2022-11-16T15:52:36+01:00 remove CustomEqualities list +46884bd93aa4618ff86f71808420836bb4080896 2022-11-16T15:52:36+01:00 fix typo +f6713678d865fc6086913b1d3b223df7b6b6f0d6 2022-11-16T15:52:36+01:00 remove extra plumbing +3ff8b82349a8d5384adad3378bdbb04824676688 2022-11-16T15:52:36+01:00 consolidate timestamp equalities initialization +6ebda11b9a2f495c13611018c85bcecda43a3cba 2022-11-16T15:52:24+01:00 allow noop-ignoring transformer to be configurable +d00cda81e5843c22c1981f11d595f0fbe246db35 2022-11-15T11:17:53+01:00 Add CVE-2022-3162 to CHANGELOG-1.25.md +ce6ced1c5a7dceb391ba61e58e8992514e879f0b 2022-11-10T12:35:22+00:00 e2e: use custom timeouts in GetSnapshotContentFromSnapshot() +21e06572c3bcd79a486ae9c230f2286888142550 2022-11-09T14:29:36+00:00 Update CHANGELOG/CHANGELOG-1.25.md for v1.25.4 +4e55479e0bb28005042d46799e3872511b1b6041 2022-11-09T13:28:31+00:00 Release commit for Kubernetes v1.25.5-rc.0 +d0afb3068e95312d80995fc2f285aa2f5feb3abe 2022-11-08T20:21:32+09:00 StatefulSet: Cleanup the complex defer function updating the status +e77861bee99c57c874b48934509221367911235f 2022-11-02T12:42:38-07:00 added retries to winkernel proxy rules deletion +8d7433bc3ffb53e678519c36b362e06ab4182f3b 2022-11-02T12:42:38-07:00 added backend hashing to winkernel proxier +9ab1a67d6769303b9c446c25f95d39a0a5218f32 2022-10-28T15:37:54+08:00 Fixed (CVE-2022-27664) Bump golang.org/x/net to v0.1.1-0.20221027164007-c63010009c80 +ea903c6219cd38b9bc55804df5c0e8780bd830b4 2022-10-11T22:51:28+00:00 remove in-tree volume limits test now that CSIMigration is GA +2bed22ad3bdcd07c8dc028d0895a02c57ed203b2 2022-09-19T10:21:42-04:00 Do not return err if CSIdriver is not found +1dffa5652cc915161d04db0bdea30ef69981ff4b 2022-09-07T15:41:44-04:00 Call queueSet::boundNextDispatchLocked enough +# machine-config-operator embedded-component 4099f3c4f4ea9df85a7516a6300a4c6e5504a5cd to 731341b89e72d53abb349aff98d09e281e471066 +6f14b0c17d04f8ac2a811806431860cbc414b6a1 2023-03-11T10:23:23+01:00 Revert "daemon: Temporarily copy auth file with more open perms on FCOS" +1ab83284e7809826443f96e9032348ca6dfd71db 2023-03-02T15:16:10-05:00 backport cleanupDuplicateMC +e5773db33b77aaff811974b664daa99b96083f3e 2023-02-14T09:38:54+00:00 configure-ovs: fix mtu-migration cleanup +# ovn-kubernetes image-amd64 5f8cd83cb3efb1d167f0da085f880377958ea502 to 1ec7d41fac8e6489013847a3b45bee4658b95d1a +eb312deb02407671fff91ab1e9192a6b004a6997 2023-03-07T16:15:55+01:00 Don't recreate clusterPGs and clusterRtrPGs unless needed +e5283542bb7854ce0816a40a0187c4a95507e711 2023-03-07T16:15:49+01:00 Fix syncEgressFirewall to truncate ACL names +a74aaf626d9b508964c582a841e28b7e8ee9488c 2023-03-07T16:15:44+01:00 Add test to showcase syncEgressFirewall isn't truncating ACL names +a5f65cb75d0aa548eaf89414c3cf67885861b560 2023-03-07T16:14:52+01:00 Add egress firewall external id to make name+externalIDs unique even when the acl name is cropped. That happens when namespace name is longer than 43 symbols. +e32023d7ea69c55e82fcff9c5afb4f0b4a32b455 2023-02-13T16:52:47+00:00 node: don't consider internal masquerade addresses as node IP addresses +fe3fdca0aa1a81f36c821ca6f5bf216cfc628708 2023-02-01T18:19:32-05:00 Unit test fixup for backport +10cac58be2949d6bea896c5410cc265119215361 2023-02-01T16:17:54-05:00 Fixes looping with pointer for route deletion +7e4612049846431f4d35703493605e4241c95c83 2023-02-01T16:17:44-05:00 Ensure routes on ovn_cluster_router are not duplicated +# kubernetes image-amd64 18eadcaadf0be77350013c8911ca953bc2ca3778 to eab9cc98fe4c002916621ace6cdd623afa519203 +2162dd7c74bdb9456b7d536b156c94ce839b9b8c 2023-03-08T15:00:13+00:00 UPSTREAM: 116227: Fix mounted volume expansion tests +daefbf97b63b9ab0c68e8ee350670f1173a537f5 2023-03-06T13:17:12+01:00 UPSTREAM: : hack/update-vendor.sh, make update and update image +65a16f0401684c6dee81907dc8a01dc9a575d719 2023-03-03T15:04:16+01:00 UPSTREAM: : manually resolve conflicts +723bcdb232300aaf5e147ff19b4df7ec8a20278d 2023-02-22T13:56:50+00:00 Release commit for Kubernetes v1.25.7 +aa2a12b44ff4e4e3e608809a43bb2cd8d8df22b5 2023-02-16T14:07:34+01:00 releng: Update images, dependencies and version to Go 1.19.6 +fc043497d870b68ba35701a42c06071340b68bb2 2023-02-14T23:25:58-05:00 Update golang.org/x/net to v0.7.0 +cd5e3b8a1f65c464168093ef516726d3b603d011 2023-02-08T17:57:20-08:00 Pin golang.org/x/net to v0.4.0 in 1.25 +2fe98e9c00d6a084b482fa337acf5fe4f2fdedeb 2023-02-08T11:38:28-05:00 kubelet/client: collapse transport wiring onto standard approach +e1d69200e554debbf0df381e5104227980142a3b 2023-02-08T11:35:58+05:30 *: Fix linter warnings +d5e6674030cedccbe47c698a0d21b782d3296721 2023-02-08T10:48:44+05:30 hack/tools: Bump golangci-lint version +9b369325b9ddc00a264f7294060e668a1e253a81 2023-02-02T12:06:51-05:00 apiserver: remove 34s from DELETECOLLECTION rest handler +e87b26dba208b2f8dddd4f672ad3834b6ab55740 2023-02-01T23:08:06+00:00 update prev succeeded indexes for indexed jobs unconditionally +064f5b91b0e27983c55db9a79f5fa11d61ae2fc6 2023-01-29T19:56:05-05:00 Avoid typechecking stdlib +7772e6e03d53cfed5e1950b181f805320f619d84 2023-01-26T21:53:59+00:00 Fix nil pointer error in nodevolumelimits csi logging +d33d8f86438a2baeaa08433fe1f4026102c88ff1 2023-01-26T21:29:43+00:00 add scale test for probes +42ea921ff62f09cf8dff0f913e74271c027e8f16 2023-01-26T11:24:10+00:00 Fix panic on ClusterIP allocation for /28 subnets +4c8462121bdffecebadde1123f2040fc326ce4f1 2023-01-23T21:29:40+00:00 use custom dialer for http probes +fa7529eb168a3f6c99599902f3867f19d0a41efd 2023-01-23T21:29:40+00:00 use custom dialer for tcp probes +99c3686b4f6c256db1fc79ab5a9ca1778eebd874 2023-01-23T21:29:40+00:00 add custom dialer optimized for probes +53e030727db838f0b9d24ffad072147fd8f56de2 2023-01-18T17:13:08-05:00 Resolve never used staticcheck error +200f2309324b8c1c39ec1288bbeccc3be477f98a 2023-01-18T20:14:37+00:00 Update CHANGELOG/CHANGELOG-1.25.md for v1.25.6 +b7289d4ba2cc2f8bb181e37acbf51f2ce37146c4 2023-01-18T19:13:56+00:00 Release commit for Kubernetes v1.25.7-rc.0 +ff2c119726cc1f8926fb0585c74b25921e866a28 2023-01-18T19:13:56+00:00 Release commit for Kubernetes v1.25.6 +9e9b92bb1a4b81dbb6cdf7c1195f7ac16cb1a0cd 2023-01-18T12:05:08-05:00 Fix shadowing lint error +0772bda66269fec1351cbf306c599f299be95c14 2023-01-18T12:05:07-05:00 bump honnef.co/go/tools to support go1.20 +6ad6f93b7345f09ae0ddd762082f7f8651aee2d7 2023-01-17T20:02:31-08:00 Fixes the issue #114145 +99763f992b5a3faa4f6e5c1942cf999df0088f8a 2023-01-12T16:51:13+01:00 Do not include scheduler name in the preemption event message +5b920e09e598dd95065846187df709a6337e420d 2023-01-12T16:49:39+01:00 Do not leak cross namespace pod metadata in preemption events +d67d1793a4ec04af77cb25096321a4f956d4e3af 2023-01-12T20:44:45+05:30 pkg/controller/job: re-honor exponential backoff +1adaea32daa86657ed4665d4aec7381ebdb58b5b 2023-01-12T13:53:38+01:00 releng: Update images, dependencies and version to Go 1.19.5 +fce4a9ad7588311664319d8dd7b45fbe06bc9764 2023-01-11T23:00:58-08:00 Explicitly call rand.Seed() method +2ea334e9e0368a8752e21cc4e9bf46cc75af5c26 2023-01-10T19:33:17+00:00 Exports WarningPrinter field in DeleteOptions +172676c88d1aaa0daa94e10e8a8122f7702524c4 2023-01-10T12:22:20-05:00 Improve vendor verification works for each staging repo +126c178743e188e385d4c20de5464c7897365684 2023-01-09T20:14:59+00:00 Bump konnectivity-client to v0.0.35 +647e31009fda5d0f22e70d1ad9125846af4e5dec 2023-01-05T16:02:20-05:00 Cherry pick 114857 to release-1.25 +974ac815c4382fc6ca95eae0f1df9d0276a626c0 2023-01-04T22:21:44+09:00 Update daemonSet status even if syncDaemonSet fails +0cd2c85f38f2c20d9d9b0965cb91b52fc53bbf23 2023-01-04T12:24:53+01:00 Licensing: skip modules with fewer subdirs than mods +33ab2207e5ffcbfd53521c0e83703dd850869f92 2023-01-03T21:04:59+00:00 Fix issues in volumesnapshot test for ephemeral storage +c9a3790f704e997698d9b7bb36191940a9bf5e88 2022-12-28T21:56:29+00:00 Add pod to dsw if termination is not completed during reconstruction #issues/113979 +6ff8325993e6bbf0a1a57c5634970e6e5f21d496 2022-12-22T13:23:39-05:00 Add .go-version file containing build go version +929b68af47aab48be1e9e48b1e6d3d9ee82c8c05 2022-12-16T07:43:57+05:30 Windows Kube-Proxy implementation for internal traffic policy. +0a5198ee20ccb24598790803681aa1d482ae11b5 2022-12-15T15:45:52-08:00 Fix a regression that scheduler always go through all Filter plugins +d2ee5b6f0ec7ec41d8137992ebf7fcc9202c032d 2022-12-15T22:13:08+02:00 Fix SPDY proxy authentication with special chars +f4171b73a59c32bf78f6a31a792b0eb97d1e0b51 2022-12-15T22:13:08+02:00 Improve error message when proxy connection fails +f48125431993a0cfca337737eff038dbf9d212de 2022-12-13T19:59:22+05:30 Creating Ingress IP loadbalancer alone when all the endpoints are terminating. KEP1669 +e14b33c96d906c2e95ec1727165992746f26e302 2022-12-08T11:08:11+00:00 Update CHANGELOG/CHANGELOG-1.25.md for v1.25.5 +9be6c1da9454f0ef5c670ef7fcf170a4e90ef682 2022-12-08T10:06:36+00:00 Release commit for Kubernetes v1.25.6-rc.0 +804d6167111f6858541cef440ccc53887fbbc96a 2022-12-08T10:06:36+00:00 Release commit for Kubernetes v1.25.5 +73c3dcb6558eeeea9e77940dde525a81d7e0bc1d 2022-12-06T17:35:53-05:00 Update golang.org/x/net 1e63c2f +f5c0a385f82efdd532f802230d3e4d3429b89fb3 2022-12-05T12:43:07+01:00 releng: Update images, dependencies and version to Go 1.19.4 +b163ce9c4bb4cd8d08d287755dcb88f197900f1a 2022-12-03T21:00:42+08:00 image pull event include duration with waiting +6b8222c6fd947062ed3863388510b991cda0f94b 2022-12-03T20:59:58+08:00 kubelet: make the image pull time more accurate in event +14b42385ac340dfde396d1167e209ea2af95a6e5 2022-12-02T16:46:21-05:00 Reduce load of Job integration test +17d8eb80d2e9f41a44ca179aca67c167394cddf2 2022-11-25T15:34:49+00:00 Fix endpoint reconciler failing to delete masterlease +6376007b4eee22c0923ae85e1bb86c41b26ad5a6 2022-11-24T17:17:55+08:00 use etcd 3.5.6-0 after promotion +71d6c2b83cfc4cefca43833e0bea3b89509aa3c8 2022-11-24T16:51:25+08:00 changelog: CVE-2022-3294 and CVE-2022-3162 were fixed in v1.23.14 +49b04e3152dd3e44744b0ebb34ea0b8823be86a4 2022-11-22T15:12:30+08:00 upgrade system-validators to v1.8.0 for a bugfix of cgroupv2 io check +483d0e17f023451bd6d6cfe98805b0b6c7ad9e7c 2022-11-21T17:26:18+02:00 fix endpoint slice controller logging format error +0ed8d22c3a864bf4dfa93fe766ad396a144ae957 2022-11-21T17:01:55+05:30 Introducing LoadbalancerPortMapping flags for VipExternalIP +8573b52b31e8dc794ff68183ad16400679ee6582 2022-11-18T14:33:12-08:00 egress_selector: prevent goroutines leak on connect() step. +1e5e5330df628ca5fb1306b8fcaf3a1231ae536c 2022-11-17T22:08:31-05:00 Limit request retrying to []byte request bodies +f4caae793e5b5ec38ba229b57d04c3cdee930ce5 2022-11-16T15:52:36+01:00 remove CustomEqualities list +46884bd93aa4618ff86f71808420836bb4080896 2022-11-16T15:52:36+01:00 fix typo +f6713678d865fc6086913b1d3b223df7b6b6f0d6 2022-11-16T15:52:36+01:00 remove extra plumbing +3ff8b82349a8d5384adad3378bdbb04824676688 2022-11-16T15:52:36+01:00 consolidate timestamp equalities initialization +6ebda11b9a2f495c13611018c85bcecda43a3cba 2022-11-16T15:52:24+01:00 allow noop-ignoring transformer to be configurable +d00cda81e5843c22c1981f11d595f0fbe246db35 2022-11-15T11:17:53+01:00 Add CVE-2022-3162 to CHANGELOG-1.25.md +ce6ced1c5a7dceb391ba61e58e8992514e879f0b 2022-11-10T12:35:22+00:00 e2e: use custom timeouts in GetSnapshotContentFromSnapshot() +21e06572c3bcd79a486ae9c230f2286888142550 2022-11-09T14:29:36+00:00 Update CHANGELOG/CHANGELOG-1.25.md for v1.25.4 +4e55479e0bb28005042d46799e3872511b1b6041 2022-11-09T13:28:31+00:00 Release commit for Kubernetes v1.25.5-rc.0 +d0afb3068e95312d80995fc2f285aa2f5feb3abe 2022-11-08T20:21:32+09:00 StatefulSet: Cleanup the complex defer function updating the status +e77861bee99c57c874b48934509221367911235f 2022-11-02T12:42:38-07:00 added retries to winkernel proxy rules deletion +8d7433bc3ffb53e678519c36b362e06ab4182f3b 2022-11-02T12:42:38-07:00 added backend hashing to winkernel proxier +9ab1a67d6769303b9c446c25f95d39a0a5218f32 2022-10-28T15:37:54+08:00 Fixed (CVE-2022-27664) Bump golang.org/x/net to v0.1.1-0.20221027164007-c63010009c80 +ea903c6219cd38b9bc55804df5c0e8780bd830b4 2022-10-11T22:51:28+00:00 remove in-tree volume limits test now that CSIMigration is GA +2bed22ad3bdcd07c8dc028d0895a02c57ed203b2 2022-09-19T10:21:42-04:00 Do not return err if CSIdriver is not found +1dffa5652cc915161d04db0bdea30ef69981ff4b 2022-09-07T15:41:44-04:00 Call queueSet::boundNextDispatchLocked enough +# ovn-kubernetes image-arm64 5f8cd83cb3efb1d167f0da085f880377958ea502 to 1ec7d41fac8e6489013847a3b45bee4658b95d1a +eb312deb02407671fff91ab1e9192a6b004a6997 2023-03-07T16:15:55+01:00 Don't recreate clusterPGs and clusterRtrPGs unless needed +e5283542bb7854ce0816a40a0187c4a95507e711 2023-03-07T16:15:49+01:00 Fix syncEgressFirewall to truncate ACL names +a74aaf626d9b508964c582a841e28b7e8ee9488c 2023-03-07T16:15:44+01:00 Add test to showcase syncEgressFirewall isn't truncating ACL names +a5f65cb75d0aa548eaf89414c3cf67885861b560 2023-03-07T16:14:52+01:00 Add egress firewall external id to make name+externalIDs unique even when the acl name is cropped. That happens when namespace name is longer than 43 symbols. +e32023d7ea69c55e82fcff9c5afb4f0b4a32b455 2023-02-13T16:52:47+00:00 node: don't consider internal masquerade addresses as node IP addresses +fe3fdca0aa1a81f36c821ca6f5bf216cfc628708 2023-02-01T18:19:32-05:00 Unit test fixup for backport +10cac58be2949d6bea896c5410cc265119215361 2023-02-01T16:17:54-05:00 Fixes looping with pointer for route deletion +7e4612049846431f4d35703493605e4241c95c83 2023-02-01T16:17:44-05:00 Ensure routes on ovn_cluster_router are not duplicated +# kubernetes image-arm64 18eadcaadf0be77350013c8911ca953bc2ca3778 to eab9cc98fe4c002916621ace6cdd623afa519203 +2162dd7c74bdb9456b7d536b156c94ce839b9b8c 2023-03-08T15:00:13+00:00 UPSTREAM: 116227: Fix mounted volume expansion tests +daefbf97b63b9ab0c68e8ee350670f1173a537f5 2023-03-06T13:17:12+01:00 UPSTREAM: : hack/update-vendor.sh, make update and update image +65a16f0401684c6dee81907dc8a01dc9a575d719 2023-03-03T15:04:16+01:00 UPSTREAM: : manually resolve conflicts +723bcdb232300aaf5e147ff19b4df7ec8a20278d 2023-02-22T13:56:50+00:00 Release commit for Kubernetes v1.25.7 +aa2a12b44ff4e4e3e608809a43bb2cd8d8df22b5 2023-02-16T14:07:34+01:00 releng: Update images, dependencies and version to Go 1.19.6 +fc043497d870b68ba35701a42c06071340b68bb2 2023-02-14T23:25:58-05:00 Update golang.org/x/net to v0.7.0 +cd5e3b8a1f65c464168093ef516726d3b603d011 2023-02-08T17:57:20-08:00 Pin golang.org/x/net to v0.4.0 in 1.25 +2fe98e9c00d6a084b482fa337acf5fe4f2fdedeb 2023-02-08T11:38:28-05:00 kubelet/client: collapse transport wiring onto standard approach +e1d69200e554debbf0df381e5104227980142a3b 2023-02-08T11:35:58+05:30 *: Fix linter warnings +d5e6674030cedccbe47c698a0d21b782d3296721 2023-02-08T10:48:44+05:30 hack/tools: Bump golangci-lint version +9b369325b9ddc00a264f7294060e668a1e253a81 2023-02-02T12:06:51-05:00 apiserver: remove 34s from DELETECOLLECTION rest handler +e87b26dba208b2f8dddd4f672ad3834b6ab55740 2023-02-01T23:08:06+00:00 update prev succeeded indexes for indexed jobs unconditionally +064f5b91b0e27983c55db9a79f5fa11d61ae2fc6 2023-01-29T19:56:05-05:00 Avoid typechecking stdlib +7772e6e03d53cfed5e1950b181f805320f619d84 2023-01-26T21:53:59+00:00 Fix nil pointer error in nodevolumelimits csi logging +d33d8f86438a2baeaa08433fe1f4026102c88ff1 2023-01-26T21:29:43+00:00 add scale test for probes +42ea921ff62f09cf8dff0f913e74271c027e8f16 2023-01-26T11:24:10+00:00 Fix panic on ClusterIP allocation for /28 subnets +4c8462121bdffecebadde1123f2040fc326ce4f1 2023-01-23T21:29:40+00:00 use custom dialer for http probes +fa7529eb168a3f6c99599902f3867f19d0a41efd 2023-01-23T21:29:40+00:00 use custom dialer for tcp probes +99c3686b4f6c256db1fc79ab5a9ca1778eebd874 2023-01-23T21:29:40+00:00 add custom dialer optimized for probes +53e030727db838f0b9d24ffad072147fd8f56de2 2023-01-18T17:13:08-05:00 Resolve never used staticcheck error +200f2309324b8c1c39ec1288bbeccc3be477f98a 2023-01-18T20:14:37+00:00 Update CHANGELOG/CHANGELOG-1.25.md for v1.25.6 +b7289d4ba2cc2f8bb181e37acbf51f2ce37146c4 2023-01-18T19:13:56+00:00 Release commit for Kubernetes v1.25.7-rc.0 +ff2c119726cc1f8926fb0585c74b25921e866a28 2023-01-18T19:13:56+00:00 Release commit for Kubernetes v1.25.6 +9e9b92bb1a4b81dbb6cdf7c1195f7ac16cb1a0cd 2023-01-18T12:05:08-05:00 Fix shadowing lint error +0772bda66269fec1351cbf306c599f299be95c14 2023-01-18T12:05:07-05:00 bump honnef.co/go/tools to support go1.20 +6ad6f93b7345f09ae0ddd762082f7f8651aee2d7 2023-01-17T20:02:31-08:00 Fixes the issue #114145 +99763f992b5a3faa4f6e5c1942cf999df0088f8a 2023-01-12T16:51:13+01:00 Do not include scheduler name in the preemption event message +5b920e09e598dd95065846187df709a6337e420d 2023-01-12T16:49:39+01:00 Do not leak cross namespace pod metadata in preemption events +d67d1793a4ec04af77cb25096321a4f956d4e3af 2023-01-12T20:44:45+05:30 pkg/controller/job: re-honor exponential backoff +1adaea32daa86657ed4665d4aec7381ebdb58b5b 2023-01-12T13:53:38+01:00 releng: Update images, dependencies and version to Go 1.19.5 +fce4a9ad7588311664319d8dd7b45fbe06bc9764 2023-01-11T23:00:58-08:00 Explicitly call rand.Seed() method +2ea334e9e0368a8752e21cc4e9bf46cc75af5c26 2023-01-10T19:33:17+00:00 Exports WarningPrinter field in DeleteOptions +172676c88d1aaa0daa94e10e8a8122f7702524c4 2023-01-10T12:22:20-05:00 Improve vendor verification works for each staging repo +126c178743e188e385d4c20de5464c7897365684 2023-01-09T20:14:59+00:00 Bump konnectivity-client to v0.0.35 +647e31009fda5d0f22e70d1ad9125846af4e5dec 2023-01-05T16:02:20-05:00 Cherry pick 114857 to release-1.25 +974ac815c4382fc6ca95eae0f1df9d0276a626c0 2023-01-04T22:21:44+09:00 Update daemonSet status even if syncDaemonSet fails +0cd2c85f38f2c20d9d9b0965cb91b52fc53bbf23 2023-01-04T12:24:53+01:00 Licensing: skip modules with fewer subdirs than mods +33ab2207e5ffcbfd53521c0e83703dd850869f92 2023-01-03T21:04:59+00:00 Fix issues in volumesnapshot test for ephemeral storage +c9a3790f704e997698d9b7bb36191940a9bf5e88 2022-12-28T21:56:29+00:00 Add pod to dsw if termination is not completed during reconstruction #issues/113979 +6ff8325993e6bbf0a1a57c5634970e6e5f21d496 2022-12-22T13:23:39-05:00 Add .go-version file containing build go version +929b68af47aab48be1e9e48b1e6d3d9ee82c8c05 2022-12-16T07:43:57+05:30 Windows Kube-Proxy implementation for internal traffic policy. +0a5198ee20ccb24598790803681aa1d482ae11b5 2022-12-15T15:45:52-08:00 Fix a regression that scheduler always go through all Filter plugins +d2ee5b6f0ec7ec41d8137992ebf7fcc9202c032d 2022-12-15T22:13:08+02:00 Fix SPDY proxy authentication with special chars +f4171b73a59c32bf78f6a31a792b0eb97d1e0b51 2022-12-15T22:13:08+02:00 Improve error message when proxy connection fails +f48125431993a0cfca337737eff038dbf9d212de 2022-12-13T19:59:22+05:30 Creating Ingress IP loadbalancer alone when all the endpoints are terminating. KEP1669 +e14b33c96d906c2e95ec1727165992746f26e302 2022-12-08T11:08:11+00:00 Update CHANGELOG/CHANGELOG-1.25.md for v1.25.5 +9be6c1da9454f0ef5c670ef7fcf170a4e90ef682 2022-12-08T10:06:36+00:00 Release commit for Kubernetes v1.25.6-rc.0 +804d6167111f6858541cef440ccc53887fbbc96a 2022-12-08T10:06:36+00:00 Release commit for Kubernetes v1.25.5 +73c3dcb6558eeeea9e77940dde525a81d7e0bc1d 2022-12-06T17:35:53-05:00 Update golang.org/x/net 1e63c2f +f5c0a385f82efdd532f802230d3e4d3429b89fb3 2022-12-05T12:43:07+01:00 releng: Update images, dependencies and version to Go 1.19.4 +b163ce9c4bb4cd8d08d287755dcb88f197900f1a 2022-12-03T21:00:42+08:00 image pull event include duration with waiting +6b8222c6fd947062ed3863388510b991cda0f94b 2022-12-03T20:59:58+08:00 kubelet: make the image pull time more accurate in event +14b42385ac340dfde396d1167e209ea2af95a6e5 2022-12-02T16:46:21-05:00 Reduce load of Job integration test +17d8eb80d2e9f41a44ca179aca67c167394cddf2 2022-11-25T15:34:49+00:00 Fix endpoint reconciler failing to delete masterlease +6376007b4eee22c0923ae85e1bb86c41b26ad5a6 2022-11-24T17:17:55+08:00 use etcd 3.5.6-0 after promotion +71d6c2b83cfc4cefca43833e0bea3b89509aa3c8 2022-11-24T16:51:25+08:00 changelog: CVE-2022-3294 and CVE-2022-3162 were fixed in v1.23.14 +49b04e3152dd3e44744b0ebb34ea0b8823be86a4 2022-11-22T15:12:30+08:00 upgrade system-validators to v1.8.0 for a bugfix of cgroupv2 io check +483d0e17f023451bd6d6cfe98805b0b6c7ad9e7c 2022-11-21T17:26:18+02:00 fix endpoint slice controller logging format error +0ed8d22c3a864bf4dfa93fe766ad396a144ae957 2022-11-21T17:01:55+05:30 Introducing LoadbalancerPortMapping flags for VipExternalIP +8573b52b31e8dc794ff68183ad16400679ee6582 2022-11-18T14:33:12-08:00 egress_selector: prevent goroutines leak on connect() step. +1e5e5330df628ca5fb1306b8fcaf3a1231ae536c 2022-11-17T22:08:31-05:00 Limit request retrying to []byte request bodies +f4caae793e5b5ec38ba229b57d04c3cdee930ce5 2022-11-16T15:52:36+01:00 remove CustomEqualities list +46884bd93aa4618ff86f71808420836bb4080896 2022-11-16T15:52:36+01:00 fix typo +f6713678d865fc6086913b1d3b223df7b6b6f0d6 2022-11-16T15:52:36+01:00 remove extra plumbing +3ff8b82349a8d5384adad3378bdbb04824676688 2022-11-16T15:52:36+01:00 consolidate timestamp equalities initialization +6ebda11b9a2f495c13611018c85bcecda43a3cba 2022-11-16T15:52:24+01:00 allow noop-ignoring transformer to be configurable +d00cda81e5843c22c1981f11d595f0fbe246db35 2022-11-15T11:17:53+01:00 Add CVE-2022-3162 to CHANGELOG-1.25.md +ce6ced1c5a7dceb391ba61e58e8992514e879f0b 2022-11-10T12:35:22+00:00 e2e: use custom timeouts in GetSnapshotContentFromSnapshot() +21e06572c3bcd79a486ae9c230f2286888142550 2022-11-09T14:29:36+00:00 Update CHANGELOG/CHANGELOG-1.25.md for v1.25.4 +4e55479e0bb28005042d46799e3872511b1b6041 2022-11-09T13:28:31+00:00 Release commit for Kubernetes v1.25.5-rc.0 +d0afb3068e95312d80995fc2f285aa2f5feb3abe 2022-11-08T20:21:32+09:00 StatefulSet: Cleanup the complex defer function updating the status +e77861bee99c57c874b48934509221367911235f 2022-11-02T12:42:38-07:00 added retries to winkernel proxy rules deletion +8d7433bc3ffb53e678519c36b362e06ab4182f3b 2022-11-02T12:42:38-07:00 added backend hashing to winkernel proxier +9ab1a67d6769303b9c446c25f95d39a0a5218f32 2022-10-28T15:37:54+08:00 Fixed (CVE-2022-27664) Bump golang.org/x/net to v0.1.1-0.20221027164007-c63010009c80 +ea903c6219cd38b9bc55804df5c0e8780bd830b4 2022-10-11T22:51:28+00:00 remove in-tree volume limits test now that CSIMigration is GA +2bed22ad3bdcd07c8dc028d0895a02c57ed203b2 2022-09-19T10:21:42-04:00 Do not return err if CSIdriver is not found +1dffa5652cc915161d04db0bdea30ef69981ff4b 2022-09-07T15:41:44-04:00 Call queueSet::boundNextDispatchLocked enough diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index e44eaf0ac4..30b214e437 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,14 +1,14 @@ https://github.com/openshift/cluster-dns-operator embedded-component 1c136fe38b8cd5c0de99577d23157f884728d20b https://github.com/openshift/cluster-ingress-operator embedded-component 992b43b3cf3e1784bfe8d3083229c7ecb410e7e3 -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component e840002d36b0daeccfb040dabc1f37f309b7207b -https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 73f7ea7014f57cc37d6f2c720d3bcc00c7d4718b +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 2076f3d0e4fea6fca54028ec7831407173ea81f5 +https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component b108134de5b1c7ef179fc523ffd62bc5898106a3 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 845ae423e831b1cacf0bcae5e6528f1d21b5ddf2 https://github.com/openshift/cluster-network-operator embedded-component 6f5e144f260333ad0f70a88a55eab4fc81ecd7a2 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component d1915d130481541b8bacb5b98eddbc1541809d0a https://github.com/openshift/cluster-policy-controller embedded-component 139ac0499ac4d744023827ceb6d16aa6b467be27 https://github.com/openshift/etcd embedded-component 978cfefd2f21c4ec1ac84ed95130cbff510fbe1b -https://github.com/openshift/kubernetes embedded-component 18eadcaadf0be77350013c8911ca953bc2ca3778 -https://github.com/openshift/machine-config-operator embedded-component 4099f3c4f4ea9df85a7516a6300a4c6e5504a5cd +https://github.com/openshift/kubernetes embedded-component eab9cc98fe4c002916621ace6cdd623afa519203 +https://github.com/openshift/machine-config-operator embedded-component 731341b89e72d53abb349aff98d09e281e471066 https://github.com/openshift/openshift-controller-manager embedded-component b6528f9ea28164af9f1ceea0e50f18116fe3c90e https://github.com/openshift/route-controller-manager embedded-component 9e74d175e81ef6a2beb3718398e3fc99dded037c https://github.com/openshift/service-ca-operator embedded-component 299b7097a49385fdd4f86eccedc07f3a192e2504 @@ -20,8 +20,8 @@ https://github.com/openshift/csi-livenessprobe image-amd64 720e1d6e3e828dec99080 https://github.com/openshift/csi-node-driver-registrar image-amd64 805d5ac247137b02e6081e3eb7aa1fb9f4c7b4b2 https://github.com/openshift/router image-amd64 3065f6583f3925328fbdbfe95e3bc7bb7a084d33 https://github.com/openshift/kube-rbac-proxy image-amd64 513fd32175af4bb03f2e8a31030477e63380b5bc -https://github.com/openshift/ovn-kubernetes image-amd64 5f8cd83cb3efb1d167f0da085f880377958ea502 -https://github.com/openshift/kubernetes image-amd64 18eadcaadf0be77350013c8911ca953bc2ca3778 +https://github.com/openshift/ovn-kubernetes image-amd64 1ec7d41fac8e6489013847a3b45bee4658b95d1a +https://github.com/openshift/kubernetes image-amd64 eab9cc98fe4c002916621ace6cdd623afa519203 https://github.com/openshift/service-ca-operator image-amd64 299b7097a49385fdd4f86eccedc07f3a192e2504 https://github.com/openshift/oc image-arm64 846602e50eb29ecdc7441ebed2fc846048959eaa https://github.com/openshift/coredns image-arm64 9aaa7e0a86b69bafb9f544a0e5cb1873535a8f6b @@ -31,6 +31,6 @@ https://github.com/openshift/csi-livenessprobe image-arm64 720e1d6e3e828dec99080 https://github.com/openshift/csi-node-driver-registrar image-arm64 805d5ac247137b02e6081e3eb7aa1fb9f4c7b4b2 https://github.com/openshift/router image-arm64 3065f6583f3925328fbdbfe95e3bc7bb7a084d33 https://github.com/openshift/kube-rbac-proxy image-arm64 513fd32175af4bb03f2e8a31030477e63380b5bc -https://github.com/openshift/ovn-kubernetes image-arm64 5f8cd83cb3efb1d167f0da085f880377958ea502 -https://github.com/openshift/kubernetes image-arm64 18eadcaadf0be77350013c8911ca953bc2ca3778 +https://github.com/openshift/ovn-kubernetes image-arm64 1ec7d41fac8e6489013847a3b45bee4658b95d1a +https://github.com/openshift/kubernetes image-arm64 eab9cc98fe4c002916621ace6cdd623afa519203 https://github.com/openshift/service-ca-operator image-arm64 299b7097a49385fdd4f86eccedc07f3a192e2504 From 9754d1b7c8132fdf96a2e25eda38b95011bcd7e4 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 15 Mar 2023 17:13:56 +0000 Subject: [PATCH 4/8] update go.mod --- go.mod | 68 +++++++++++++++---------------- go.sum | 125 ++++++++++++++++++++++++++++++++------------------------- 2 files changed, 104 insertions(+), 89 deletions(-) diff --git a/go.mod b/go.mod index aa094ca262..b22dddb8f6 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.0 go.etcd.io/etcd/server/v3 v3.5.4 - golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 + golang.org/x/sys v0.5.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.25.2 k8s.io/apiextensions-apiserver v0.25.0 @@ -102,7 +102,7 @@ require ( github.com/golang/protobuf v1.5.2 // indirect github.com/google/btree v1.0.1 // indirect github.com/google/cadvisor v0.45.0 // indirect - github.com/google/cel-go v0.12.5 // indirect + github.com/google/cel-go v0.12.6 // indirect github.com/google/gnostic v0.5.7-v3refs // indirect github.com/google/go-cmp v0.5.8 github.com/google/gofuzz v1.2.0 // indirect @@ -194,11 +194,11 @@ require ( go.uber.org/zap v1.19.0 // indirect golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 // indirect golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect - golang.org/x/net v0.0.0-20221004154528-8021a29435af // indirect + golang.org/x/net v0.7.0 // indirect golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect - golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect - golang.org/x/text v0.3.7 // indirect + golang.org/x/term v0.5.0 // indirect + golang.org/x/text v0.7.0 // indirect golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect golang.org/x/tools v0.1.12 // indirect gonum.org/v1/gonum v0.6.2 // indirect @@ -227,7 +227,7 @@ require ( k8s.io/mount-utils v0.0.0 // indirect k8s.io/pod-security-admission v0.25.0 // indirect k8s.io/utils v0.0.0-20220922133306-665eaaec4324 // indirect - sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 // indirect + sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect sigs.k8s.io/kube-storage-version-migrator v0.0.4 // indirect sigs.k8s.io/kustomize/api v0.12.1 // indirect @@ -290,40 +290,40 @@ replace ( go.etcd.io/etcd/v3 => github.com/openshift/etcd/v3 v3.5.1-0.20220707134052-31b6b2d9b4d7 // override pinning etcd due to conflicting opentelemetry version golang.org/x/crypto => golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // from kubernetes golang.org/x/exp => golang.org/x/exp v0.0.0-20210220032938-85be41e4509f // from kubernetes - golang.org/x/net => golang.org/x/net v0.0.0-20220722155237-a158d28d115b // from kubernetes + golang.org/x/net => golang.org/x/net v0.7.0 // from kubernetes gonum.org/v1/netlib => gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e // from kubernetes gopkg.in/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.2.2 // from kubernetes gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.4.0 // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230221110312-18eadcaadf0b // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230221110312-18eadcaadf0b // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230221110312-18eadcaadf0b // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230221110312-18eadcaadf0b // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230221110312-18eadcaadf0b // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230221110312-18eadcaadf0b // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230221110312-18eadcaadf0b // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230221110312-18eadcaadf0b // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230221110312-18eadcaadf0b // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230221110312-18eadcaadf0b // staging kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230313212328-eab9cc98fe4c // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230313212328-eab9cc98fe4c // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230313212328-eab9cc98fe4c // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230313212328-eab9cc98fe4c // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230313212328-eab9cc98fe4c // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230313212328-eab9cc98fe4c // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230313212328-eab9cc98fe4c // staging kubernetes k8s.io/component-helpers => k8s.io/component-helpers v0.25.0 // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230221110312-18eadcaadf0b // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230221110312-18eadcaadf0b // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230221110312-18eadcaadf0b // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes k8s.io/klog/v2 => k8s.io/klog/v2 v2.70.1 // from kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230221110312-18eadcaadf0b // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230221110312-18eadcaadf0b // from kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230313212328-eab9cc98fe4c // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230221110312-18eadcaadf0b // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230221110312-18eadcaadf0b // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230221110312-18eadcaadf0b // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230221110312-18eadcaadf0b // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230221110312-18eadcaadf0b // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230221110312-18eadcaadf0b // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230221110312-18eadcaadf0b // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230221110312-18eadcaadf0b // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230221110312-18eadcaadf0b // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230221110312-18eadcaadf0b // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230221110312-18eadcaadf0b // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230221110312-18eadcaadf0b // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230313212328-eab9cc98fe4c // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes sigs.k8s.io/json => sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // from kubernetes sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.2.0 // from kubernetes ) diff --git a/go.sum b/go.sum index 4a94bed007..1ff9ab5d77 100644 --- a/go.sum +++ b/go.sum @@ -95,7 +95,9 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/RangelReale/osincli v0.0.0-20160924135400-fababb0555f2/go.mod h1:XyjUkMA8GN+tOOPXvnbi3XuRxWFvTJntqvTFnjmhzbk= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed h1:ue9pVfIcP+QMEjfgo/Ez4ZjNZfonGgR6NgjMaJMu1Cg= @@ -115,6 +117,8 @@ github.com/aws/aws-sdk-go v1.38.49/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2z github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= @@ -256,10 +260,12 @@ github.com/go-asn1-ber/asn1-ber v1.5.4/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkPro github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w= github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-ldap/ldap/v3 v3.4.3 h1:JCKUtJPIcyOuG7ctGabLKMgIlKnGumD/iGjuWeEruDI= github.com/go-ldap/ldap/v3 v3.4.3/go.mod h1:7LdHfVt6iIOESVEe3Bs4Jp2sHEKgDeduAhgM1/f9qmo= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= @@ -286,6 +292,7 @@ github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw= github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= @@ -340,8 +347,8 @@ github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= github.com/google/cadvisor v0.45.0 h1:bXQze1sd8srZiQwiQ19Qaq/AoMIZS8YceBXrIaEvkX0= github.com/google/cadvisor v0.45.0/go.mod h1:vsMT3Uv2XjQ8M7WUtKARV74mU/HN64C4XtM1bJhUKcU= -github.com/google/cel-go v0.12.5 h1:DmzaiSgoaqGCjtpPQWl26/gND+yRpim56H1jCVev6d8= -github.com/google/cel-go v0.12.5/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw= +github.com/google/cel-go v0.12.6 h1:kjeKudqV0OygrAqA9fX6J55S8gj+Jre2tckIm5RoG4M= +github.com/google/cel-go v0.12.6/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw= github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54= github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= @@ -539,51 +546,51 @@ github.com/openshift/etcd/raft/v3 v3.5.1-0.20220707134052-31b6b2d9b4d7 h1:50GOFZ github.com/openshift/etcd/raft/v3 v3.5.1-0.20220707134052-31b6b2d9b4d7/go.mod h1:kCV6hIjK2Oe4UBxDM5dWYs5wZGsiSYH7JvGaEXDlpD4= github.com/openshift/etcd/server/v3 v3.5.1-0.20220707134052-31b6b2d9b4d7 h1:iMup9OQMjZkONA/lAGIfjr6UxboUOBqrbrBMNh2ZtPs= github.com/openshift/etcd/server/v3 v3.5.1-0.20220707134052-31b6b2d9b4d7/go.mod h1:xwZlQLuAWsWw5rpb/Gwzi3nFie9STKcrKQbM6evLi5g= -github.com/openshift/kubernetes v0.0.0-20230221110312-18eadcaadf0b h1:cSTEHU+Yo82gJ5DuDXVaGjKtINj8BiJMy8qz0AG+y84= -github.com/openshift/kubernetes v0.0.0-20230221110312-18eadcaadf0b/go.mod h1:GvtZLi0lqDtTyYUgYakRbrvgDBm+JCDDfLFr1/wbl78= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230221110312-18eadcaadf0b h1:11xxF/tETNAo0N4r/6hbvLmgCe6h1juGjun75ib0PIs= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230221110312-18eadcaadf0b/go.mod h1:Qo93UGafYoBH1BqPFwxPc6iCNwAHfjTfgM13eulr+Ao= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230221110312-18eadcaadf0b h1:fdnR+8oVXneLTzOqvSSO83gzzjbsQZ6sbY5rRRTnMGw= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230221110312-18eadcaadf0b/go.mod h1:9oX11ND26Yg3ZMPLW0KPsdd86WdMVqCEPAW5BwQMt/U= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230221110312-18eadcaadf0b h1:rlaJ2R88d7RlWZA7ZBC8vPKDdpQO7bAyAuCUlJ3i6Z4= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230221110312-18eadcaadf0b/go.mod h1:GQ/K34lHStPmbv+9mJWxnxbfc5v24UGCcapFYPV3SHM= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230221110312-18eadcaadf0b h1:MgVqiHvNpOdJZ15VTflw8fv2muDwwv647+5RqGI6Rqc= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230221110312-18eadcaadf0b/go.mod h1:uWH2mimiI9UFMngmX2b70eyr5K0Zr0kp1xOtEZPWDoQ= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230221110312-18eadcaadf0b h1:jFHoPYolNYPLfCbcdaHYdfW9VYRt+VULgY+tEx3I0uI= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230221110312-18eadcaadf0b/go.mod h1:69EisGT1OS6cIw+QB9GnzewQrbgOCYFJIr3wFHD9BNc= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230221110312-18eadcaadf0b h1:TSTJFFA6HPJbkk1n6oyNuoLj6YJol5wRnMlx0RLeUvE= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230221110312-18eadcaadf0b/go.mod h1:nzdop1aTnhMjY33Tn/+FRapxJzXgcA3U72i1jHoRB9k= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230221110312-18eadcaadf0b h1:iU+qYKqEROiFwa5GPravyKWltjKtoHzzgmqUqISGuf0= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230221110312-18eadcaadf0b/go.mod h1:y3Ebs7zvsI4no5PFaaAyHFLflVYYZKPxQNBEw5+WxxE= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230221110312-18eadcaadf0b h1:/PVoNxv1mMHCp2Yjk+iJozENhJEwhMPqPJPmlx8C2CM= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230221110312-18eadcaadf0b/go.mod h1:hjMIbE7gkGmueSjaX6Ly4iXLJ3hIYR4BCA37ZClg9OY= -github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230221110312-18eadcaadf0b/go.mod h1:UVv71Mq7oFrCi7xIsER/leF5bNA5YPo0jTtsq3kL028= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230221110312-18eadcaadf0b h1:xuMyGnHCZ1edUXS6S7U3+SGwxUEImHOYGsSTxsBG5MQ= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230221110312-18eadcaadf0b/go.mod h1:y/q8OK1NMBGQMGXF+YH32+AtwP7uGpJDeZVWcpMpwDM= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230221110312-18eadcaadf0b h1:brzGCybCJpQH1PUYVtvWxkSzitX79dlYBBjY8xthsH0= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230221110312-18eadcaadf0b/go.mod h1:fUpsgKgPzbHTUIDF+I1lsFwtc8bbv08CbFe7w1+YWuI= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230221110312-18eadcaadf0b h1:fGyZ5wHVIEKHoKJf+xmsGkemdY5L+YswSIUliAxXPQ4= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230221110312-18eadcaadf0b/go.mod h1:tDSOVHTdNdugNcSelGUSkzraK2Mhi1sxxhXdOfd7km8= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230221110312-18eadcaadf0b h1:Y62PqiTyDWDVuNEq7W7f4KD6n3gpkaRvHyJxzhgqnXg= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230221110312-18eadcaadf0b/go.mod h1:tl0Rv5dgRyI3hr0qnHzAgAHsrvGEeREzqCQCxlAxVPU= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230221110312-18eadcaadf0b h1:9y3LgK+OsVEiwyro42JCKtIaUlyIYuJsRPw53w5913M= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230221110312-18eadcaadf0b/go.mod h1:JE/X/rau8C9Uv5LRj98ecT1iiJt9nNh048vQqYNcvBk= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230221110312-18eadcaadf0b h1:JEFoYbEt4cknd7AExA95y3UjmUR21nfH23ZovnvcH2s= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230221110312-18eadcaadf0b/go.mod h1:6WCfF9ZQipEMefCCizsUKRAuoKfyJ0GgkFifXQ7mgCg= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230221110312-18eadcaadf0b h1:1aVRz0WjsN+02lPRvNr4g6ARrm+5EPFH9jA1t/EOFXs= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230221110312-18eadcaadf0b/go.mod h1:DWfGytKDf2F0SFxNDMTSojU4JnpFZtfph19hU9gbaYU= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230221110312-18eadcaadf0b h1:jqnDm97hQFALMKVb7+yBa6YoRzhLzTNYSi+5bxHGLRk= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230221110312-18eadcaadf0b/go.mod h1:BKcZajPFcioXC2F+OXE3aZT7IeDNL7nqOuMi1GkroV4= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230221110312-18eadcaadf0b h1:JJEMCmRMC0qHBYDNIsqo+Nta2Zr8cHi87V10ObXyICc= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230221110312-18eadcaadf0b/go.mod h1:TvMT3/OSu6PVITI2RZJZO2yk5nNwRVWvPUeeVxB40o4= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230221110312-18eadcaadf0b h1:+8sJi0zJT61wX6M0pCQWvl2FYEZXj6DHvOeAWhokBqQ= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230221110312-18eadcaadf0b/go.mod h1:WbZCVFaA3Xm6Wn713e/zOdfy+Jt+onzXN9jngyKeqi0= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230221110312-18eadcaadf0b h1:pic8O7WfgkszYgjtYpnWonQq2E1b3oAtzSEkfjn+ono= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230221110312-18eadcaadf0b/go.mod h1:EUkA84XmePIhG71edPAMN6X3wAbksYSh/D0eYZFBcYE= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230221110312-18eadcaadf0b h1:T6ZbTSvS7S4v5ayOuSxHIi3Jc0BtmG2IiX80eBt7FOk= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230221110312-18eadcaadf0b/go.mod h1:TbYVMldm/+UOBW7uCcnk4oOtIQdEaWGrxWdKe2skRXA= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230221110312-18eadcaadf0b h1:BSxjG0CYew1pXDOyBFPlvPq7u6K0IuxeTr9UYxwXrBI= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230221110312-18eadcaadf0b/go.mod h1:uBo6m6msg8tjBNM3flPqnvZvsd3RQacFAyQd67hMjhQ= +github.com/openshift/kubernetes v0.0.0-20230313212328-eab9cc98fe4c h1:IkEJvk3ky9d2edAyumMjjeGu9A/F2H/1N9IcdEGkLVQ= +github.com/openshift/kubernetes v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:U7onx+dLL248udqLPp6SzctRAMzhBDh07QEJQHM3XyU= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230313212328-eab9cc98fe4c h1:p2wTy6HEQ5q28fhoCTwmSnozpk9CaDyyQlIl6NY3BSs= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:0e+IH7CyGwrfYDYKUsNW0HpasrfRUy40RzB40z/JbZ4= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230313212328-eab9cc98fe4c h1:EZWEdmDFHY6AM1baGoR7JZe+2pWwRJKH/lBXuphvtDQ= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:hBdDIJQkeKDFqRAp9Ech139uPvJOcZEpWo4tbYmqA6M= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230313212328-eab9cc98fe4c h1:8HjWNDIBpyg3zVW/Pul5Yi4PXHh/QhMdnweRC4TB/3s= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:/dAmLhFRrTAOxBqEzOSfq6uwHMc01RcEOLQSgn0dcEI= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230313212328-eab9cc98fe4c h1:NYDbBduI38QWWUDASym3aE9B9ibmsdzzheR+SEL9olI= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:WxJC79h0dcYKXW91x4lOYZ/pgqSY3hijo70Pvl1KpsQ= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230313212328-eab9cc98fe4c h1:/RPE3PRWNA8ay/iVdpxLtm4vmxj1H9yrqqL7E6eCUcE= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:TDc7mrGQx8Nf4cZNEFiC1V3WMxB3778rOR5x6gXOIoE= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230313212328-eab9cc98fe4c h1:SR2U7FXJh/KerG8ZA5AGk2OTd7cm7HtlkAX1X7lqGcg= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:9i/tdbVTiKs2vDQXHHAZq+oqWZtGhCD7aQyG/8bIo8A= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230313212328-eab9cc98fe4c h1:lA3qqvigRlYUX06mapLRvIT5IIfn3tyG7FNPkfgl9tg= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:C3S9pGVUJ1ZJctifufBiW6irF58tKVNb45AzOz4Rf3s= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230313212328-eab9cc98fe4c h1:NJNlgcyLxjClIXbdqg2DtMiIfl2VOmLr/Tr4UOobYCA= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:b6xZvVxbH8qUSoWcf846qX5FW2AYHTAG05DbWsLkpPo= +github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:nlTUosKhyPHcHLK4E/4po4K1L0UAv3xOrjsmqh3Ajg8= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230313212328-eab9cc98fe4c h1:bS9IcTXkRvBok4F7FVMiBYsZBGuCRRxr098EoXUQcPU= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:L7BiyM59UntZGlq44Q/vU58vEpzE/5VzT01MqhSTQ4E= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230313212328-eab9cc98fe4c h1:fboqsaCBSwrCAqG/lsoHjjqi6uHjsbCjRjYnBBcylfo= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:dfD8ftEhCiM45p69/5z062RjYSkAGawKJmsC2KcTTaU= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230313212328-eab9cc98fe4c h1:7fMg9eN2W9t0uI/q7L6vqvvJTjOpVfzbyk4NxqNKhrg= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:DryNsLe7F3ksuOaUI+fegc4FjAA1JPEjC/JdS26jmEs= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230313212328-eab9cc98fe4c h1:JmSD6F37Gyez0OXrZAxOr7KYRbsOgSEPp7QsbE3ZknE= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:/LWVVHxMwaRLi1FM52S+cILPiCfyvGVp19+Jk6RI+2Y= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230313212328-eab9cc98fe4c h1:FRfEXzln/Xi2jJ3RBpd2s9sCRCvVmlURmbjJ4ROG54M= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:SmLWO2lhU1+6BWREplK+xlQb//1A1vxVaslGyn92hJg= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230313212328-eab9cc98fe4c h1:Qe43otYf6GCwUQAFUA2/Gaa7VUPe9GJTdQSO2MbDods= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:DzYd8HeRsfeaWvGd7wKLJ39lpOJLqhSDMqck8PX4pAY= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230313212328-eab9cc98fe4c h1:SPzLZ33a2sxtlVkh5ZZK4wVCAiv+3g9uuMfU7iNSMYQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:z0eu9TAAbVW9kToIi3N1nU+KHixqZgWMNOCahYI0iGc= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230313212328-eab9cc98fe4c h1:k3qlbNh4zfJwIqAbnYTiZEsBCNMHEhpCESlmHbJIUyE= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:s3M05wMMLIiuoAoecZluKPLUZkOrUriugdllXGHkkV8= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230313212328-eab9cc98fe4c h1:ib12w40DnLuiobLUpV/5fnhwFb5DiPZ8PhZsJUhKY6Q= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:ESILSRwpo8poU3ATlwWZo6brt9OHnEvTKtmQHJ+6HQE= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230313212328-eab9cc98fe4c h1:y2YhsHU3APTfvqUefAu/+SQfizsAOoMbDgtG3G4xVlU= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:2l8i9L4kEAYkA6PZhZXJFy0GaS9ddrxRQcRk9rEG+gM= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230313212328-eab9cc98fe4c h1:MGTrqI1w6BhdS0lj/+MyEC+XOBKBkiF9sILMjJ7DVSE= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:L6C2zrYe/5jHVxZMsBFoyjm0d9TcRZsDYkZYD4l0vZg= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230313212328-eab9cc98fe4c h1:6hQ6IR1lPZYsjPb98DDAr9FBWbTazx1elqkX9JMNTrU= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:fOVqNHsdAuwlu7rxsSQXqrCQiU0arPSyhS5bf8aNkwA= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230313212328-eab9cc98fe4c h1:04uyU64i3JxCLtptIyQG1fFY97tEVvYiPksJlU9bCXk= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:D98prnW5V9uL2O02gtTYNjA6rAVy7eS8D3hEJzw+Luo= github.com/openshift/library-go v0.0.0-20221205131816-1700fb06ea43 h1:siIMiY/kTrQvUzpwseN9Esw6fH+PD21VfqAzTa1b53M= github.com/openshift/library-go v0.0.0-20221205131816-1700fb06ea43/go.mod h1:KPBAXGaq7pPmA+1wUVtKr5Axg3R68IomWDkzaOxIhxM= github.com/openshift/onsi-ginkgo/v2 v2.0.0-20221005160638-5fa9cd70cd8c h1:bRjMBrKdts7PdEHiF7Z9Q+LZR8NFVfF0HsDQJJzWLco= @@ -604,13 +611,17 @@ github.com/pquerna/cachecontrol v0.1.0 h1:yJMy84ti9h/+OEWa752kBTKv4XC30OtVVHYv/8 github.com/pquerna/cachecontrol v0.1.0/go.mod h1:NrUG3Z7Rdu85UNR3vm7SOsl1nFIeSiQnrHV5K9mBcUI= github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= @@ -631,6 +642,7 @@ github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= @@ -766,8 +778,8 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -803,6 +815,7 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20180903190138-2b024373dcd9/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -867,13 +880,14 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -882,8 +896,9 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1172,8 +1187,8 @@ rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.32/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 h1:LYqFq+6Cj2D0gFfrJvL7iElD4ET6ir3VDdhDdTK7rgc= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33/go.mod h1:soWkSNf2tZC7aMibXEqVhCd73GOY5fJikn8qbdzemB0= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 h1:+xBL5uTc+BkPBwmMi3vYfUJjq+N3K+H6PXeETwf5cPI= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35/go.mod h1:WxjusMwXlKzfAs4p9km6XJRndVt2FROgMVCE4cdohFo= sigs.k8s.io/controller-tools v0.2.8/go.mod h1:9VKHPszmf2DHz/QmHkcfZoewO6BL7pPs9uAiBVsaJSE= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= From 551acd0204763dd4a6ef584aa83b6e6e047a7b3e Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 15 Mar 2023 17:14:10 +0000 Subject: [PATCH 5/8] update vendoring --- .../github.com/google/cel-go/cel/program.go | 5 +- .../golang.org/x/net/bpf/vm_instructions.go | 4 +- vendor/golang.org/x/net/context/go17.go | 4 +- vendor/golang.org/x/net/html/parse.go | 4 +- vendor/golang.org/x/net/html/render.go | 4 +- vendor/golang.org/x/net/html/token.go | 61 +- vendor/golang.org/x/net/http2/flow.go | 88 +- vendor/golang.org/x/net/http2/frame.go | 33 +- vendor/golang.org/x/net/http2/headermap.go | 18 + vendor/golang.org/x/net/http2/hpack/encode.go | 7 +- vendor/golang.org/x/net/http2/hpack/hpack.go | 97 +- .../x/net/http2/hpack/static_table.go | 188 ++ vendor/golang.org/x/net/http2/hpack/tables.go | 78 +- vendor/golang.org/x/net/http2/http2.go | 8 +- vendor/golang.org/x/net/http2/server.go | 329 ++- vendor/golang.org/x/net/http2/transport.go | 321 ++- .../x/net/internal/socket/mmsghdr_unix.go | 18 +- .../x/net/internal/socket/msghdr_linux.go | 3 - .../x/net/internal/socket/rawconn_msg.go | 48 +- .../x/net/internal/socket/sys_stub.go | 6 +- .../x/net/internal/socket/sys_unix.go | 101 +- .../x/net/internal/socket/sys_windows.go | 7 +- .../x/net/internal/socket/sys_zos_s390x.go | 38 +- .../x/net/internal/socket/zsys_darwin_arm.go | 30 - ..._darwin_386.go => zsys_freebsd_riscv64.go} | 8 +- .../net/internal/socket/zsys_openbsd_ppc64.go | 30 + .../internal/socket/zsys_openbsd_riscv64.go | 30 + .../x/net/ipv4/zsys_freebsd_riscv64.go | 52 + vendor/golang.org/x/net/ipv6/dgramopt.go | 2 +- .../x/net/ipv6/zsys_freebsd_riscv64.go | 64 + vendor/golang.org/x/net/trace/histogram.go | 2 +- vendor/golang.org/x/net/trace/trace.go | 2 +- vendor/golang.org/x/net/websocket/hybi.go | 2 +- .../golang.org/x/net/websocket/websocket.go | 7 +- vendor/golang.org/x/sys/cpu/cpu_arm64.go | 12 +- vendor/golang.org/x/sys/cpu/cpu_gccgo_x86.c | 1 + .../golang.org/x/sys/cpu/cpu_linux_arm64.go | 44 +- .../golang.org/x/sys/cpu/cpu_openbsd_arm64.go | 65 + .../golang.org/x/sys/cpu/cpu_openbsd_arm64.s | 11 + .../golang.org/x/sys/cpu/cpu_other_arm64.go | 4 +- .../golang.org/x/sys/cpu/cpu_other_ppc64x.go | 15 + vendor/golang.org/x/sys/cpu/endian_big.go | 11 + vendor/golang.org/x/sys/cpu/endian_little.go | 11 + vendor/golang.org/x/sys/cpu/parse.go | 43 + .../x/sys/cpu/proc_cpuinfo_linux.go | 54 + .../golang.org/x/sys/execabs/execabs_go119.go | 8 +- vendor/golang.org/x/sys/plan9/mkerrors.sh | 4 +- vendor/golang.org/x/sys/plan9/syscall.go | 10 +- vendor/golang.org/x/sys/unix/asm_bsd_ppc64.s | 31 + vendor/golang.org/x/sys/unix/dirent.go | 4 +- vendor/golang.org/x/sys/unix/gccgo.go | 4 +- vendor/golang.org/x/sys/unix/gccgo_c.c | 4 +- vendor/golang.org/x/sys/unix/ioctl.go | 4 +- vendor/golang.org/x/sys/unix/ioctl_linux.go | 20 +- vendor/golang.org/x/sys/unix/mkall.sh | 49 +- vendor/golang.org/x/sys/unix/mkerrors.sh | 4 +- vendor/golang.org/x/sys/unix/sockcmsg_unix.go | 14 + vendor/golang.org/x/sys/unix/str.go | 27 - vendor/golang.org/x/sys/unix/syscall.go | 10 +- vendor/golang.org/x/sys/unix/syscall_aix.go | 2 +- vendor/golang.org/x/sys/unix/syscall_bsd.go | 2 +- .../x/sys/unix/syscall_darwin.1_12.go | 32 - .../x/sys/unix/syscall_darwin.1_13.go | 108 - .../golang.org/x/sys/unix/syscall_darwin.go | 91 + .../x/sys/unix/syscall_dragonfly.go | 1 + .../golang.org/x/sys/unix/syscall_freebsd.go | 1 + .../x/sys/unix/syscall_freebsd_386.go | 9 +- .../x/sys/unix/syscall_freebsd_amd64.go | 9 +- .../x/sys/unix/syscall_freebsd_arm.go | 9 +- .../x/sys/unix/syscall_freebsd_arm64.go | 9 +- .../x/sys/unix/syscall_freebsd_riscv64.go | 9 +- vendor/golang.org/x/sys/unix/syscall_hurd.go | 22 + .../golang.org/x/sys/unix/syscall_hurd_386.go | 29 + .../golang.org/x/sys/unix/syscall_illumos.go | 106 - vendor/golang.org/x/sys/unix/syscall_linux.go | 97 +- .../x/sys/unix/syscall_linux_386.go | 4 - .../x/sys/unix/syscall_linux_amd64.go | 4 - .../x/sys/unix/syscall_linux_arm.go | 4 - .../x/sys/unix/syscall_linux_arm64.go | 4 - .../x/sys/unix/syscall_linux_loong64.go | 4 - .../x/sys/unix/syscall_linux_mips64x.go | 4 - .../x/sys/unix/syscall_linux_mipsx.go | 4 - .../x/sys/unix/syscall_linux_ppc.go | 4 - .../x/sys/unix/syscall_linux_ppc64x.go | 4 - .../x/sys/unix/syscall_linux_riscv64.go | 4 - .../x/sys/unix/syscall_linux_s390x.go | 4 - .../x/sys/unix/syscall_linux_sparc64.go | 4 - .../golang.org/x/sys/unix/syscall_netbsd.go | 15 + .../golang.org/x/sys/unix/syscall_openbsd.go | 1 + .../x/sys/unix/syscall_openbsd_libc.go | 27 + .../x/sys/unix/syscall_openbsd_ppc64.go | 42 + .../x/sys/unix/syscall_openbsd_riscv64.go | 42 + .../golang.org/x/sys/unix/syscall_solaris.go | 218 +- vendor/golang.org/x/sys/unix/syscall_unix.go | 77 +- .../golang.org/x/sys/unix/syscall_unix_gc.go | 6 +- .../x/sys/unix/syscall_zos_s390x.go | 173 +- vendor/golang.org/x/sys/unix/sysvshm_unix.go | 13 +- vendor/golang.org/x/sys/unix/timestruct.go | 2 +- vendor/golang.org/x/sys/unix/xattr_bsd.go | 104 +- vendor/golang.org/x/sys/unix/zerrors_linux.go | 30 +- .../x/sys/unix/zerrors_linux_386.go | 5 +- .../x/sys/unix/zerrors_linux_amd64.go | 5 +- .../x/sys/unix/zerrors_linux_arm.go | 5 +- .../x/sys/unix/zerrors_linux_arm64.go | 5 +- .../x/sys/unix/zerrors_linux_loong64.go | 5 +- .../x/sys/unix/zerrors_linux_mips.go | 5 +- .../x/sys/unix/zerrors_linux_mips64.go | 5 +- .../x/sys/unix/zerrors_linux_mips64le.go | 5 +- .../x/sys/unix/zerrors_linux_mipsle.go | 5 +- .../x/sys/unix/zerrors_linux_ppc.go | 5 +- .../x/sys/unix/zerrors_linux_ppc64.go | 5 +- .../x/sys/unix/zerrors_linux_ppc64le.go | 5 +- .../x/sys/unix/zerrors_linux_riscv64.go | 5 +- .../x/sys/unix/zerrors_linux_s390x.go | 5 +- .../x/sys/unix/zerrors_linux_sparc64.go | 5 +- .../x/sys/unix/zerrors_openbsd_386.go | 356 ++- .../x/sys/unix/zerrors_openbsd_amd64.go | 189 +- .../x/sys/unix/zerrors_openbsd_arm.go | 348 ++- .../x/sys/unix/zerrors_openbsd_arm64.go | 160 +- .../x/sys/unix/zerrors_openbsd_mips64.go | 95 +- .../x/sys/unix/zerrors_openbsd_ppc64.go | 1905 ++++++++++++++ .../x/sys/unix/zerrors_openbsd_riscv64.go | 1904 ++++++++++++++ .../x/sys/unix/zsyscall_darwin_amd64.1_13.go | 40 - .../x/sys/unix/zsyscall_darwin_amd64.1_13.s | 25 - .../x/sys/unix/zsyscall_darwin_amd64.go | 32 +- .../x/sys/unix/zsyscall_darwin_amd64.s | 23 +- .../x/sys/unix/zsyscall_darwin_arm64.1_13.go | 40 - .../x/sys/unix/zsyscall_darwin_arm64.1_13.s | 25 - .../x/sys/unix/zsyscall_darwin_arm64.go | 32 +- .../x/sys/unix/zsyscall_darwin_arm64.s | 23 +- .../x/sys/unix/zsyscall_dragonfly_amd64.go | 10 + .../x/sys/unix/zsyscall_freebsd_386.go | 10 + .../x/sys/unix/zsyscall_freebsd_amd64.go | 10 + .../x/sys/unix/zsyscall_freebsd_arm.go | 10 + .../x/sys/unix/zsyscall_freebsd_arm64.go | 10 + .../x/sys/unix/zsyscall_freebsd_riscv64.go | 10 + .../x/sys/unix/zsyscall_illumos_amd64.go | 28 +- .../golang.org/x/sys/unix/zsyscall_linux.go | 21 + .../x/sys/unix/zsyscall_linux_386.go | 40 - .../x/sys/unix/zsyscall_linux_amd64.go | 40 - .../x/sys/unix/zsyscall_linux_arm.go | 40 - .../x/sys/unix/zsyscall_linux_arm64.go | 40 - .../x/sys/unix/zsyscall_linux_loong64.go | 40 - .../x/sys/unix/zsyscall_linux_mips.go | 40 - .../x/sys/unix/zsyscall_linux_mips64.go | 40 - .../x/sys/unix/zsyscall_linux_mips64le.go | 40 - .../x/sys/unix/zsyscall_linux_mipsle.go | 40 - .../x/sys/unix/zsyscall_linux_ppc.go | 40 - .../x/sys/unix/zsyscall_linux_ppc64.go | 40 - .../x/sys/unix/zsyscall_linux_ppc64le.go | 40 - .../x/sys/unix/zsyscall_linux_riscv64.go | 40 - .../x/sys/unix/zsyscall_linux_s390x.go | 40 - .../x/sys/unix/zsyscall_linux_sparc64.go | 40 - .../x/sys/unix/zsyscall_netbsd_386.go | 10 + .../x/sys/unix/zsyscall_netbsd_amd64.go | 10 + .../x/sys/unix/zsyscall_netbsd_arm.go | 10 + .../x/sys/unix/zsyscall_netbsd_arm64.go | 10 + .../x/sys/unix/zsyscall_openbsd_386.go | 812 +++++- .../x/sys/unix/zsyscall_openbsd_386.s | 669 +++++ .../x/sys/unix/zsyscall_openbsd_amd64.go | 812 +++++- .../x/sys/unix/zsyscall_openbsd_amd64.s | 669 +++++ .../x/sys/unix/zsyscall_openbsd_arm.go | 812 +++++- .../x/sys/unix/zsyscall_openbsd_arm.s | 669 +++++ .../x/sys/unix/zsyscall_openbsd_arm64.go | 812 +++++- .../x/sys/unix/zsyscall_openbsd_arm64.s | 669 +++++ .../x/sys/unix/zsyscall_openbsd_mips64.go | 812 +++++- .../x/sys/unix/zsyscall_openbsd_mips64.s | 669 +++++ .../x/sys/unix/zsyscall_openbsd_ppc64.go | 2235 +++++++++++++++++ .../x/sys/unix/zsyscall_openbsd_ppc64.s | 802 ++++++ .../x/sys/unix/zsyscall_openbsd_riscv64.go | 2235 +++++++++++++++++ .../x/sys/unix/zsyscall_openbsd_riscv64.s | 669 +++++ .../x/sys/unix/zsyscall_solaris_amd64.go | 41 +- .../x/sys/unix/zsysctl_openbsd_386.go | 51 +- .../x/sys/unix/zsysctl_openbsd_amd64.go | 17 +- .../x/sys/unix/zsysctl_openbsd_arm.go | 51 +- .../x/sys/unix/zsysctl_openbsd_arm64.go | 11 +- .../x/sys/unix/zsysctl_openbsd_mips64.go | 3 +- .../x/sys/unix/zsysctl_openbsd_ppc64.go | 281 +++ .../x/sys/unix/zsysctl_openbsd_riscv64.go | 282 +++ .../x/sys/unix/zsysnum_linux_386.go | 2 +- .../x/sys/unix/zsysnum_linux_amd64.go | 2 +- .../x/sys/unix/zsysnum_linux_arm.go | 2 +- .../x/sys/unix/zsysnum_linux_arm64.go | 2 +- .../x/sys/unix/zsysnum_linux_loong64.go | 2 +- .../x/sys/unix/zsysnum_linux_mips.go | 2 +- .../x/sys/unix/zsysnum_linux_mips64.go | 2 +- .../x/sys/unix/zsysnum_linux_mips64le.go | 2 +- .../x/sys/unix/zsysnum_linux_mipsle.go | 2 +- .../x/sys/unix/zsysnum_linux_ppc.go | 2 +- .../x/sys/unix/zsysnum_linux_ppc64.go | 2 +- .../x/sys/unix/zsysnum_linux_ppc64le.go | 2 +- .../x/sys/unix/zsysnum_linux_riscv64.go | 2 +- .../x/sys/unix/zsysnum_linux_s390x.go | 2 +- .../x/sys/unix/zsysnum_linux_sparc64.go | 2 +- .../x/sys/unix/zsysnum_openbsd_386.go | 1 + .../x/sys/unix/zsysnum_openbsd_amd64.go | 1 + .../x/sys/unix/zsysnum_openbsd_arm.go | 1 + .../x/sys/unix/zsysnum_openbsd_arm64.go | 1 + .../x/sys/unix/zsysnum_openbsd_mips64.go | 1 + .../x/sys/unix/zsysnum_openbsd_ppc64.go | 218 ++ .../x/sys/unix/zsysnum_openbsd_riscv64.go | 219 ++ .../x/sys/unix/ztypes_freebsd_386.go | 17 +- .../x/sys/unix/ztypes_freebsd_amd64.go | 18 +- .../x/sys/unix/ztypes_freebsd_arm.go | 18 +- .../x/sys/unix/ztypes_freebsd_arm64.go | 18 +- .../x/sys/unix/ztypes_freebsd_riscv64.go | 18 +- .../x/sys/unix/ztypes_illumos_amd64.go | 42 - vendor/golang.org/x/sys/unix/ztypes_linux.go | 225 +- .../golang.org/x/sys/unix/ztypes_linux_386.go | 8 +- .../x/sys/unix/ztypes_linux_amd64.go | 8 +- .../golang.org/x/sys/unix/ztypes_linux_arm.go | 8 +- .../x/sys/unix/ztypes_linux_arm64.go | 8 +- .../x/sys/unix/ztypes_linux_loong64.go | 8 +- .../x/sys/unix/ztypes_linux_mips.go | 8 +- .../x/sys/unix/ztypes_linux_mips64.go | 8 +- .../x/sys/unix/ztypes_linux_mips64le.go | 8 +- .../x/sys/unix/ztypes_linux_mipsle.go | 8 +- .../golang.org/x/sys/unix/ztypes_linux_ppc.go | 8 +- .../x/sys/unix/ztypes_linux_ppc64.go | 8 +- .../x/sys/unix/ztypes_linux_ppc64le.go | 8 +- .../x/sys/unix/ztypes_linux_riscv64.go | 8 +- .../x/sys/unix/ztypes_linux_s390x.go | 8 +- .../x/sys/unix/ztypes_linux_sparc64.go | 8 +- .../x/sys/unix/ztypes_netbsd_386.go | 84 + .../x/sys/unix/ztypes_netbsd_amd64.go | 84 + .../x/sys/unix/ztypes_netbsd_arm.go | 84 + .../x/sys/unix/ztypes_netbsd_arm64.go | 84 + .../x/sys/unix/ztypes_openbsd_386.go | 97 +- .../x/sys/unix/ztypes_openbsd_amd64.go | 33 +- .../x/sys/unix/ztypes_openbsd_arm.go | 9 +- .../x/sys/unix/ztypes_openbsd_arm64.go | 9 +- .../x/sys/unix/ztypes_openbsd_mips64.go | 9 +- .../x/sys/unix/ztypes_openbsd_ppc64.go | 571 +++++ .../x/sys/unix/ztypes_openbsd_riscv64.go | 571 +++++ .../x/sys/unix/ztypes_solaris_amd64.go | 35 + .../golang.org/x/sys/unix/ztypes_zos_s390x.go | 11 +- .../x/sys/windows/setupapi_windows.go | 2 +- vendor/golang.org/x/sys/windows/syscall.go | 10 +- .../x/sys/windows/syscall_windows.go | 145 +- .../golang.org/x/sys/windows/types_windows.go | 45 + .../x/sys/windows/zsyscall_windows.go | 104 + vendor/golang.org/x/term/AUTHORS | 3 - vendor/golang.org/x/term/CONTRIBUTORS | 3 - vendor/golang.org/x/term/term.go | 10 +- vendor/golang.org/x/term/terminal.go | 3 +- vendor/golang.org/x/text/AUTHORS | 3 - vendor/golang.org/x/text/CONTRIBUTORS | 3 - .../text/encoding/internal/identifier/mib.go | 8 + .../internal/utf8internal/utf8internal.go | 2 +- vendor/golang.org/x/text/runes/runes.go | 2 +- vendor/golang.org/x/text/unicode/bidi/core.go | 26 +- .../golang.org/x/text/unicode/bidi/trieval.go | 12 - .../x/text/unicode/norm/forminfo.go | 9 +- .../x/text/unicode/norm/normalize.go | 11 +- .../x/text/unicode/norm/tables13.0.0.go | 4 +- .../golang.org/x/text/width/tables10.0.0.go | 24 +- .../golang.org/x/text/width/tables11.0.0.go | 24 +- .../golang.org/x/text/width/tables12.0.0.go | 24 +- .../golang.org/x/text/width/tables13.0.0.go | 24 +- vendor/golang.org/x/text/width/tables9.0.0.go | 24 +- .../pkg/util/httpstream/spdy/roundtripper.go | 12 +- .../pkg/endpoints/handlers/delete.go | 10 +- .../handlers/fieldmanager/equality.go | 67 +- .../server/egressselector/egress_selector.go | 3 + .../fairqueuing/queueset/queueset.go | 50 +- vendor/k8s.io/client-go/rest/request.go | 36 +- vendor/k8s.io/client-go/rest/with_retry.go | 17 +- vendor/k8s.io/client-go/transport/cache.go | 2 +- .../k8s.io/component-base/metrics/metric.go | 20 - .../k8s.io/kubectl/pkg/cmd/delete/delete.go | 15 +- .../cmd/kube-apiserver/app/options/options.go | 6 +- .../kubernetes/pkg/api/v1/resource/helpers.go | 2 +- .../controller/daemon/daemon_controller.go | 60 +- .../topologycache/topologycache.go | 2 +- .../pkg/controller/job/indexed_job_utils.go | 13 +- .../pkg/controller/job/job_controller.go | 52 +- .../statefulset/stateful_set_control.go | 43 +- .../pkg/controlplane/reconcilers/lease.go | 3 +- .../pkg/kubelet/client/kubelet_client.go | 66 +- .../pkg/kubelet/images/image_manager.go | 2 +- .../kubernetes/pkg/kubelet/images/puller.go | 17 +- .../kubernetes/pkg/kubelet/stats/provider.go | 5 - .../desired_state_of_world_populator.go | 10 +- .../kubernetes/pkg/probe/dialer_others.go | 42 + .../kubernetes/pkg/probe/dialer_windows.go | 42 + .../k8s.io/kubernetes/pkg/probe/http/http.go | 4 + vendor/k8s.io/kubernetes/pkg/probe/tcp/tcp.go | 6 +- .../registry/core/service/allocator/bitmap.go | 1 + .../core/service/ipallocator/allocator.go | 10 +- .../framework/plugins/nodevolumelimits/csi.go | 6 +- .../framework/preemption/preemption.go | 3 +- .../scheduler/framework/runtime/framework.go | 5 +- .../kubernetes/pkg/volume/csi/csi_plugin.go | 3 + vendor/modules.txt | 114 +- .../konnectivity-client/pkg/client/client.go | 119 +- .../konnectivity-client/pkg/client/conn.go | 9 + .../pkg/client/metrics/metrics.go | 162 ++ .../pkg/common/metrics/metrics.go | 78 + 298 files changed, 24464 insertions(+), 3408 deletions(-) create mode 100644 vendor/golang.org/x/net/http2/hpack/static_table.go delete mode 100644 vendor/golang.org/x/net/internal/socket/zsys_darwin_arm.go rename vendor/golang.org/x/net/internal/socket/{zsys_darwin_386.go => zsys_freebsd_riscv64.go} (79%) create mode 100644 vendor/golang.org/x/net/internal/socket/zsys_openbsd_ppc64.go create mode 100644 vendor/golang.org/x/net/internal/socket/zsys_openbsd_riscv64.go create mode 100644 vendor/golang.org/x/net/ipv4/zsys_freebsd_riscv64.go create mode 100644 vendor/golang.org/x/net/ipv6/zsys_freebsd_riscv64.go create mode 100644 vendor/golang.org/x/sys/cpu/cpu_openbsd_arm64.go create mode 100644 vendor/golang.org/x/sys/cpu/cpu_openbsd_arm64.s create mode 100644 vendor/golang.org/x/sys/cpu/cpu_other_ppc64x.go create mode 100644 vendor/golang.org/x/sys/cpu/endian_big.go create mode 100644 vendor/golang.org/x/sys/cpu/endian_little.go create mode 100644 vendor/golang.org/x/sys/cpu/parse.go create mode 100644 vendor/golang.org/x/sys/cpu/proc_cpuinfo_linux.go create mode 100644 vendor/golang.org/x/sys/unix/asm_bsd_ppc64.s delete mode 100644 vendor/golang.org/x/sys/unix/str.go delete mode 100644 vendor/golang.org/x/sys/unix/syscall_darwin.1_12.go delete mode 100644 vendor/golang.org/x/sys/unix/syscall_darwin.1_13.go create mode 100644 vendor/golang.org/x/sys/unix/syscall_hurd.go create mode 100644 vendor/golang.org/x/sys/unix/syscall_hurd_386.go create mode 100644 vendor/golang.org/x/sys/unix/syscall_openbsd_libc.go create mode 100644 vendor/golang.org/x/sys/unix/syscall_openbsd_ppc64.go create mode 100644 vendor/golang.org/x/sys/unix/syscall_openbsd_riscv64.go create mode 100644 vendor/golang.org/x/sys/unix/zerrors_openbsd_ppc64.go create mode 100644 vendor/golang.org/x/sys/unix/zerrors_openbsd_riscv64.go delete mode 100644 vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_13.go delete mode 100644 vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_13.s delete mode 100644 vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.1_13.go delete mode 100644 vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.1_13.s create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s create mode 100644 vendor/golang.org/x/sys/unix/zsysctl_openbsd_ppc64.go create mode 100644 vendor/golang.org/x/sys/unix/zsysctl_openbsd_riscv64.go create mode 100644 vendor/golang.org/x/sys/unix/zsysnum_openbsd_ppc64.go create mode 100644 vendor/golang.org/x/sys/unix/zsysnum_openbsd_riscv64.go delete mode 100644 vendor/golang.org/x/sys/unix/ztypes_illumos_amd64.go create mode 100644 vendor/golang.org/x/sys/unix/ztypes_openbsd_ppc64.go create mode 100644 vendor/golang.org/x/sys/unix/ztypes_openbsd_riscv64.go delete mode 100644 vendor/golang.org/x/term/AUTHORS delete mode 100644 vendor/golang.org/x/term/CONTRIBUTORS delete mode 100644 vendor/golang.org/x/text/AUTHORS delete mode 100644 vendor/golang.org/x/text/CONTRIBUTORS create mode 100644 vendor/k8s.io/kubernetes/pkg/probe/dialer_others.go create mode 100644 vendor/k8s.io/kubernetes/pkg/probe/dialer_windows.go create mode 100644 vendor/sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client/metrics/metrics.go create mode 100644 vendor/sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/common/metrics/metrics.go diff --git a/vendor/github.com/google/cel-go/cel/program.go b/vendor/github.com/google/cel-go/cel/program.go index 672c83ef71..6219a4da58 100644 --- a/vendor/github.com/google/cel-go/cel/program.go +++ b/vendor/github.com/google/cel-go/cel/program.go @@ -213,7 +213,10 @@ func newProgram(e *Env, ast *Ast, opts []ProgramOption) (Program, error) { factory := func(state interpreter.EvalState, costTracker *interpreter.CostTracker) (Program, error) { costTracker.Estimator = p.callCostEstimator costTracker.Limit = p.costLimit - decs := decorators + // Limit capacity to guarantee a reallocation when calling 'append(decs, ...)' below. This + // prevents the underlying memory from being shared between factory function calls causing + // undesired mutations. + decs := decorators[:len(decorators):len(decorators)] var observers []interpreter.EvalObserver if p.evalOpts&(OptExhaustiveEval|OptTrackState) != 0 { diff --git a/vendor/golang.org/x/net/bpf/vm_instructions.go b/vendor/golang.org/x/net/bpf/vm_instructions.go index cf8947c332..0aa307c061 100644 --- a/vendor/golang.org/x/net/bpf/vm_instructions.go +++ b/vendor/golang.org/x/net/bpf/vm_instructions.go @@ -94,7 +94,7 @@ func jumpIfCommon(cond JumpTest, skipTrue, skipFalse uint8, regA uint32, value u func loadAbsolute(ins LoadAbsolute, in []byte) (uint32, bool) { offset := int(ins.Off) - size := int(ins.Size) + size := ins.Size return loadCommon(in, offset, size) } @@ -121,7 +121,7 @@ func loadExtension(ins LoadExtension, in []byte) uint32 { func loadIndirect(ins LoadIndirect, in []byte, regX uint32) (uint32, bool) { offset := int(ins.Off) + int(regX) - size := int(ins.Size) + size := ins.Size return loadCommon(in, offset, size) } diff --git a/vendor/golang.org/x/net/context/go17.go b/vendor/golang.org/x/net/context/go17.go index 0a54bdbcc6..2cb9c408f2 100644 --- a/vendor/golang.org/x/net/context/go17.go +++ b/vendor/golang.org/x/net/context/go17.go @@ -32,7 +32,7 @@ var DeadlineExceeded = context.DeadlineExceeded // call cancel as soon as the operations running in this Context complete. func WithCancel(parent Context) (ctx Context, cancel CancelFunc) { ctx, f := context.WithCancel(parent) - return ctx, CancelFunc(f) + return ctx, f } // WithDeadline returns a copy of the parent context with the deadline adjusted @@ -46,7 +46,7 @@ func WithCancel(parent Context) (ctx Context, cancel CancelFunc) { // call cancel as soon as the operations running in this Context complete. func WithDeadline(parent Context, deadline time.Time) (Context, CancelFunc) { ctx, f := context.WithDeadline(parent, deadline) - return ctx, CancelFunc(f) + return ctx, f } // WithTimeout returns WithDeadline(parent, time.Now().Add(timeout)). diff --git a/vendor/golang.org/x/net/html/parse.go b/vendor/golang.org/x/net/html/parse.go index 038941d708..46a89eda6c 100644 --- a/vendor/golang.org/x/net/html/parse.go +++ b/vendor/golang.org/x/net/html/parse.go @@ -184,7 +184,7 @@ func (p *parser) clearStackToContext(s scope) { } } -// parseGenericRawTextElements implements the generic raw text element parsing +// parseGenericRawTextElement implements the generic raw text element parsing // algorithm defined in 12.2.6.2. // https://html.spec.whatwg.org/multipage/parsing.html#parsing-elements-that-contain-only-text // TODO: Since both RAWTEXT and RCDATA states are treated as tokenizer's part @@ -734,7 +734,7 @@ func inHeadIM(p *parser) bool { return false } -// 12.2.6.4.5. +// Section 12.2.6.4.5. func inHeadNoscriptIM(p *parser) bool { switch p.tok.Type { case DoctypeToken: diff --git a/vendor/golang.org/x/net/html/render.go b/vendor/golang.org/x/net/html/render.go index b46d81ca6d..497e132042 100644 --- a/vendor/golang.org/x/net/html/render.go +++ b/vendor/golang.org/x/net/html/render.go @@ -85,7 +85,7 @@ func render1(w writer, n *Node) error { if _, err := w.WriteString(""); err != nil { @@ -96,7 +96,7 @@ func render1(w writer, n *Node) error { if _, err := w.WriteString("" case CommentToken: - return "" + return "" case DoctypeToken: - return "" + return "" } return "Invalid(" + strconv.Itoa(int(t.Type)) + ")" } @@ -598,6 +598,11 @@ scriptDataDoubleEscapeEnd: // readComment reads the next comment token starting with "") return } @@ -628,17 +632,50 @@ func (z *Tokenizer) readComment() { if dashCount >= 2 { c = z.readByte() if z.err != nil { - z.data.end = z.raw.end + z.data.end = z.calculateAbruptCommentDataEnd() return - } - if c == '>' { + } else if c == '>' { z.data.end = z.raw.end - len("--!>") return + } else if c == '-' { + dashCount = 1 + beginning = false + continue } } } dashCount = 0 + beginning = false + } +} + +func (z *Tokenizer) calculateAbruptCommentDataEnd() int { + raw := z.Raw() + const prefixLen = len("