Skip to content
This repository has been archived by the owner on Mar 22, 2024. It is now read-only.

Allow overriding test images #186

Merged
merged 66 commits into from
Jun 14, 2023
Merged

Allow overriding test images #186

merged 66 commits into from
Jun 14, 2023

Conversation

kfox1111
Copy link
Contributor

@kfox1111 kfox1111 commented Apr 3, 2023

Some of the tests can't run on an isolated network. Make the images overridable.

kfox1111 and others added 30 commits March 22, 2023 13:11
@kfox1111
Add test to ensure image is overridable
3f4c8ca 
This test looks for any statically defined images. On finding one
it lists out the filename and a request to fix it.

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
@kfox1111
Fix exit codes
82928ff 
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
@kfox1111
Fix wording
da6789a 
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
@kfox1111
Fix the static images that are failing the test
113908c 
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
@kfox1111
Fix docs
2b30a37 
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
@kfox1111
Fix exit code
e5cb846 
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
@kfox1111
Fix the test
895a989 
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
@kfox1111
Make test more robust. Add comment.
dfb147f 
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
@kfox1111
Incorperate feedback
8e5b0fd 
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
@kfox1111
Merge branch 'main' into ensure-overrides
1dd3474
@kfox1111
Incorperate feedback
83fac39 
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
@kfox1111
Merge branch 'ensure-overrides' of https://github.com/spiffe/helm-charts
d360e4f 
 into ensure-overrides

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
@kfox1111 @marcofranssen
Add test to ensure image is overridable
eec142c 
This test looks for any statically defined images. On finding one
it lists out the filename and a request to fix it.

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
@kfox1111 @marcofranssen
Fix exit codes
079b334 
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
@kfox1111 @marcofranssen
Fix wording
c0257c7 
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
@kfox1111 @marcofranssen
Fix the static images that are failing the test
4a0544c 
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
@kfox1111 @marcofranssen
Fix docs
3f90bfb 
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
@kfox1111 @marcofranssen
Fix exit code
3c8ec5b 
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
@kfox1111 @marcofranssen
Fix the test
8e9a481 
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
@kfox1111 @marcofranssen
Make test more robust. Add comment.
6a63bf1 
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
@kfox1111 @marcofranssen
Incorperate feedback
5cbd5e7 
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
@kfox1111 @marcofranssen
Incorperate feedback
a5c4373 
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
@kfox1111
Fix merge conflict
c1087a0 
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
@kfox1111
Unquote the directory.
12935c3 
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
@kfox1111
Merge branch 'main' into ensure-overrides
d998989
@kfox1111
Merge branch 'main' into ensure-overrides
0eee49c
@kfox1111
Fix merge conflict
7d97aa1 
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
@kfox1111
Incorperate feedback
6cdb562 
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
@kfox1111
Merge branch 'main' into ensure-overrides
6495a1e
@kfox1111 @marcofranssen
Apply suggestions from code review
8b9a6ee 
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
Co-authored-by: Marco Franssen <marco.franssen@gmail.com>
kfox1111 and others added 2 commits May 23, 2023 08:50
@kfox1111 @marcofranssen
Apply suggestions from code review
d622b61 
Co-authored-by: Marco Franssen <marco.franssen@gmail.com>
Signed-off-by: kfox1111 <Kevin.Fox@pnnl.gov>
@kfox1111
Merge branch 'main' into ensure-overrides
175f233
@faisal-memon faisal-memon added this to the 0.9.0 milestone May 23, 2023
mrsabath
mrsabath approved these changes May 23, 2023
View reviewed changes
Copy link
Contributor

@mrsabath mrsabath left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

charts/spire/charts/spiffe-oidc-discovery-provider/values.yaml Outdated Show resolved Hide resolved
kfox1111 and others added 4 commits May 23, 2023 10:33
@kfox1111 @mrsabath
Apply suggestions from code review
2cd2be4 
Co-authored-by: Mariusz Sabath <mrsabath@gmail.com>
Signed-off-by: kfox1111 <Kevin.Fox@pnnl.gov>
@kfox1111
Fix docs
b30b689 
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
@kfox1111
Merge branch 'main' into ensure-overrides
4817054 
Signed-off-by: kfox1111 <Kevin.Fox@pnnl.gov>
@kfox1111
Merge branch 'main' into ensure-overrides
3f4b246
marcofranssen
marcofranssen suggested changes May 31, 2023
View reviewed changes
Copy link
Contributor

@marcofranssen marcofranssen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if this makes it better. This is more then just a simple default we discussed yesterday. This is a lot of boilerplating and code to maintain. In that case I would prefer to just add it to the values.yaml.

@kfox1111
Copy link
Contributor Author

yeah, the changes were more then I was hoping for too. But allowing the user to override them, along with wanting to make sure #249 could actually update the images made the logic pretty complicated. I'm ok reverting and just adding them back to values.

What do others think?

@faisal-memon faisal-memon modified the milestones: 0.9.0, 0.10.0 Jun 13, 2023
@kfox1111 kfox1111 mentioned this pull request Jun 13, 2023
Merged
@marcofranssen
Copy link
Contributor

marcofranssen commented Jun 14, 2023 •
edited
Loading

I suggest we move all back to the values.yaml and use the approach from this PR #311 to exclude them from docs.

@kfox1111
Copy link
Contributor Author

Rolled back.

@kfox1111
Add ignored to the testing values to remove it from docs.
1bc93c7 
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
@kfox1111
Fix newly introduced test
c6bb772 
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
@kfox1111
Copy link
Contributor Author

Ready to go

@marcofranssen marcofranssen enabled auto-merge (squash) June 14, 2023 19:16
marcofranssen
marcofranssen approved these changes Jun 14, 2023
View reviewed changes
Copy link
Contributor

@marcofranssen marcofranssen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@marcofranssen marcofranssen merged commit 4c0a1d5 into main Jun 14, 2023
43 checks passed
@marcofranssen marcofranssen deleted the ensure-overrides branch June 14, 2023 19:17
marcofranssen added a commit that referenced this pull request Jun 19, 2023
@marcofranssen
Bump spire Helm Chart version from 0.8.1 to 0.9.0
a150d14 
* 57a9320 Add SPIRE 1.7.0 to main readme (#357)
* af36f7c Align the bash image version with other instances for spire-agent (#356)
* c11a8c0 Implement pre-delete hook for graceful delete of spiffe-oidc-discovery-provider (#353)
* a6dcf26 Allow for SPIRE Agent to run as non root user (#209)
* 9cf6049 Allow contributors to run linting easily on local
* e88f7f6 Add configmap annotation to spire-bundle configmap (#351)
* 020bde8 Add support to create a issuer and CA via cert-manager (#342)
* 9d504de Ignore .DS_Store files
* e6b608c Bump spire images to 1.7.0 (#348)
* c97a788 Fix bundle role/rolebinding naming conflict (#333)
* b66077e Bump peter-evans/create-pull-request from 5.0.1 to 5.0.2 (#349)
* d0da864 Add missing metadata to subcharts (#347)
* 4c0a1d5 Allow overriding test images (#186)
* 250fd5d Add missing global values to charts (#311)
* 5d8c907 Dropping k8s versions in CI older than 3, as per readme (#344)
* 8748933 Update upstream-ca-secret.yaml (#341)
* 4e07450 Fix ingress annotations for federation (#337)
* ea09199 Bump actions/checkout from 3.5.0 to 3.5.3
* 87fe198 Merge pull request #331 from edwbuck/key_conventions
* ddc0166 Fix line wrapping.
* 0cae9ce Update project/conventions.md
* cb18255 Update project/conventions.md
* 52e5c24 Upgrade Tornjak to image v1.2.2 (#328)
* 28e2abf Choose a different example for dotted Acronyms.
* d60d68c Added accidentally clipped explicit name guidelines.
* abe9fde Merge branch 'main' into key_conventions
* f6a7b62 Update project/conventions.md
* c4d19db Update project/conventions.md
* cfa9f78 Bump test chart dependencies (#332)
* c3213ab Initial submission of Helm Chart key naming conventions.
* 28c0824 Bump test chart dependencies (#322)
* d333154 Add Makefile for local testing (#327)
* 9fa1ec2 Improve Tornjak backend test (#321)
* 5b779dc Improve Tornjak frontend test (#320)

Signed-off-by: Marco Franssen <marco.franssen@gmail.com>
@marcofranssen marcofranssen mentioned this pull request Jun 19, 2023
Merged
marcofranssen added a commit that referenced this pull request Jun 19, 2023
@marcofranssen
Bump spire Helm Chart version from 0.8.1 to 0.9.0
44f3554 
* 57a9320 Add SPIRE 1.7.0 to main readme (#357)
* af36f7c Align the bash image version with other instances for spire-agent (#356)
* c11a8c0 Implement pre-delete hook for graceful delete of spiffe-oidc-discovery-provider (#353)
* a6dcf26 Allow for SPIRE Agent to run as non root user (#209)
* 9cf6049 Allow contributors to run linting easily on local
* e88f7f6 Add configmap annotation to spire-bundle configmap (#351)
* 020bde8 Add support to create a issuer and CA via cert-manager (#342)
* 9d504de Ignore .DS_Store files
* e6b608c Bump spire images to 1.7.0 (#348)
* c97a788 Fix bundle role/rolebinding naming conflict (#333)
* b66077e Bump peter-evans/create-pull-request from 5.0.1 to 5.0.2 (#349)
* d0da864 Add missing metadata to subcharts (#347)
* 4c0a1d5 Allow overriding test images (#186)
* 250fd5d Add missing global values to charts (#311)
* 5d8c907 Dropping k8s versions in CI older than 3, as per readme (#344)
* 8748933 Update upstream-ca-secret.yaml (#341)
* 4e07450 Fix ingress annotations for federation (#337)
* ea09199 Bump actions/checkout from 3.5.0 to 3.5.3
* 87fe198 Merge pull request #331 from edwbuck/key_conventions
* ddc0166 Fix line wrapping.
* 0cae9ce Update project/conventions.md
* cb18255 Update project/conventions.md
* 52e5c24 Upgrade Tornjak to image v1.2.2 (#328)
* 28e2abf Choose a different example for dotted Acronyms.
* d60d68c Added accidentally clipped explicit name guidelines.
* abe9fde Merge branch 'main' into key_conventions
* f6a7b62 Update project/conventions.md
* c4d19db Update project/conventions.md
* cfa9f78 Bump test chart dependencies (#332)
* c3213ab Initial submission of Helm Chart key naming conventions.
* 28c0824 Bump test chart dependencies (#322)
* d333154 Add Makefile for local testing (#327)
* 9fa1ec2 Improve Tornjak backend test (#321)
* 5b779dc Improve Tornjak frontend test (#320)

Signed-off-by: Marco Franssen <marco.franssen@gmail.com>
@kfox1111 kfox1111 mentioned this pull request Jun 26, 2023
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@marcofranssen marcofranssen marcofranssen approved these changes

@mrsabath mrsabath mrsabath approved these changes

@developer-guy developer-guy Awaiting requested review from developer-guy

@dfeldman dfeldman Awaiting requested review from dfeldman

@faisal-memon faisal-memon Awaiting requested review from faisal-memon

@edwbuck edwbuck Awaiting requested review from edwbuck

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
0.10.0
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@kfox1111 @marcofranssen @mrsabath @faisal-memon