Merge master into layering #3018
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
IsCoreOSVariant and compareOSImageURL have already been called or equivalent checks have been performed for all cases updateOS is called Since updateOS no longer requires any members of Daemon, it can be made a helper function instead of a method on Daemon
Call IsCoreOSVariant once in applyOSChanges instead of in every helper function
The comment on the function says it's probably unnecessary, and it adds unnecessary complexity to logic that must be maintained in two separate OS update paths (one in update() and one in checkStateOnFirstRun())
Certain helper methods should only be called on CoreOS, and it is more reliable to type check this than rely on method preconditions
Prep for further patches to use butane.
We have other various places that are directly trying to do this, and will fail if files are compressed. (This function should probably be upstreamed into Ignition actually)
This way they all correctly handle compression. Will be needed for a further patch which will use butane, which seems to use compression by default.
In ovnkube based cluster, the connectivity between MCD pods and kube-api-server relies on the openflow rules injected by ovnkube. If due to some reason, the ovnkube-node pod cannot start after the reboot of applying new MC. The MCD will not be able to reach the api-server. This PR let the kubeclient in MCD use the kube-api-server url of the node kubeconfig file instead. It eliminates the dependency on ovnkube-node pod from MCD.
Came up in review, but these are far from the only thing.
Signed-off-by: Jaime Caamaño Ruiz <jcaamano@redhat.com>
[OCPCLOUD-1436] Use afterburn to collect instance metadata in order to populate nodename
Bug 2060133: Explicitly set keyfile as the default plugin
Makes configure-ovs reload NM only when it has actually made any configuration change. Signed-off-by: Jaime Caamaño Ruiz <jcaamano@redhat.com>
Preparatory patches for bumping fcct -> butane
Before this commit, the `--templates` flag to `machine-config-controller` was associated only with the `start` subcommand even though the `bootstrap` subcommand also uses the value. As a result, users could not override the default `--templates` value when using the `bootstrap` command. This commit associates the persistent flag with the root command so that both the `start` and `bootstrap` subcommands expose the `--templates` flag to users.
Newer ignition versions validate this more.
Prep for updating the fcct -> butane vendoring.
Add `--templates` flag to MCC `bootstrap` command
configure-ovs: reload NM only when necessary
My immediate motivation is to gather more information in the MCD logs; same reason we log the boots. For coreos layering work, we will be sensitive to the initial bootimage more and may need to update it. Another angle for this is that we could actually plumb this information up into the node object, and from there into the operator/controller and feed it into prometheus and into telemetry, so we start to gather information on e.g. how many clusters have old bootimages. Also log Ignition provisioning information.
A long time ago now, etcd management was part of the MCO; that's no longer the case. We don't use these images, so drop them. This cleanup was just missed as part of 6f1b096 I noticed this while working on layering.
…oning daemon: bootimage and ignition logging
Remove unused etcd images
daemon.go/update.go: various cleanup surrounding OS updates
Note: Introducing the OpenShift Images client (https://github.com/openshift/client-go/blob/dcdf36a3a34fdfb24f56608719b35a1c524fa083/image/clientset/versioned/typed/image/v1/image.go#L19-L21) into the ClientSet causes an ambiguous selector because the OpenShift Config client (https://github.com/openshift/client-go/blob/dcdf36a3a34fdfb24f56608719b35a1c524fa083/config/clientset/versioned/typed/config/v1/config_client.go#L73-L75) also has an Images() method which returns an ImageInterface object.
Update vendored Ignition to v2.13
daemon: get the apiserver url from the kubelet's kubeconfig
In upstream, CSI migration is GA for Azure Disk and OpenStack Cinder. As a result, we need to stop force-disabling the feature gates because that doesn't have any effect anymore.
Before this commit, the MCO template rendering code created a template output parent directory with mode `0655`, which caused subsequent subdirectory creation and file writes to fail when running MCO in some unprivileged contexts that rely on linux file permissions (as both `wx` are required for owner writes). This commit adjusts the directory mode to `0755` on creation to ensure compatibility in those unprivileged contexts.
Bump(openshift/api): to get CSI changes
…-mco-test-library enhance MCO test library
Bug 2063324: Ensure directories are created with usable permission bits
openshift-ci
bot
added
the
approved
|
/skip |
|
|
|
@cgwalters: The following tests failed, say
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. |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cgwalters, kikisdeliveryservice 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 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Mostly to pick up the Ignition vendor bump and the daemon refactoring.