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

Rebase upstream latest #433

Merged
merged 2,637 commits into from
Feb 1, 2022
Merged

Rebase upstream latest #433

merged 2,637 commits into from
Feb 1, 2022

Conversation

alexander-demicev
Copy link

This commit rebases the cluster-api-provider-aws openshift patches on top of the kubernetes-sigs/cluster-api-provider-aws main branch after.
There are several commits that we carry on top of the upstream cluster-api-provider-azure 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 c356b7e776a70f5ce70a039641ef5b2e992d2d43..openshift/master

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 c356b7e776a70f5ce70a039641ef5b2e992d2d43
$ git checkout -b merge-tmp # 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 latest upstream changes' | git commit-tree merge-tmp^{tree} -p HEAD -p merge-tmp -F - # create a new merge commit for our history
deadbeef12345678 # id of new merge commit
$ git branch rebase-upstream-latest deadbeef12345678 # create a new branch for the cherry-pick work
$ git checkout rebase-upstream-latest
$ git cherry-pick <carry commits> # cherry pick the needed commits into the new branch

With the rebase-upstream-latest 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.

   498c4ae9e UPSTREAM: <carry>: Add vendor directory
   3c05c04f3 UPSTREAM: <carry>: Add openshift specific changes

Changed Commits

---

Dropped Commits

