-
Notifications
You must be signed in to change notification settings - Fork 193
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
Create await-node-ready binary and add to gateway and route-agent images #3237
Merged
Merged
Changes from all commits
Commits
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| #!/bin/bash | ||
| set -e -x | ||
|
|
||
| trap "exit 1" SIGTERM SIGINT | ||
|
|
||
| SUBMARINER_VERBOSITY=${SUBMARINER_VERBOSITY:-2} | ||
|
|
||
| if [ "${SUBMARINER_DEBUG}" == "true" ]; then | ||
| DEBUG="-v=3" | ||
| else | ||
| DEBUG="-v=${SUBMARINER_VERBOSITY}" | ||
| fi | ||
|
|
||
| exec await-node-ready ${DEBUG} -alsologtostderr |
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 |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /* | ||
| SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| Copyright Contributors to the Submariner project. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package main | ||
|
|
||
| import ( | ||
| "flag" | ||
|
|
||
| "github.com/submariner-io/admiral/pkg/log" | ||
| "github.com/submariner-io/admiral/pkg/log/kzerolog" | ||
| admversion "github.com/submariner-io/admiral/pkg/version" | ||
| "github.com/submariner-io/submariner/pkg/node" | ||
| "github.com/submariner-io/submariner/pkg/versions" | ||
| "k8s.io/client-go/kubernetes" | ||
| "k8s.io/client-go/tools/clientcmd" | ||
| logf "sigs.k8s.io/controller-runtime/pkg/log" | ||
| "sigs.k8s.io/controller-runtime/pkg/manager/signals" | ||
| ) | ||
|
|
||
| var ( | ||
| masterURL string | ||
| kubeconfig string | ||
| logger = log.Logger{Logger: logf.Log.WithName("main")} | ||
| showVersion = false | ||
| ) | ||
|
|
||
| func main() { | ||
| kzerolog.AddFlags(nil) | ||
| flag.Parse() | ||
|
|
||
| admversion.Print("await-node-ready", versions.Submariner()) | ||
|
|
||
| if showVersion { | ||
| return | ||
| } | ||
|
|
||
| kzerolog.InitK8sLogging() | ||
|
|
||
| versions.Log(&logger) | ||
|
|
||
| logger.Info("Initializing K8s client...") | ||
|
|
||
| ctx := signals.SetupSignalHandler() | ||
|
|
||
| cfg, err := clientcmd.BuildConfigFromFlags(masterURL, kubeconfig) | ||
| logger.FatalOnError(err, "Error building kubeconfig") | ||
|
|
||
| k8sClientSet, err := kubernetes.NewForConfig(cfg) | ||
| logger.FatalOnError(err, "Error building clientset") | ||
|
|
||
| logger.Info("Awaiting local node ready...") | ||
|
|
||
| node.WaitForLocalNodeReady(ctx, k8sClientSet) | ||
| } |
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.
This also uses
pkg/nodeandpkg/versions.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.
Ok but is that needed? Route agent only specifies
$(shell find pkg/routeagent_driver)but it uses other packages as well. Same with globalnet -$(shell find pkg/globalnet). The executable binary runs fine locally.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.
It doesn’t affect the binary that gets built, it only determines when it gets rebuilt. But this approach is inherently brittle, I’ve got a better one — let’s merge this and I’ll fix all the binaries properly.