-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
[TEP-0089] - Spire Package #5039
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -44,5 +44,6 @@ run: | |
skip-dirs: | ||
- vendor | ||
- pkg/client | ||
- pkg/spire/test | ||
timeout: 10m | ||
modules-download-mode: vendor |
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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,68 @@ | ||
/* | ||
Copyright 2022 The Tekton Authors | ||
|
||
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 config | ||
|
||
import ( | ||
"fmt" | ||
"sort" | ||
"strings" | ||
) | ||
|
||
// SpireConfig holds the images reference for a number of container images used | ||
// across tektoncd pipelines. | ||
type SpireConfig struct { | ||
// The trust domain corresponds to the trust root of a SPIFFE identity provider. | ||
TrustDomain string | ||
// Path to the spire agent socket defined by the CSI driver | ||
SocketPath string | ||
// Spire server address | ||
ServerAddr string | ||
// Prefix to attach to the node name when registering it with the spire server | ||
NodeAliasPrefix string | ||
|
||
// MockSpire only to be used for testing the controller, will not exhibit | ||
// all characteristics of spire since it is only being used in the context | ||
// of process memory. | ||
MockSpire bool | ||
pxp928 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
|
||
// Validate returns an error if any image is not set. | ||
func (c SpireConfig) Validate() error { | ||
var unset []string | ||
for _, f := range []struct { | ||
v, name string | ||
}{ | ||
{c.TrustDomain, "spire-trust-domain"}, | ||
{c.SocketPath, "spire-socket-path"}, | ||
{c.ServerAddr, "spire-server-addr"}, | ||
{c.NodeAliasPrefix, "spire-node-alias-prefix"}, | ||
} { | ||
if f.v == "" { | ||
unset = append(unset, f.name) | ||
} | ||
} | ||
if len(unset) > 0 { | ||
sort.Strings(unset) | ||
return fmt.Errorf("found unset spire configuration flags: %s", unset) | ||
} | ||
|
||
if !strings.HasPrefix(c.NodeAliasPrefix, "/") { | ||
return fmt.Errorf("Spire node alias should start with a /") | ||
} | ||
|
||
return nil | ||
} |
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.
I guess this is the spire test client copied over from spire - any reason for excluding it here?
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.
The spire test package had a bunch of linting errors but as it was copied over from spire, I was not sure if I made sense to fix it all.
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.
Is this a verbatim copy, or are we making modifications?
(if we're making modifications, I'd prefer to keep linting on for our changes if possible)
we should also add instructions for how this was imported for if/when we need to update.
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.
If the test client needs to be part of the pipeline code base, we will need license headers in each file under
pkg/spire/test
, fix linting errors, and some kind of documentation on why ...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.
Created an issue #5281 to track this.