Skip to content
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

feat(appset): Add support for self-signed TLS / Certificates for Gitlab Scm Provider #14348

Merged
merged 9 commits into from
Jul 11, 2023
Merged

feat(appset): Add support for self-signed TLS / Certificates for Gitlab Scm Provider #14348

merged 9 commits into from
Jul 11, 2023

Conversation

ishitasequeira
Copy link
Member

@ishitasequeira ishitasequeira commented Jul 5, 2023

Add support for self-signed TLS / Certificates for Gitlab SCM Provider by adding a new insecure flag.

Note on DCO:

If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • The title of the PR conforms to the Toolchain Guide
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • Optional. My organization is added to USERS.md.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.

Please see Contribution FAQs if you have questions about your pull-request.

@ishitasequeira ishitasequeira changed the title Add support for self-signed TLS / Certificates for Gitlab Scm Provider feat: Add support for self-signed TLS / Certificates for Gitlab Scm Provider Jul 5, 2023
@codecov
Copy link

codecov bot commented Jul 5, 2023

Codecov Report

Patch coverage: 65.51% and project coverage change: +0.02 🎉

Comparison is base (0564249) 49.73% compared to head (6db0eac) 49.75%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #14348      +/-   ##
==========================================
+ Coverage   49.73%   49.75%   +0.02%     
==========================================
  Files         261      261              
  Lines       44707    44754      +47     
==========================================
+ Hits        22234    22268      +34     
- Misses      20286    20295       +9     
- Partials     2187     2191       +4     
Impacted Files Coverage Δ
...cationset/controllers/applicationset_controller.go 62.53% <ø> (ø)
...licationset/generators/generator_spec_processor.go 59.63% <ø> (ø)
applicationset/generators/list.go 61.11% <ø> (ø)
applicationset/generators/pull_request.go 44.72% <0.00%> (-0.28%) ⬇️
applicationset/generators/scm_provider.go 33.33% <0.00%> (-0.20%) ⬇️
.../apis/application/v1alpha1/applicationset_types.go 31.25% <ø> (ø)
applicationset/utils/utils.go 77.49% <63.33%> (-1.52%) ⬇️
applicationset/services/scm_provider/gitlab.go 74.46% <90.00%> (+1.33%) ⬆️
applicationset/generators/cluster.go 80.34% <100.00%> (ø)
applicationset/services/pull_request/gitlab.go 89.06% <100.00%> (+1.56%) ⬆️

... and 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@ishitasequeira ishitasequeira marked this pull request as ready for review July 5, 2023 19:46
Copy link
Member

@crenshaw-dev crenshaw-dev left a comment

Choose a reason for hiding this comment

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

A couple general notes:

  1. should we add the same for the pull request generator?
  2. should we also provide the ability for the user to configure a cert bundle on the appset controller so that users don't have to disable cert validation?

Copy link
Member

@crenshaw-dev crenshaw-dev left a comment

Choose a reason for hiding this comment

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

Wording nitpicks mostly.

Can you add tests to show that a self-signed cert works when specified without setting insecure: true?

applicationset/controllers/applicationset_controller.go Outdated Show resolved Hide resolved
applicationset/utils/utils.go Outdated Show resolved Hide resolved
pkg/apis/application/v1alpha1/applicationset_types.go Outdated Show resolved Hide resolved
pkg/apis/application/v1alpha1/applicationset_types.go Outdated Show resolved Hide resolved
Signed-off-by: ishitasequeira <ishiseq29@gmail.com>
Signed-off-by: ishitasequeira <ishiseq29@gmail.com>
Signed-off-by: ishitasequeira <ishiseq29@gmail.com>
Signed-off-by: ishitasequeira <ishiseq29@gmail.com>
Signed-off-by: ishitasequeira <ishiseq29@gmail.com>
Signed-off-by: ishitasequeira <ishiseq29@gmail.com>
Signed-off-by: ishitasequeira <ishiseq29@gmail.com>
Signed-off-by: ishitasequeira <ishiseq29@gmail.com>
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
applicationset/generators/matrix.go Outdated Show resolved Hide resolved
applicationset/generators/merge.go Outdated Show resolved Hide resolved
@crenshaw-dev crenshaw-dev changed the title feat: Add support for self-signed TLS / Certificates for Gitlab Scm Provider feat(appset): Add support for self-signed TLS / Certificates for Gitlab Scm Provider Jul 11, 2023
@crenshaw-dev crenshaw-dev enabled auto-merge (squash) July 11, 2023 15:05
@crenshaw-dev
Copy link
Member

/cherry-pick release-2.8

@crenshaw-dev crenshaw-dev merged commit 6fb238c into argoproj:master Jul 11, 2023
@gcp-cherry-pick-bot
Copy link

Cherry-pick failed with Merge error 6fb238c7d8b05e38b1ec25aaa4eb354be31d57ee into temp-cherry-pick-2a25f0-release-2.8

crenshaw-dev added a commit that referenced this pull request Jul 11, 2023
…ab Scm Provider (#14348) (#14462)

* Add support for self-signed TLS / Certificates for Gitlab Scm Provider



* Add support for self-signed TLS / Certificates for Gitlab Pull Request



* Add TLS configuration for SCM and Pull request Gitlab Provider



* rebase with master



* add params to argocd-cmd-params-cm and docs



* fix generated manifests



* Address comments for docs



* Add test cases to validate insecure mode and ca cert combinations



* simplify (#24)



---------

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
yyzxw pushed a commit to yyzxw/argo-cd that referenced this pull request Aug 9, 2023
…ab Scm Provider (argoproj#14348)

* Add support for self-signed TLS / Certificates for Gitlab Scm Provider

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* Add support for self-signed TLS / Certificates for Gitlab Pull Request

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* Add TLS configuration for SCM and Pull request Gitlab Provider

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* rebase with master

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* add params to argocd-cmd-params-cm and docs

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* fix generated manifests

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* Address comments for docs

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* Add test cases to validate insecure mode and ca cert combinations

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* simplify (argoproj#24)

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

---------

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
@suzaku suzaku mentioned this pull request Aug 15, 2023
tesla59 pushed a commit to tesla59/argo-cd that referenced this pull request Dec 16, 2023
…ab Scm Provider (argoproj#14348)

* Add support for self-signed TLS / Certificates for Gitlab Scm Provider

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* Add support for self-signed TLS / Certificates for Gitlab Pull Request

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* Add TLS configuration for SCM and Pull request Gitlab Provider

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* rebase with master

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* add params to argocd-cmd-params-cm and docs

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* fix generated manifests

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* Address comments for docs

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* Add test cases to validate insecure mode and ca cert combinations

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* simplify (argoproj#24)

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

---------

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants