Skip to content

fix autogenerated image integration insecure setting#4039

Merged
RTann merged 1 commit intomasterfrom
ross/imgintegration-insecure
Dec 6, 2022
Merged

fix autogenerated image integration insecure setting#4039
RTann merged 1 commit intomasterfrom
ross/imgintegration-insecure

Conversation

@RTann
Copy link
Contributor

@RTann RTann commented Dec 6, 2022

Description

dockerCfg.Insecure is either set to !validTLS or false before this, but then we set it again to !validTLS. This removes that line. The multiple dockerCfg.Insecure settings were introduced in #2572. That PR wanted to set dockerCfg.Insecure = false when tlsErr != nil, but it set it to dockerCfg.Insecure = !validTLS = true (since validTLS = false when tlsErr != nil).

Checklist

  • Investigated and inspected CI test results
  • [ ] Unit test and regression tests added
  • [ ] Evaluated and added CHANGELOG entry if required
  • [ ] Determined and documented upgrade steps
  • [ ] Documented user facing changes (create PR based on openshift/openshift-docs and merge into rhacs-docs)

Testing Performed

CI

@RTann RTann requested a review from dhaus67 December 6, 2022 20:52
@RTann RTann changed the title fix autogenerated docker reg insecure fix autogenerated image integration insecure setting Dec 6, 2022
@ghost
Copy link

ghost commented Dec 6, 2022

Images are ready for the commit at a9422d6.

To use with deploy scripts, first export MAIN_IMAGE_TAG=3.73.x-157-ga9422d6116.

@RTann RTann merged commit 95d2a6d into master Dec 6, 2022
@RTann RTann deleted the ross/imgintegration-insecure branch December 6, 2022 23:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants