Fix Dockerfile.openshift #817
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
Dockerfile still attempty to copy build/bin directory, but this folder has been removed. Signed-off-by: Radim Hrazdil <rhrazdil@redhat.com>
kubevirt-bot
added
release-note-none
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: phoracek 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 |
kubevirt-bot
added
the
approved
|
operator test failed, doesn't seem related to this PR. /test pull-kubernetes-nmstate-e2e-operator-k8s |
|
/cherry-pick release-0.47 |
|
@rhrazdil: only nmstate org members may request cherry picks. You can still do the cherry-pick manually. In response to this:
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. |
rhrazdil
added a commit
to rhrazdil/kubernetes-nmstate
that referenced
this pull request
Sep 7, 2021
Dockerfile still attempty to copy build/bin directory, but this folder has been removed. Signed-off-by: Radim Hrazdil <rhrazdil@redhat.com>
rhrazdil
added a commit
to rhrazdil/kubernetes-nmstate
that referenced
this pull request
Sep 7, 2021
Dockerfile still attempty to copy build/bin directory, but this folder has been removed. Signed-off-by: Radim Hrazdil <rhrazdil@redhat.com>
kubevirt-bot
pushed a commit
that referenced
this pull request
Sep 15, 2021
rhrazdil
added a commit
to rhrazdil/kubernetes-nmstate
that referenced
this pull request
Nov 9, 2021
Dockerfile still attempty to copy build/bin directory, but this folder has been removed. Signed-off-by: Radim Hrazdil <rhrazdil@redhat.com>
rhrazdil
added a commit
to rhrazdil/kubernetes-nmstate
that referenced
this pull request
Nov 9, 2021
Dockerfile still attempty to copy build/bin directory, but this folder has been removed. Signed-off-by: Radim Hrazdil <rhrazdil@redhat.com>
rhrazdil
added a commit
to rhrazdil/kubernetes-nmstate
that referenced
this pull request
Nov 9, 2021
Dockerfile still attempty to copy build/bin directory, but this folder has been removed. Signed-off-by: Radim Hrazdil <rhrazdil@redhat.com>
kubevirt-bot
pushed a commit
that referenced
this pull request
Nov 9, 2021
* Squash nns controller into node controller (#806) The reconcile loops of both of the controllers were pracitically the same. The only difference was the NodeController stored the previous state and updated the NNS only if the state was changed. When squashing, this logic had to be changed since removal of an exisiting NNS may be skipped. Now the nns is updated/re-created if the nns doesn't exist or the state was changed. The main changes to the exsisting flow are- 1. The existance of NNS will be verified anyway (so in the common use case of periodic update that happens every minute, there will be one extra, probably redundant, api call. I beleive it worth the duplication removal). 2. If the state was not changed since the last Reconcile, even in case of force-update, the NNS won't be updated. Signed-off-by: Alona Kaplan <alkaplan@redhat.com> * handler,webhook:use variable to set replicas (#810) In order to set the number of webhook replicas dynamically, the operator yaml should accept a variable to set number of replicas. An example use-case for that would be to set the number of webhook replicas to 1 when running on a Single-Node-Openshift cluster, and 2 otherwise. This commit introduce this variable and sets it with a fixed value of 2. In a follow-up work This could be enhanced to be completely dynamic. Signed-off-by: alonsadan <asadan@redhat.com> * Set the node as the owner reference of the enactment (#808) If the node is removed the enactment should be garbage collected. Currently we have a leak. Setting both the node and the policy as the owner references of the enactment means that the enactmant will be removed only when both the node and the policy are removed. Therefore, We have to choose only one of the two to be the owner ref. The removal of the other one should be handled by the controller. We don't have a centrelized controller, node specific controllers are running on each node. It doesn't make sense to handle a node removal by a controller running on the removed node. Therefore, the node was chosen to be the owner ref while the policy removal will be handled by the policy controller. Signed-off-by: Alona Kaplan <alkaplan@redhat.com> * vendor, Bump protobuf to v1.3.2 (#811) Signed-off-by: Ram Lavi <ralavi@redhat.com> * Use nmstate API for setting port vlan trunks in favor of using vlan-filtering script (#793) * Add test suite file to pkg/helpers pkg/helper tests are not executed because of missing suite file. Signed-off-by: Radim Hrazdil <rhrazdil@redhat.com> * Add sjson package for manipulating json strings Signed-off-by: Radim Hrazdil <rhrazdil@redhat.com> * Set default vlan config on linux-bridge ports in api Instead of applying vlan configuration after setting desiredState using a script, add default configuration to desiredState using nmstate API. Set default VLAN configuration to policy enactment desiredState in Reconcile, so that created NNCE desiredState contains the applied default values. Signed-off-by: Radim Hrazdil <rhrazdil@redhat.com> * Update desiredState defaults withing enactment init In order to save one API call, update the enactment desiredState defaults in initializeEnactment function. Signed-off-by: Radim Hrazdil <rhrazdil@redhat.com> * Remove unused vlan-filtering script Vlan configuration is done via nmstate API, so there is no need to keep the vlan_filtering script. Update test that relied on renaming the vlan_filtering script to make the NNCP configuration fail to achieve rollback. Instead, pass incorrect yaml. Signed-off-by: Radim Hrazdil <rhrazdil@redhat.com> * Add example for linux-bridge with port vlan Signed-off-by: Radim Hrazdil <rhrazdil@redhat.com> * handler,webhook:use variable to set min replicas (#812) In order to set the number of minimum webhook replicas dynamically, the operator yaml should accept a variable to set number of minimum replicas. An example use-case for that would be to set the minimum number of webhook replicas to 0 when running on a Single-Node-Openshift cluster, to no interfere with the upgrade process, where the number of active webhook pods will be reduced from 1 to 0 to perform the upgrade. This commit introduce this variable and sets it with a fixed value of 1. In a follow-up work This could be enhanced to be completely dynamic. Signed-off-by: alonsadan <asadan@redhat.com> * operator: Fix deletion of newer NMstate CRs (#816) Operator deletes new NMState CR if there is already one existing. The problem is however, that current CRs are not always listed in correct order, which means that the current logic sometimes doesn't delete new CR when another already exists, causing e2e tests to flake. This commit sorts listed NMstate CRs when there are more than one of them, and compare the name of the reconciled CR with the oldest. Signed-off-by: Radim Hrazdil <rhrazdil@redhat.com> * Delete unused function (#798) Signed-off-by: Radim Hrazdil <rhrazdil@redhat.com> * Try update nncp with non-cached client as backup (#815) After applying a policy, the cached client may return outdated resource if network configuration breaks connectivity, which may take up to a minute to refresh again. A previous commit addressed this by adding a custom backoff timeout that would wait for the cached client to return updated resource. But that solution is sub-optimal since the wait time may take a lot of time, causing the handler to be effectively stuck. To improve this behaviour, this change updates NNCP in two steps 1. Try using cached client 2. Try using non-cached client if all attempts with cached client fail on conflict This way, handler isn't blocking reconcile for long period of time Signed-off-by: Radim Hrazdil <rhrazdil@redhat.com> * Fix Dockerfile.openshift (#817) Dockerfile still attempty to copy build/bin directory, but this folder has been removed. Signed-off-by: Radim Hrazdil <rhrazdil@redhat.com> Co-authored-by: Alona Paz <alkaplan@redhat.com> Co-authored-by: Alon Sadan <46392127+alonSadan@users.noreply.github.com> Co-authored-by: RamLavi <ralavi@redhat.com>
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.
Dockerfile.openshift still attempts to copy build/bin directory,
but this folder has been removed.
Signed-off-by: Radim Hrazdil rhrazdil@redhat.com
Is this a BUG FIX or a FEATURE ?:
What this PR does / why we need it:
Special notes for your reviewer:
Release note: