-
Notifications
You must be signed in to change notification settings - Fork 111
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
ensure network daemon checks if machineConfigPool resource registered before attempting to pause the MachineConfigPool #350
Merged
bn222
merged 4 commits into
k8snetworkplumbingwg:master
from
relyt0925:hypershift-support
Sep 21, 2022
+12,357
−6,639
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
c3fd5f6
update openshift-api to include external control plane topology enum
relyt0925 9ca96bc
add openshift context struct for openshift specific metadata
relyt0925 64a5943
add automation path for components to operate in a hypershift environ…
relyt0925 3a2ee55
update yaml configuration to allow for control plane status detection
relyt0925 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,6 +10,8 @@ import ( | |
"strings" | ||
"time" | ||
|
||
configv1 "github.com/openshift/api/config/v1" | ||
|
||
"github.com/golang/glog" | ||
sriovnetworkv1 "github.com/k8snetworkplumbingwg/sriov-network-operator/api/v1" | ||
snclientset "github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/client/clientset/versioned" | ||
|
@@ -26,6 +28,8 @@ import ( | |
|
||
mcfgv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" | ||
mcclientset "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned" | ||
|
||
"sigs.k8s.io/controller-runtime/pkg/client" | ||
) | ||
|
||
var ( | ||
|
@@ -123,10 +127,27 @@ func runStartCmd(cmd *cobra.Command, args []string) { | |
|
||
sriovnetworkv1.AddToScheme(scheme.Scheme) | ||
mcfgv1.AddToScheme(scheme.Scheme) | ||
configv1.Install(scheme.Scheme) | ||
|
||
snclient := snclientset.NewForConfigOrDie(config) | ||
kubeclient := kubernetes.NewForConfigOrDie(config) | ||
mcclient := mcclientset.NewForConfigOrDie(config) | ||
openshiftFlavor := utils.OpenshiftFlavorDefault | ||
if utils.ClusterType == utils.ClusterTypeOpenshift { | ||
infraClient, err := client.New(config, client.Options{ | ||
Scheme: scheme.Scheme, | ||
}) | ||
if err != nil { | ||
panic(err) | ||
} | ||
isHypershift, err := utils.IsExternalControlPlaneCluster(infraClient) | ||
if err != nil { | ||
panic(err) | ||
} | ||
if isHypershift { | ||
openshiftFlavor = utils.OpenshiftFlavorHypershift | ||
} | ||
} | ||
|
||
config.Timeout = 5 * time.Second | ||
writerclient := snclientset.NewForConfigOrDie(config) | ||
|
@@ -178,7 +199,10 @@ func runStartCmd(cmd *cobra.Command, args []string) { | |
startOpts.nodeName, | ||
snclient, | ||
kubeclient, | ||
mcclient, | ||
utils.OpenshiftContext{ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. i think it would be better if daemon will store a pointer to OpenshiftContext, that way its nil when cluster is not openshift. WDYT ? |
||
McClient: mcclient, | ||
OpenshiftFlavor: openshiftFlavor, | ||
}, | ||
exitCh, | ||
stopCh, | ||
syncCh, | ||
|
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
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thats used to construct Openshift context to my understanding. can we move this logic to a "NewOpenshfitContext(config)" or similar method part of openshift_context.go ?