Click to expand eaf0ee5 update ci-operator.yaml to match golang version 1.17 33b522a fix error in Makefile build target and community Dockerfile 39c17c4 update golang version to 1.17 7d4d390 add a BUILD_IMAGE variable to the Makefile 1983aae Add aliases for conversion functions acf692a Migrate to openshift/api 1c1622f Remove apis package e24bbfe Update dependencies c971ae6 Bug 2007802: do not requeue if the machine has been updated 188ba56 Upgrade to use golang 1.16 cb6835e UPSTREAM: : Updating ose-aws-machine-controllers images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/44bc7dde7a1abf6a25bf16d7d05e98599a9783e1/images/ose-aws-machine-controllers.yml f512e7c Ensure all gomock tests specify AnyTimes 343f526 Update generated code 0e169c9 Ensure HOME is set for cache setup a437af9 Bug 1994480: Update dependencies to K8s 1.22 37396ac Add unit test for update() and exists() 85f1753 Fix eventual consistency logic to be consistent 97d809b Reduce frequency of calls to register targets with load balancers eba5e59 Updating ose-aws-machine-controllers images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/691e628254f318ce56efda5edc7448ec743c37b8/images/ose-aws-machine-controllers.yml a9f1f03 Updating .ci-operator.yaml `build_root_image` from openshift/release c425ee7 Bug 1948719: update controller-runtime dependency 303fcf1 Bug 1954177: Update mao dependency for webhook v1 changes de22180 update aws-sdk-go to v1.38.25 2fac8aa Add unit test for infrastructure tags e7aaa5d Get instance tags from infrastructure object 49f176e update makefile to ensure that CGO_ENABLE is set properly 911a887 Set CGO_ENABLED to 0 d8c4832 Fix client creation after dependency update 7150544 Update dependencies to 1.21 23c11c3 add in-container vendor 377d397 Updating ose-aws-machine-controllers images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/0c10ae924af72f1c759cf8b24b50de94c02e6268/images/ose-aws-machine-controllers.yml 177bff7 Only log error on wrong instance type for scale from zero 3dcef6d Bug 1910318: Ensure original conditions aren't mutated during reconcile 124a522 Update EC2 instance types e75f3ca Bug 1910318: Add condition to show actuator exists condition on machine 5863765 Add deregister logic for network LB groups 8453fe2 Add script for fixing permission issues when running make targets with podman 9d56f3e Update make targets to run with podman and docker or without container, remove useless targets 4bcbb1c Ensure response body is closed when we are finished with the request 1dc85a6 use a separate client for accessing openshift-config-managed namespace 71be1ff Fix controllers for updated controller-runtime d90a8c1 Bug 1909108: Bump K8s dependencies to 1.20 00c1a06 Use endpoint resolved in strict mode to catch invalid regions b13fa74 Validate AWS Region when creating a new client from secret 50b7c88 Ensure Machine is marked interruptible as well as Node e61b30e support custom CA bundle for AWS API d9fb6f1 Bug 1903424: Ensure MAO dependency is up to date to include newest metrics 596defa Bump scripts to Go 1.15 48c98a0 Mark node with condition when due for termination 412d119 use shared credentials file for session creation 461dacf Move instance tenancy under placement field 3d2dd98 Update regenerated CRDs 848cfab Add verify-diff check in generate task 9781540 add elmiko to OWNERS file b90e29e bump AWS SDK to v1.35.20 8c1e136 Add support for dedicated instance tenancy 6588351 Test input to AWS API when creating instaces 0fa61fc add bugzilla component and subcomponent to OWNERS e620d93 Bug 1883497: Fix missing logs due to mixed klog versions f0c024d Fix missing logs due to mixed klog versions 1db243c BUG 1875598: Ensure the Virtual Machine provider state is set to Unknown when Failed cb2e25c Bug 1878880: re-vendor machine-api-operator at e0db6b65 fc9f9ee Updating Dockerfile.rhel baseimages to mach ocp-build-data config 27e2ccd BUG 1877743: Bump K8s dependencies to v1.19.0 67740f4 remove Dockerfile.rhel7 1acd708 Add Dockerfile.rhel to match build configuration in ocp-build-data 25e0934 Revendor MAO with InstanceUpdateCount fix 0aedb19 Propagate AWS metrics to all API calls 7ccf749 Slow the default lease retry and renew rate for machine controller 01b6cf5 Update incorrect instance tags 0e210cb Filter Name/Cluster instance tags e463604 Use atomic to adjust counter in termination test 9824a34 Update dependencies 6e97a18 Add support for custom endpoints cb9e7b9 Revendor mao to bring https://github.com/openshift/machine-api-operator/pull/644 dafb3ff Increase leader election lease time d6e676f Ensure tests aren't racing by only running handler when needed a4474c9 Ensure scheme registration is tested in handler tests 2c6ea40 Bump golang.org/x/text to v0.3.3 fa7eef7 Revendor MAO 0d9743e Add metrics for machine interactions 4bfda8a Implement leader election for manager 1e4c288 Add configv1 to scheme 6f41370 Add support for multiple block device mappings 403a39f Fix tests after revendor 240185b Revendor MAO 10c891c Add health checks cb78233 Add dgrigore to approvers 8e8daf9 Update machine-api-operator dependency 4247511 Update dependencies to revendor machine-api-operator 4b7bd08 Add custom domain to network addresses This PR adds support for custom domains provided via DHCP options, primarily for the usecase of private VPCs (but possibly other usecases as well). These domains are necessary to be present in the node addresses to approve CSR requests. c9174f5 Ensure PublicIP is left out of JSON encoding if empty 3f01222 Keep error type after formatting error message c4fff6c Improve unit tests for events 004bc82 Create event only if machine was modified dda7270 Get dhcp domain e850a5b Drop manager from test cb6360b Use fmt.Errorf instead of "github.com/pkg/errors" to wrap errors 6f17024 Drop openssh from the image 0c5e22f Fix type mismatch after dependency update c533798 Update machine-api-operator dependency 8579ab7 Remove aws-actuator 480ccbe Update vendor e901968 Remove MachineSet manager from image 10fd44b Increase unit test coverage e66c6b5 Add aws client builder function c32b779 Revendor after refactoring 78b588a Add and fix unit tests 2a7614e Fix cmd aws-actuator c72c26f Refactor provider spec and status serialization 1bec1e1 Refactor actuator 24005b7 Add reconciler 81fa42a Add machine scope 5fe4ec7 Bump all dependencies to kube 1.18 3f4eba0 Bump scripts to Go 1.13 fc95567 Bump to Golang 1.13 9ad5cf7 Restrict handler to namespace 1fc9cf6 Add termination-handler to image 9365965 Implement polling and deletion of Machine 267fe34 Test behaviour of termination handler when machine exists 4295130 Get Machine from NodeName bd52ac7 Add tests for fetching Machine from NodeName 90eaab2 Set up test suite to check handler logic 847da72 Add skeleton termination handler e1b2632 Update machine-api-operator dependency 0f133b9 Add Interruptible Instance Label to Spot Instances 1d73d6d Test for setting SpotMarketOptions cd210b3 Set SpotMarketOptions in launchInstance cb85b1e Add SpotMarketOptions to AWSMachineProviderConfig 413b55c Split provider status and config 486ed9f Make provider imports more consistent 674a7c4 Remove double imports bc73da2 Refactor conditions logic 09f91d9 actuators/machine/instances.go: add logging for KMS key reference 9953079 Remove bison from OWNERS file 2d397b5 support KMS key for EBS encryption 100e450 Revendor mao with timeout formatting fix 2eb2967 Don't return error with invalid instance type in machineSet annotations reconciler. 5b559fa Introduce machineSet annotations controller f8b8811 Add test unit and envTest coverage for machineSet controller 6f0b301 Revendor for new machineSet controller 41071cf Add tests for machine patching c017582 Vendor dependencies 29ea0a5 Remove glog package in favor of klog 98edd7c Revendor MAO with new node draining feature dca6b31 Vendor dependencies ae46df9 OWNERS: add JoelSpeed 1aa41b9 OWNERS: add alexander-demichev 4cd29b5 Remove unused client and function getRunningInstance 6398c56 Fix deletion to account for any instance state 565f194 Save status befor Patch() be20f15 Use handleMachineError for handling events 69b146a Vendor dependencies f4eef21 Move instance pending state check outside of setStatus e6a5716 Centralize requests, replace "updates" with one "patch" 06bfbbc OWNERS: remove frobware eab7954 Update owners 816e127 Include IPv6 addresses in Machine status 3d1e2c6 Ensure Spec.ProviderID is not empty string 6798b4c Update Machine status with all instance IP addresses 167705a Drop openshift/cluster-api in favour of machine-api-operator 31f97d4 Revendor to drop openshift/cluster-api 16d9c18 pkg/actuators/machine: Eventual-consistency guards for Exists/Describe 09c1fe9 pkg/actuators/machine/actuator: Eventual-consistency wait for machines c255931 pkg/actuators/machine/actuator: Drop setMachineCloudProviderSpecifics comment 9f19609 Use getMachineInstances to find instances during update() call 382b1df pkg/actuators/machine/utils: Client-side state filtering in getInstances e4e94b1 pkg/actuators/machine/utils: Client-side state filtering in getInstanceByID 5980690 pkg/actuators/machine/stubs: Add 'state' argument to stubDescribeInstancesOutput 1c7daf7 pkg/actuators/machine/utils: Drop running/pending comment from getInstances c8e341f Stop retieving instances by state on API call 238a8df Search for existing instances by instance ID a0cc5b5 Fix typo in file name 0393712 Add unit test coverage for actuator.create d4912fb Report machineapierros.InvalidMachineConfiguration when appropriate 3a3d937 Revendor to pick machine controller with phases support 60d9cab Disable metrics to avoid pod collisions 7dfe8ba Remove deprecated tests to drop dependencies 5acdd38 Revendor for kube-1.16.0 f14d88b UPSTREAM: : openshift: Revendor to bring https://github.com/openshift/cluster-api/pull/72 6fc8f0a Apply 'make goimports' changes 7148c8d Vendor cluster-api to update InvalidConfigurationMachineError 9cd6298 Bump cluster-api 9f6d377 Switch from deepcopy-gen to controller-gen ee220eb Drop gobin and vendor tools instead 40d9ea7 Use latest e2e from actuator-pkg c10a41d Revendor after rebase b4cfcff Update build scripts to support go modules c8b945b Revendor with go modules 17dc701 Switch from Gopkg to Go modules 6b25a04 Run 'make goimports' 4f0751a Extend makefile with 'make goimports' target e185f51 Bump cluster-api to include native drain lib with fixes 3661b21 Update providerID field during update operation as well b5f2eba Do not access machine variable that is nil ab3f71a Remove unused code 7685aba Sync with github.com/openshift/cluster-api 716083f Set additional machine annotations/labels to get pretty machine output de2b619 Bump openshift/cluster-api dependencies 99de8f2 Wire provider spec EBS volume Encrypted field into ec2.EbsBlockDevice.Encrypted field 394c11e Update vendor cluster-api and kubernetes-drain ac16c8e Fix jenkins/e2e 0fb1932 Revendor cluster api to drop node controller 63c8e05 Prepend machine.Name to all logging e7c445c Reformat pkg/actuators/machine/actuator_test.go for Go 1.12 and 1.10 a451de4 Switch builds to use Go 1.12 42312e6 Fetch kustomize bits from openshift/cluster-api-provider-aws@master 1da02a1 Drop aws-actuator bootstrap in favor of creating a machine with bootstrap user data f123c8e Describe how to deploy machine API with AWS machine controller over kubernetes 08fa32c Remove cluster-api-actuator-pkg e2e tests from Gopkg.toml e924cf2 Clone e2e tests bd70685 Make Update correctly consider existing vs running bcd833a Update the code to accept k8s 1.14.1 4ff1ac8 Bump k8s to 1.14.1 and sync underlying dependencies 3fc30cb Check if placement is not nil before accessing AvailabilityZone field 9404c27 Fix jenkins e2e 57f8907 Consider non-terminated instances to be existing f92f2f4 Update machine.Spec.ProviderID field e2a31b8 Sync with rebased upstream 0.1.0 387a726 Add namespace flag e3a7e32 Re vendor for https://github.com/openshift/cluster-api/pull/40 a26eff0 Revendor for openshift/cluster-api-actuator-pkg#78 b159b4e Update README.md 0ad3432 Revendor to drop cluster from machine.openshift.io 90b0ae5 Reference cluster from cluster.k8s.io ad204d3 Accomodate providerConfigFromMachine to only use providerSpec.Value af864a8 Revendor for cluster-api https://github.com/openshift/cluster-api/pull/34 999502d Sync with the latest cluster-api and cluster-api-actuator-pkg 9954273 Rename sigs.k8s.io/cluster-api-cluster to machine.openshift.io/cluster-api-cluster 01ef27f Sync with the latest openshift/cluster-api b827069 Revendor github.com/openshift/cluster-api-actuator-pkg af94dad Revendor github.com/openshift/cluster-api 8a69f71 fmt: fix invocation db6a7a5 vet: fix invocation 47019be bump cluster-api-actuator-pkg b24f19d Add version support 66f9c01 Remove myself from OWNERS file af3deb7 Remove clusterid tag 6bd0a9c Vendor semver dependency 493dc02 vendor: dep ensure -update k8s.io/gengo 663372a Skip deletion of stop machines if there is an error 50732ee Update kubernetes packages to 1.13.1 e5d6ad1 verify staleness of vendored cluster-api-actuator-pkg 67ac39b Drop unused labels from installer machineSets https://jira.coreos.com/browse/CLOUD-407 b60fa50 Sync with the latest openshift/cluster-api 575e8d4 Do not be explicit about iops constraints 7eaebf0 Reduce resync period from 10 hours to 10 minutes 915e93e Revendor for cluster-api-actuator-pkg 55a9d7b Revendor for openshift/cluster-api f4f10be Record update events as well f8a7ea9 Delete node after removing cloud instance on deletion 289f0e5 Move node draining from actuator into machine controller 3136ef3 Consistent log messages 83128d0 Update list of owners 6a73671 Run e2e ginkgo suite 969da4c Revendor for cluster-api-actuator-pkg ginkgo suite 1d103a3 deps: switch cluster-api dependency to use master branch 3882509 Drop e2e tests, use generic pkg 23c11af Revendor for cluster-api-actuator-pkg 8338c4f client: add cluster-api-provider-aws to UserAgent for AWS API calls c6ca736 Allow to delete machine not linked to any node 6fc69e8 Rename AWS credentials secret data keys de09fc6 Add backwards compatability for previous labels 8cba8a8 Timeout node draining in 20 seconds and retry 1b7b6b7 New test for node draining (respecting PDB) d31173e Drop cluster test since it's not releveant for the actuator 8ad995a Add more RBAC rules to properly drain 65559e6 Update k8s dependencies to v1.12.5 e51e612 Rename labels from sigs.k8s.io to machine.openshift.io ed7f159 Increase timeout to 30 minutes 9931ccf Drain node by default 346b228 Requeue machine in case node draining fails 2986efa Drop the yaml unmarshalling f4eabc9 Update namespace -> openshift-machine-api b429304 Add awsproviderconfig under openshift.io group 9c829de Update e2e test to run against machine.openshift.io a071cb8 Bring back logic which is required for deep-copy auto-generation. 17bc2b5 Add EBS e2e test 5ca712a Revendor for actuator-pkg supporting machine.openshift.io fa9788c Remove deprecated patches b673340 Drop cluster.k8s.io and introduce machine.openshift.io 7d493df Revendor for machine.openshift.io 672481a Changes for cluster-api-actuator-pkg to support machine.openshift.io efb2aa7 Verify launchInstance failed/succeeded properly 4bd70ed Apply tagList to the ebs volume 4ee507c Use vendored gomock when go generating b6b8de3 Log if availability zone does not exist 06770fd Have 'make build' build both machine controller and controller manager 2363bc6 Init klog flags for machine manager f8f0544 Upstream: 677: Init klog in manager properly 5f19e72 Fix optional fields and omitempty cb8be7b Validate machineset before reconciling c7fa1d9 Update delete policy downstream patch and re-apply it 79fc4a4 Rename [Encode|Decode]ProviderConfig to [Encode|Decode]ProviderSpec a1ad91d Rename providerConfig in testing resources to providerSpec b82a31b Remove obsoleted ProviderConfig 3cebfe5 Drain nodes before deletion if specified e8362ca Add EBS support 7e53f0f Run make generate for BlockDevices field 7277b84 Update deps 1b8608e Fix make test-e2e 7469a7e Increase k8s-e2e verbosity af18854 Review nits d5902ce Make more pkg/actuators/machine exported symbols private 379fe32 Make IsMaster private 4198bc3 Make ProviderConfigFromMachine private 0cf4e1b Wrap placement into placementMatcher directly 073f48f Inline all mock* functions invocation and remove them 1f5dcd9 Replace stubMachineAPIResources call with call to individual resources 04b541e Improve test coverage of pkg/apis/awsproviderconfig/v1alpha1 9ba17c5 Remove unused code under pkg/apis and pkg/apis/awsproviderconfig 50de33e Register machine actuator to the manager directly 745593e Move cmd/aws-actuator/utils under cmd/aws-actuator 0a158ca Move pkg/cloud/aws/client under pkg/client 03b2e82 Move pkg/cloud/aws/actuators/machine to pkg/actuators/machine 70f7ab6 Remove clusterctl 7b5dbd9 Remove aws cluster actuator 47d1da1 Remove KubeClient in favor of runtime controller client 5ec19cb Replace machine annotation with cluster.k8s.io/machine 5b512aa Replace ProviderConfig with ProviderSpec 1ea2e44 Sync github.com/openshift/cluster-api-actuator-pkg 44661f6 Bump to latest cluster-api master 8c535d5 Unit test additional cases in pkg/cloud/aws/actuators/machine adcefbe Remove unused functions a77e1b4 Remove mock from TestMachineEvents ab0e71d Move TestCreateAndDeleteMachine under TestActuator 0a28006 Test Update and Describe actuator operations as well f9575a9 Unit test create and delete machine events 4869546 Increase unit test coverage of pkg/cloud/aws/actuators/machine/awsclient.go 9941bd1 Increase unit test coverage of pkg/cloud/aws/actuators/machine/loadbalancers.go 654b9a0 Increase unit test coverage of pkg/cloud/aws/actuators/machine/instaces.go 2c6ecc0 Remove user from owners 1637d20 crd/machinesets: add additional printer columns 6428f55 Rename validate-e2e to test-e2e 66ea609 Check codec and event recorder for aws-actuator binary 0a6a686 Update README.md to reflect the CRD deployment changes 5dc7cd6 Upload crds, controller and other manifest from the machine-api-operator repo 959ab60 Delete unused files ae173b8 Refactor actuator bootstrap command to use e2e framework to deploy cluster 8ea3d24 Call coding/decoding methods directly, drop yaml encoding 2f549be Revendor deps to deploy manager controller with machine controller 0864e12 port more tests from mao 41bd879 add make execution 560711f port test suite from mao 11ccad4 Record machine events ff5af86 Import right context package 5fa025d rename test-e2e to unify this target along all repos 832bfc2 Add support getting machineClasses from machine.Spec.ProviderConfig.ValueFrom 3fe301b Update funcs for new actuator interface 72ab90d revendor for new actuator interface 71913d5 Unexport some symbols that are no supposed to be exported f92ffbc Move lb actuator free code under its own file a65d554 Really sort instances by launch date 4ba52c7 Move code responsible for launching an instace into its own function 7a54ec0 Move functions dealing with instances under instances.go file 3948ae6 Put AMI ID retrieval under its own function c52d350 Move test/machines/awsclient.go under pkg/cloud/aws/actuators/machine ba65537 Add support for AWS Network Load Balancers 2363504 Add a RHEL7 dockerfile and standarize format 0f1f5d9 Validate machine status in e2e 56b0f59 Refactor e2e tests 98b836b Improve variable naming for placement matcher 9647f68 Fix copy paste error in logging 205838d Validate subnet and availability zone in e2e 2de9c39 Select subnet based on availability zone a6d8f20 Incorporate availability zone into placement decision 00972fc make ineffectual assignment effective 04cef3c apply less patches 7d62300 run dep ensure to update test framework 556f33c remove log-level option 9ccb179 add update status api call 1910baa make vendor 0ca8941 Stop nonstop status reconciliation ece3a63 updateMachineStatus: Log changes with ObjectReflectDiff 58c461b use proper fmt script 0626ab1 add json tags and tests for providerconfig and provider status 8c226db Logrus to glog 599071b add unit test for buildEC2Filters 312f2e7 Add machines to specified ELBs when creating/updating them 76ed570 Rename ClusterName to ClusterID 5c643f1 update and run scale down patches ecae784 Drop duplicate instance tags, if exists a023a30 use Update() instead of Status.Update() as CustomResourceSubresources might not be enable 63beccd use flag instead of pflag 1fb525f revendor for cluster api 2d88aef 8f6668c re enable testing framework 3c07079 revendor for testing framework 0ac46c0 Refactor test machine utils ac2d65e Add additional assertions to e2e test 955966b Cleanup tests 32a6bb4 Update Makefile 7bc2a82 move to use manager controller runtime client and fix unit tests a0d06f7 fix lints 0fc1b81 update docker and Makefile ea4fb15 update actuator for using new provider config 9d5de45 move provider config for new layout b4dd7a0 drop old machine controller and build new one 69d1882 add kubebuilder generated skeleton be2001a revendor for CRDs c92ffa3 comment uncompatible libs for crs revendor 7e0251b remove unused controllers c6efff4 unify clusterid retrieval 09b438f Makefile: add Go debug support for local binaries 32adb86 move cloud library into pkg d991b79 do not run e2e in container 4a80b8f tooling unification 47a5aa0 Add more owners 405e6dd make vendor cdb9df6 Flip to github.com/openshift/cluster-api-actuator-pkg f17d21a Terminate instances before destroying vpc b16dbee E2E: verify node roles and node machine matching 050edbe hack/aws-provision.sh: make it runnable from any directory b1f10a4 Drop -a from go build and go install 4281aef Update dependencies and add mock, testify and go-difflib. a3e6943 Add machine creation/failure conditions to machine provider status. a0333d4 Make golint happy a34408f Update vendor a89ebc6 Run e2e with Ginkgo e0fe34c make golint more confident 363f535 Run `make vendor` to update vendored dependencies 80cfbc4 Propagate node role through machine spec label ec4c9ac Annotate workers with node role 8438bf3 Deploy worker machines via machineset 515d25b Run kubectl with explicit kubeconfig 17d44ef cleanup makefile 57d57a0 Bootstrap cluster API stack 8205c1f Fix kubelet version to 1.11.3 7f68f86 Use terraform to bootstrap a kubernetes cluster, update examples to use filters 3e17b77 tf cleanup 7034500 Add README and move TF under hack dir 2fff462 automate prebuild setup for AWS 4756680 add whitespace to trigger CI image build 8e95bc2 Fix go lint complaints 821d9df Address make vet complains 7c5ccb5 Bundle controller manager into the AWS machine controller image. d72b9e2 Update go-lint.sh c243004 use hacks in makefile 0ff532b remove debug 33e7383 use origin-release images for tooling e99c5d5 fix some golint suggestions 85a1309 make go-fmt happy 14a527d lint yaml bc6e185 Prep Dockerfile for building with ART tooling. d0d31d7 fix lints path 61082d3 add scripts for lintin on ci ca7beac Update vendored deps to pickup latest cluster-api. 58d9b74 Requeue machine every 20s until running. fae6e22 add support for filters on sg and subnet cfe0745 Don't ask me, just it is e463c7b Set bridge-nf-call-iptables 954383f Prefix machines when bootstrapping deed620 Lookup for AMI using filters 73629fb change to openshift/origin-release:golang-1.10 c0d4488 change to openshift/origin-release:golang-1.10 82b92cd New 'aws-actuator bootstrap` command to bootstrap the kubernetes cluster from scratch 6790d03 Add convenience script to update AWS secrets 3ca36a9 Make all examples use ami-060f14ef82deddfc6 bf388b0 Add explicit error logging in actuator. 4002013 Regenerate master-machine user-data 5077a0f Update aws-actuator README.md 1f1ebaa Change apiVersion from awsproviderconfig to aws.cluster.k8s.io. bd9dc30 examples/master-machine: enable POD network 9c42b15 examples/master-machine: add extra SANs for master 04e0c04 examples/master-machine: switch to ami-060f14ef82deddfc6 a7a0d0e examples/cluster-api-server: add missing version in RoleBinding 2a4a19c Fix machine status updates due to wrong APIVersion. 622db0f Push missing test/utils b5c5890 use openshift/origin-base 998b2dd Assign code ownership so CI can work 651acd9 Bootstrap kubernetes cluster with kubeadm examples 2dd501b Allow to run the aws actuator operations directly 369a077 Dep ensure vendor 3cc5c93 Do not dep ensure anything f73a1d5 Describe how to deploy the cluster-api stack with minikuber + KVM e4bf8a9 Push vendor otherwise it takes forever to dep ensure 72b4823 Migrate cluster operator implementation of the aws actuator d257207 Mention the docker build does not work with RH docker, imagebuilder as its replacement

Ankitasw and others added 30 commits August 31, 2021 18:34
fix: node affinity rules indentation in external CCM CRDs
Add `kubernetes.io/cluster/<name> = shared`, `kubernetes.io/role/internal-elb =
1` to private subnets

Add `kubernetes.io/cluster/<name> = shared`, `kubernetes.io/role/elb = 1` to
public subnets
Add doc for using external cloud provider with CSI driver
fix: add the doc for using external CCM with CSI driver to summary_prefix.md
Bumps [github.com/itchyny/gojq](https://github.com/itchyny/gojq) from 0.12.4 to 0.12.5.
- [Release notes](https://github.com/itchyny/gojq/releases)
- [Changelog](https://github.com/itchyny/gojq/blob/main/CHANGELOG.md)
- [Commits](itchyny/gojq@v0.12.4...v0.12.5)

---
updated-dependencies:
- dependency-name: github.com/itchyny/gojq
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.9.6 to 0.9.7.
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Commits](kubernetes-sigs/controller-runtime@v0.9.6...v0.9.7)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
When subnet ID is specified in AWSMachine's spec, it should find the
subnet whether a failureDomain is specified or not.
Fix findSubnet function's logic when subnet ID is specified
Fix the gomega errors in tests with the controller runtime version bump
…ot/go_modules/hack/tools/github.com/itchyny/gojq-0.12.5

build(deps): bump github.com/itchyny/gojq from 0.12.4 to 0.12.5 in /hack/tools
…ot/go_modules/sigs.k8s.io/controller-runtime-0.9.7

build(deps): bump sigs.k8s.io/controller-runtime from 0.9.6 to 0.9.7
Go 1.17 introduces a new format for build constrants, see the following:

https://golang.org/doc/go1.17
https://go.googlesource.com/proposal/+/master/design/draft-gobuild.md

And files formatted using `go fmt` will be changed to use the new
format. For example in our e2e test files:

```go
//go:build e2e
// +build e2e
```

This change updates the header verification to strip out the new build
constraint tag.

Signed-off-by: Richard Case <[email protected]>
Bumps [github.com/golangci/golangci-lint](https://github.com/golangci/golangci-lint) from 1.42.0 to 1.42.1.
- [Release notes](https://github.com/golangci/golangci-lint/releases)
- [Changelog](https://github.com/golangci/golangci-lint/blob/master/CHANGELOG.md)
- [Commits](golangci/golangci-lint@v1.42.0...v1.42.1)

---
updated-dependencies:
- dependency-name: github.com/golangci/golangci-lint
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps golang from 1.16.7 to 1.16.8.

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

Signed-off-by: dependabot[bot] <[email protected]>
…infra

Add AWS cloud provider tags to pre-existing infrastructure
docs: update to contributing to reference developer guide in book
…ot/docker/golang-1.16.8

build(deps): bump golang from 1.16.7 to 1.16.8
…ot/go_modules/hack/tools/github.com/golangci/golangci-lint-1.42.1

build(deps): bump github.com/golangci/golangci-lint from 1.42.0 to 1.42.1 in /hack/tools
k8s-ci-robot and others added 14 commits December 9, 2021 12:31
…ebhook-controlplaneloadbalancer-name-immutable

fix: api/v1beta1: Make AWSCluster ControlPlaneLoadBalancer name immutable
Fix the AWS.SimpleQueueService.NonExistentQueue errors in CAPA logs
Remove unnecessary log from AWSInstanceState controller
Set condition severities to warning if control plane not initialized
Added additional options to `EKSConfig` so that additional configuration
options have be set when bootstrapping a node when it joins an eks
cluster.

Note: the IPv6 services cidr is deliberately not exposed as this will be
done when we come to do the IPv6 work. There are some comments left
in on purpose for this.

Signed-off-by: Richard Case <[email protected]>
…fig_options

feat: expose additional eks bootstrap options
@openshift-ci openshift-ci bot requested review from elmiko and enxebre January 7, 2022 15:16
@openshift-ci
Copy link

openshift-ci bot commented Jan 7, 2022

@alexander-demichev: The following test 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/yaml-lint 8d88b99313520da8298edfcaf5df0a4a20622187 link true /test yaml-lint

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.

@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 31, 2022
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 31, 2022
@JoelSpeed
Copy link

/approve

@openshift-ci
Copy link

openshift-ci bot commented Jan 31, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed

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 Jan 31, 2022
Copy link

@Fedosin Fedosin left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 1, 2022
@openshift-merge-robot openshift-merge-robot merged commit 469e15b into openshift:master Feb 1, 2022
@alexander-demicev alexander-demicev deleted the rebase-upstream-latest branch February 2, 2022 12:00
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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.