Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

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

Already on GitHub? Sign in to your account

OCPBUGS-1413: Rebase cloud-provider-azure 29.09.2022 #39

Merged
merged 381 commits into from
Sep 29, 2022
Merged

OCPBUGS-1413: Rebase cloud-provider-azure 29.09.2022 #39

merged 381 commits into from
Sep 29, 2022

Conversation

lobziik
Copy link

@lobziik lobziik commented Sep 29, 2022

This commit rebases the cloud-provider-azure openshift patches on top of the kubernetes-sigs/cloud-provider-azure master branch after 1.25.1 release.
There are several commits that we carry on top of the upstream azure-cloud-provider and the rebase process allows us to preserve those. Here is a description of the process I used to create this PR.

(replicated @elmiko's process within openshift/kubernetes-autoscaler)

Process

First we need to identify the carry commits that we currently have, this is done against our previous rebase (or fork in this case) to catch new changes. Once identified we will drop commits which have merged upstream and only carry unique commits. (see below for the carried and dropped commits).

Identify carry commits:

git log --oneline --no-merges 9cbc9d4aaf6069b641ed9a10dbfc135affedec9d..openshift/master

where 9cbc9d4 is the previous rebase merge commit in our fork. This is the
list of commits we will need to apply onto the new upstream version of the
cloud-provider-azure. ideally, some of these commits can be dropped.

After identifying the carry commits, the next step is to create the new commit-tree that will be used for the rebase and then cherry pick the carry commits into the new branch. The following commands cover these steps:

$ git remote update # make sure we update our refs
$ git checkout 80a68661dbcc2e128ba11cc4aed0c3d2332f50fb # master HEAD after 1.25.1 release
$ git checkout -b merge-tmp-29092022 # create a temporary branch for our merge commit
$ git checkout openshift/master # we want to be at the tip of the openshift master branch when we run the next command
$ echo 'merge kubernetes-sigs/azure-cloud-provider 29-09-2022' | git commit-tree merge-tmp-29092022^{tree} -p HEAD -p merge-tmp-29092022 -F - # create a new merge commit for our history
50e7e99030f8f24368be786b2186f43712ad766e # id of new merge commit
$ git branch merge-29-09-2022 50e7e99030f8f24368be786b2186f43712ad766e # create a new branch for the cherry-pick work
$ git checkout merge-29-09-2022
$ git cherry-pick <carry commits> # cherry pick the needed commits into the new branch

With the merge-29-09-2022 branch in place, I cherry picked the carry commits which we should carry.

Carried Commits

These commits are integral to our CI platform, or are specific to the releases we create for OpenShift.

9cb498501 UPSTREAM: <carry>: fix .dockerignore to satisfy OCP specific requirements
86dbfe580 UPSTREAM: <carry>: replace .dockerignore file with the OCP specific one
5ae463b05 UPSTREAM: <carry>: Updating ose-azure-cloud-controller-manager images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/2e5eba0108299087402c119ba0dc979a0a6c0bd1/images/ose-azure-cloud-controller-manager.yml
b71d06b4d UPSTREAM: <carry>: Updating ose-azure-cloud-node-manager images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/2e5eba0108299087402c119ba0dc979a0a6c0bd1/images/ose-azure-cloud-node-manager.yml
cd9ccb2ef UPSTREAM: <carry>: set GOARCH appropriately
53c43db12 UPSTREAM: <carry>: update to golang 1.17, sync cloud-node-manager and cloud-controller-manager with latest OCP release
5e570ae81 UPSTREAM: <carry>: add dockerfiles for openshift builds, openshift specific makefile extension, openshift specific hack scripts
70dc69869 UPSTREAM: <carry>: delete .github directory
e99493fd1 UPSTREAM: <carry>: Update OWNERS file
5eb5df135 UPSTREAM: <carry>: Updating ose-azure-cloud-controller-manager images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/5bdff8f034891d949f702da1c194719005a2df3a/images/ose-azure-cloud-controller-manager.yml

Changed Commits

  1. 9cb498501 and 86dbfe580 was squashed into one 796006427 UPSTREAM: <carry>: replace .dockerignore file with the OCP specific one

  2. ART commits and golang update was squashed into one commit e60228592 UPSTREAM: <carry>: update to golang 1.18, sync cloud-node-manager and cloud-controller-manager with latest OCP release
    Changed commits:

53c43db12 UPSTREAM: <carry>: update to golang 1.17, sync cloud-node-manager and cloud-controller-manager with latest OCP release
5ae463b05 UPSTREAM: <carry>: Updating ose-azure-cloud-controller-manager images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/2e5eba0108299087402c119ba0dc979a0a6c0bd1/images/ose-azure-cloud-controller-manager.yml
b71d06b4d UPSTREAM: <carry>: Updating ose-azure-cloud-node-manager images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/2e5eba0108299087402c119ba0dc979a0a6c0bd1/images/ose-azure-cloud-node-manager.yml
5eb5df135 UPSTREAM: <carry>: Updating ose-azure-cloud-controller-manager images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/5bdff8f034891d949f702da1c194719005a2df3a/images/ose-azure-cloud-controller-manager.yml
  1. 70dc69 UPSTREAM: <carry>: delete .github directory was extended with deletion of newly appeared files

Resulting commits after squashes and other changes:

796006427 UPSTREAM: <carry>: replace .dockerignore file with the OCP specific one
dac86b6d8 UPSTREAM: <carry>: set GOARCH appropriately
e60228592 UPSTREAM: <carry>: update to golang 1.18, sync cloud-node-manager and cloud-controller-manager with latest OCP release
8f6429f69 UPSTREAM: <carry>: add dockerfiles for openshift builds, openshift specific makefile extension, openshift specific hack scripts
8fd09ca73 UPSTREAM: <carry>: delete .github directory
fbbad5fc0 UPSTREAM: <carry>: Update OWNERS file

k8s-ci-robot and others added 30 commits July 25, 2022 21:51
…efile_manifest_windows_image

fix: update osversion in Makefile manifest-node-manager-image-window
…batch querying VMSS Flex VMs and their InstanceView

interface: ListVmssFlexVMsWithoutInstanceView ListVmssFlexVMsWithOnlyInstanceView

mock: ListVmssFlexVMsWithoutInstanceView ListVmssFlexVMsWithOnlyInstanceView

azure_vmclient: ListVmssFlexVMsWithoutInstanceView ListVmssFlexVMsWithOnlyInstanceView

unit tests for ListVmssFlexVMsWithOnlyInstanceView & ListVmssFlexVMsWithoutInstanceView

fix mock client
Signed-off-by: Zhecheng Li <zhechengli@microsoft.com>
Vmss flex support: Add two functions in azure_vmclient.go to support batch querying VMSS Flex VMs and their InstanceView
Bumps [github.com/Azure/go-autorest/autorest](https://github.com/Azure/go-autorest) from 0.11.27 to 0.11.28.
- [Release notes](https://github.com/Azure/go-autorest/releases)
- [Changelog](https://github.com/Azure/go-autorest/blob/main/CHANGELOG.md)
- [Commits](Azure/go-autorest@autorest/v0.11.27...autorest/v0.11.28)

---
updated-dependencies:
- dependency-name: github.com/Azure/go-autorest/autorest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…ot/go_modules/github.com/Azure/go-autorest/autorest-0.11.28

chore(deps): bump github.com/Azure/go-autorest/autorest from 0.11.27 to 0.11.28
Bumps [github.com/Azure/go-autorest/autorest/adal](https://github.com/Azure/go-autorest) from 0.9.20 to 0.9.21.
- [Release notes](https://github.com/Azure/go-autorest/releases)
- [Changelog](https://github.com/Azure/go-autorest/blob/main/CHANGELOG.md)
- [Commits](Azure/go-autorest@autorest/adal/v0.9.20...autorest/adal/v0.9.21)

---
updated-dependencies:
- dependency-name: github.com/Azure/go-autorest/autorest/adal
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Zhecheng Li <zhechengli@microsoft.com>
…-golangci-lint

Less mem usage for golangci-lint by less concurrency
Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 10.4.7 to 10.4.8.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/main/CHANGELOG.md)
- [Commits](postcss/autoprefixer@10.4.7...10.4.8)

---
updated-dependencies:
- dependency-name: autoprefixer
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…peline_gc

fix aks pipeline gc job typo and job scheduling typo
…ase-note-v1.1.19

Update release notes for v1.1.19
…ase-note-v1.24.4

Update release notes for v1.24.4
…ot/npm_and_yarn/site/autoprefixer-10.4.8

chore(deps-dev): bump autoprefixer from 10.4.7 to 10.4.8 in /site
…ase-note-v1.0.23

Update release notes for v1.0.23
…ase-note-v1.23.16

Update release notes for v1.23.16
…ot/go_modules/github.com/Azure/go-autorest/autorest/adal-0.9.21

chore(deps): bump github.com/Azure/go-autorest/autorest/adal from 0.9.20 to 0.9.21
Bumps golang from 1.18.4-buster to 1.19.0-buster.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
VMSS Flex Support: Add vmssflex caches and unit tests

VMSS Flex Support: Add vmssflex caches and unit tests

VMSS Flex Support: Add vmssflex caches and unit tests

VMSS Flex Support: Add vmssflex caches and unit tests

VMSS Flex Support: Add vmssflex caches and unit tests

VMSS Flex Support: Add vmssflex caches and unit tests

VMSS Flex Support: Add vmssflex caches and unit tests

VMSS Flex Support: Add vmssflex caches and unit tests

VMSS Flex Support: Add vmssflex_cache.go and unit tests

vmssflex-cache

Unit test for vmssflex_cache

unit tests for vmssflex_cache

unit test

resolve comments

remove comments

resolve review comments

format code

fix header

remove redundant logs

f

fix issue

merge

resolve comments

FF
…ot/docker/golang-1.19.0-buster

chore(deps): bump golang from 1.18.4-buster to 1.19.0-buster
k8s-ci-robot and others added 8 commits September 29, 2022 02:08
Delete .github directory entirely since we do not want to use
GH workflows, templates, dependabot etc in ocp fork.
…ecific makefile extension, openshift specific hack scripts

(cherry picked from commit 5e570ae)
… cloud-controller-manager with latest OCP release
The Makefile sets GOARCH?=amd64, which needs to be overridden for this
image to build properly on other architectures.

(cherry picked from commit 86e0d4c)
(cherry picked from commit cd9ccb2)
@openshift-ci-robot
Copy link

@lobziik: This pull request references Jira Issue OCPBUGS-1413, which is invalid:

  • expected the bug to target the "4.12.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This commit rebases the cloud-provider-azure openshift patches on top of the kubernetes-sigs/cloud-provider-azure master branch after 1.25.1 release.
There are several commits that we carry on top of the upstream azure-cloud-provider and the rebase process allows us to preserve those. Here is a description of the process I used to create this PR.

(replicated @elmiko's process within openshift/kubernetes-autoscaler)

Process

First we need to identify the carry commits that we currently have, this is done against our previous rebase (or fork in this case) to catch new changes. Once identified we will drop commits which have merged upstream and only carry unique commits. (see below for the carried and dropped commits).

Identify carry commits:

git log --oneline --no-merges 9cbc9d4aaf6069b641ed9a10dbfc135affedec9d..openshift/master

where 9cbc9d4 is the previous rebase merge commit in our fork. This is the
list of commits we will need to apply onto the new upstream version of the
cloud-provider-azure. ideally, some of these commits can be dropped.

After identifying the carry commits, the next step is to create the new commit-tree that will be used for the rebase and then cherry pick the carry commits into the new branch. The following commands cover these steps:

$ git remote update # make sure we update our refs
$ git checkout 80a68661dbcc2e128ba11cc4aed0c3d2332f50fb # master HEAD after 1.25.1 release
$ git checkout -b merge-tmp-29092022 # create a temporary branch for our merge commit
$ git checkout openshift/master # we want to be at the tip of the openshift master branch when we run the next command
$ echo 'merge kubernetes-sigs/azure-cloud-provider 29-09-2022' | git commit-tree merge-tmp-29092022^{tree} -p HEAD -p merge-tmp-29092022 -F - # create a new merge commit for our history
50e7e99030f8f24368be786b2186f43712ad766e # id of new merge commit
$ git branch merge-29-09-2022 50e7e99030f8f24368be786b2186f43712ad766e # create a new branch for the cherry-pick work
$ git checkout merge-29-09-2022
$ git cherry-pick <carry commits> # cherry pick the needed commits into the new branch

With the merge-29-09-2022 branch in place, I cherry picked the carry commits which we should carry.

Carried Commits

These commits are integral to our CI platform, or are specific to the releases we create for OpenShift.

9cb498501 UPSTREAM: <carry>: fix .dockerignore to satisfy OCP specific requirements
86dbfe580 UPSTREAM: <carry>: replace .dockerignore file with the OCP specific one
5ae463b05 UPSTREAM: <carry>: Updating ose-azure-cloud-controller-manager images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/2e5eba0108299087402c119ba0dc979a0a6c0bd1/images/ose-azure-cloud-controller-manager.yml
b71d06b4d UPSTREAM: <carry>: Updating ose-azure-cloud-node-manager images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/2e5eba0108299087402c119ba0dc979a0a6c0bd1/images/ose-azure-cloud-node-manager.yml
cd9ccb2ef UPSTREAM: <carry>: set GOARCH appropriately
53c43db12 UPSTREAM: <carry>: update to golang 1.17, sync cloud-node-manager and cloud-controller-manager with latest OCP release
5e570ae81 UPSTREAM: <carry>: add dockerfiles for openshift builds, openshift specific makefile extension, openshift specific hack scripts
70dc69869 UPSTREAM: <carry>: delete .github directory
e99493fd1 UPSTREAM: <carry>: Update OWNERS file
5eb5df135 UPSTREAM: <carry>: Updating ose-azure-cloud-controller-manager images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/5bdff8f034891d949f702da1c194719005a2df3a/images/ose-azure-cloud-controller-manager.yml

Changed Commits

  1. 9cb498501 and 86dbfe580 was squashed into one 796006427 UPSTREAM: <carry>: replace .dockerignore file with the OCP specific one

  2. ART commits and golang update was squashed into one commit e60228592 UPSTREAM: <carry>: update to golang 1.18, sync cloud-node-manager and cloud-controller-manager with latest OCP release
    Changed commits:

53c43db12 UPSTREAM: <carry>: update to golang 1.17, sync cloud-node-manager and cloud-controller-manager with latest OCP release
5ae463b05 UPSTREAM: <carry>: Updating ose-azure-cloud-controller-manager images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/2e5eba0108299087402c119ba0dc979a0a6c0bd1/images/ose-azure-cloud-controller-manager.yml
b71d06b4d UPSTREAM: <carry>: Updating ose-azure-cloud-node-manager images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/2e5eba0108299087402c119ba0dc979a0a6c0bd1/images/ose-azure-cloud-node-manager.yml
5eb5df135 UPSTREAM: <carry>: Updating ose-azure-cloud-controller-manager images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/5bdff8f034891d949f702da1c194719005a2df3a/images/ose-azure-cloud-controller-manager.yml
  1. 70dc69 UPSTREAM: <carry>: delete .github directory was extended with deletion of newly appeared files

Resulting commits after squashes and other changes:

796006427 UPSTREAM: <carry>: replace .dockerignore file with the OCP specific one
dac86b6d8 UPSTREAM: <carry>: set GOARCH appropriately
e60228592 UPSTREAM: <carry>: update to golang 1.18, sync cloud-node-manager and cloud-controller-manager with latest OCP release
8f6429f69 UPSTREAM: <carry>: add dockerfiles for openshift builds, openshift specific makefile extension, openshift specific hack scripts
8fd09ca73 UPSTREAM: <carry>: delete .github directory
fbbad5fc0 UPSTREAM: <carry>: Update OWNERS file

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Sep 29, 2022
@lobziik
Copy link
Author

lobziik commented Sep 29, 2022

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Sep 29, 2022
@openshift-ci-robot
Copy link

@lobziik: This pull request references Jira Issue OCPBUGS-1413, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.12.0) matches configured target version for branch (4.12.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sunzhaohua2

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@lobziik lobziik changed the title OCPBUGS-1413: Rebase 29 09 2022 OCPBUGS-1413: Rebase cloud-provider-azure 29.09.2022 Sep 29, 2022
@openshift-ci
Copy link

openshift-ci bot commented Sep 29, 2022

@lobziik: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/verify-git-history 7960064 link false /test verify-git-history
ci/prow/openshift-e2e-azure-techpreview-upgrade 7960064 link false /test openshift-e2e-azure-techpreview-upgrade
ci/prow/openshift-e2e-azure-ccm-install 7960064 link false /test openshift-e2e-azure-ccm-install
ci/prow/e2e-azure-ccm 7960064 link false /test e2e-azure-ccm

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

Copy link

@elmiko elmiko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

commit history looks correct to me
/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 29, 2022
@openshift-ci
Copy link

openshift-ci bot commented Sep 29, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: elmiko

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 29, 2022
@openshift-merge-robot openshift-merge-robot merged commit 037fdd8 into openshift:master Sep 29, 2022
@openshift-ci-robot
Copy link

@lobziik: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-1413 has been moved to the MODIFIED state.

In response to this:

This commit rebases the cloud-provider-azure openshift patches on top of the kubernetes-sigs/cloud-provider-azure master branch after 1.25.1 release.
There are several commits that we carry on top of the upstream azure-cloud-provider and the rebase process allows us to preserve those. Here is a description of the process I used to create this PR.

(replicated @elmiko's process within openshift/kubernetes-autoscaler)

Process

First we need to identify the carry commits that we currently have, this is done against our previous rebase (or fork in this case) to catch new changes. Once identified we will drop commits which have merged upstream and only carry unique commits. (see below for the carried and dropped commits).

Identify carry commits:

git log --oneline --no-merges 9cbc9d4aaf6069b641ed9a10dbfc135affedec9d..openshift/master

where 9cbc9d4 is the previous rebase merge commit in our fork. This is the
list of commits we will need to apply onto the new upstream version of the
cloud-provider-azure. ideally, some of these commits can be dropped.

After identifying the carry commits, the next step is to create the new commit-tree that will be used for the rebase and then cherry pick the carry commits into the new branch. The following commands cover these steps:

$ git remote update # make sure we update our refs
$ git checkout 80a68661dbcc2e128ba11cc4aed0c3d2332f50fb # master HEAD after 1.25.1 release
$ git checkout -b merge-tmp-29092022 # create a temporary branch for our merge commit
$ git checkout openshift/master # we want to be at the tip of the openshift master branch when we run the next command
$ echo 'merge kubernetes-sigs/azure-cloud-provider 29-09-2022' | git commit-tree merge-tmp-29092022^{tree} -p HEAD -p merge-tmp-29092022 -F - # create a new merge commit for our history
50e7e99030f8f24368be786b2186f43712ad766e # id of new merge commit
$ git branch merge-29-09-2022 50e7e99030f8f24368be786b2186f43712ad766e # create a new branch for the cherry-pick work
$ git checkout merge-29-09-2022
$ git cherry-pick <carry commits> # cherry pick the needed commits into the new branch

With the merge-29-09-2022 branch in place, I cherry picked the carry commits which we should carry.

Carried Commits

These commits are integral to our CI platform, or are specific to the releases we create for OpenShift.

9cb498501 UPSTREAM: <carry>: fix .dockerignore to satisfy OCP specific requirements
86dbfe580 UPSTREAM: <carry>: replace .dockerignore file with the OCP specific one
5ae463b05 UPSTREAM: <carry>: Updating ose-azure-cloud-controller-manager images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/2e5eba0108299087402c119ba0dc979a0a6c0bd1/images/ose-azure-cloud-controller-manager.yml
b71d06b4d UPSTREAM: <carry>: Updating ose-azure-cloud-node-manager images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/2e5eba0108299087402c119ba0dc979a0a6c0bd1/images/ose-azure-cloud-node-manager.yml
cd9ccb2ef UPSTREAM: <carry>: set GOARCH appropriately
53c43db12 UPSTREAM: <carry>: update to golang 1.17, sync cloud-node-manager and cloud-controller-manager with latest OCP release
5e570ae81 UPSTREAM: <carry>: add dockerfiles for openshift builds, openshift specific makefile extension, openshift specific hack scripts
70dc69869 UPSTREAM: <carry>: delete .github directory
e99493fd1 UPSTREAM: <carry>: Update OWNERS file
5eb5df135 UPSTREAM: <carry>: Updating ose-azure-cloud-controller-manager images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/5bdff8f034891d949f702da1c194719005a2df3a/images/ose-azure-cloud-controller-manager.yml

Changed Commits

  1. 9cb498501 and 86dbfe580 was squashed into one 796006427 UPSTREAM: <carry>: replace .dockerignore file with the OCP specific one

  2. ART commits and golang update was squashed into one commit e60228592 UPSTREAM: <carry>: update to golang 1.18, sync cloud-node-manager and cloud-controller-manager with latest OCP release
    Changed commits:

53c43db12 UPSTREAM: <carry>: update to golang 1.17, sync cloud-node-manager and cloud-controller-manager with latest OCP release
5ae463b05 UPSTREAM: <carry>: Updating ose-azure-cloud-controller-manager images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/2e5eba0108299087402c119ba0dc979a0a6c0bd1/images/ose-azure-cloud-controller-manager.yml
b71d06b4d UPSTREAM: <carry>: Updating ose-azure-cloud-node-manager images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/2e5eba0108299087402c119ba0dc979a0a6c0bd1/images/ose-azure-cloud-node-manager.yml
5eb5df135 UPSTREAM: <carry>: Updating ose-azure-cloud-controller-manager images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/5bdff8f034891d949f702da1c194719005a2df3a/images/ose-azure-cloud-controller-manager.yml
  1. 70dc69 UPSTREAM: <carry>: delete .github directory was extended with deletion of newly appeared files

Resulting commits after squashes and other changes:

796006427 UPSTREAM: <carry>: replace .dockerignore file with the OCP specific one
dac86b6d8 UPSTREAM: <carry>: set GOARCH appropriately
e60228592 UPSTREAM: <carry>: update to golang 1.18, sync cloud-node-manager and cloud-controller-manager with latest OCP release
8f6429f69 UPSTREAM: <carry>: add dockerfiles for openshift builds, openshift specific makefile extension, openshift specific hack scripts
8fd09ca73 UPSTREAM: <carry>: delete .github directory
fbbad5fc0 UPSTREAM: <carry>: Update OWNERS file

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.