This repository has been archived by the owner on Jul 11, 2023. It is now read-only.
Use the AzureResource Informer; Refactor for clarity #20
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 |
|---|---|---|
|
|
@@ -5,26 +5,27 @@ import ( | |
| "flag" | ||
| "fmt" | ||
| "os" | ||
| "os/signal" | ||
| "syscall" | ||
|
|
||
| "github.com/deislabs/smc/pkg/utils" | ||
|
|
||
| envoyControlPlane "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2" | ||
| "github.com/golang/glog" | ||
| "github.com/spf13/pflag" | ||
|
|
||
| sdsServer "github.com/deislabs/smc/pkg/envoy/sds" | ||
| ) | ||
|
|
||
| const ( | ||
| serverType = "SDS" | ||
| ) | ||
|
|
||
| var ( | ||
| flags = pflag.NewFlagSet(`diplomat-sds`, pflag.ExitOnError) | ||
| keysDirectory = flags.String("keys-directory", "", "Directory where the keys are stored") | ||
| verbosity = flags.Int("verbosity", 1, "Set logging verbosity level") | ||
| port = flags.Int("port", 15123, "Service Discovery Service port number. (Default: 15123)") | ||
| ) | ||
|
|
||
| func main() { | ||
|
|
@@ -34,10 +35,16 @@ func main() { | |
| ctx, cancel := context.WithCancel(context.Background()) | ||
| defer cancel() | ||
|
|
||
| grpcServer, lis := utils.NewGrpc(serverType, *port) | ||
|
There was a problem hiding this comment. as @vramakrishnan requested - we moved the gRPC tools in pkg/utils |
||
| sds := sdsServer.NewSDSServer(keysDirectory) | ||
| envoyControlPlane.RegisterSecretDiscoveryServiceServer(grpcServer, sds) | ||
| go utils.GrpcServe(ctx, grpcServer, lis, cancel, serverType) | ||
|
|
||
| sigChan := make(chan os.Signal, 1) | ||
| signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM) | ||
| <-sigChan | ||
|
|
||
| glog.Info("Goodbye!") | ||
|
Comment on lines
+43
to
+47
There was a problem hiding this comment. The syscall handling block here is a bit of a noop at the moment. Reasons for putting it: |
||
| } | ||
|
|
||
| func parseFlags() { | ||
|
|
||
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,9 @@ | ||
| apiVersion: smc.osm.k8s.io/v1 | ||
| kind: AzureResource | ||
| metadata: | ||
| name: bookstore | ||
| namespace: smc | ||
| labels: | ||
| app: bookstore-1 | ||
| spec: | ||
| resourceid: /subscriptions/abc/resourcegroups/xyz/providers/Microsoft.Compute/virtualMachines/myVM |
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 |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| FROM alpine:3.10.1 | ||
| ADD bin/eds /eds | ||
| ADD ./scripts/run-eds.sh /run-eds.sh | ||
| RUN chmod +x /eds | ||
| RUN chmod +x /run-eds.sh |
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.
We no longer need
AZURE_RESOURCE_GROUP- the subscription UUID is now available in theAzureResourceCRD