-
Notifications
You must be signed in to change notification settings - Fork 191
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Philip Laine <[email protected]>
- Loading branch information
1 parent
0465b12
commit 3ba0e6f
Showing
13 changed files
with
237 additions
and
41 deletions.
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
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
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 |
|---|---|---|
|
|
@@ -18,7 +18,9 @@ package controllers | |
|
|
||
| import ( | ||
| "context" | ||
| "crypto/tls" | ||
| "fmt" | ||
| "net/http" | ||
| "net/url" | ||
| "os" | ||
| "path" | ||
|
|
@@ -30,6 +32,8 @@ import ( | |
| "github.com/go-git/go-git/v5/config" | ||
| "github.com/go-git/go-git/v5/plumbing" | ||
| "github.com/go-git/go-git/v5/plumbing/object" | ||
| "github.com/go-git/go-git/v5/plumbing/transport/client" | ||
| httptransport "github.com/go-git/go-git/v5/plumbing/transport/http" | ||
| "github.com/go-git/go-git/v5/storage/memory" | ||
| . "github.com/onsi/ginkgo" | ||
| . "github.com/onsi/ginkgo/extensions/table" | ||
|
|
@@ -38,6 +42,7 @@ import ( | |
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/types" | ||
|
|
||
| "github.com/fluxcd/pkg/apis/meta" | ||
| "github.com/fluxcd/pkg/gittestserver" | ||
|
|
||
| sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" | ||
|
|
@@ -65,6 +70,18 @@ var _ = Describe("GitRepositoryReconciler", func() { | |
| err = k8sClient.Create(context.Background(), namespace) | ||
| Expect(err).NotTo(HaveOccurred(), "failed to create test namespace") | ||
|
|
||
| cert := corev1.Secret{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "cert", | ||
| Namespace: namespace.Name, | ||
| }, | ||
| Data: map[string][]byte{ | ||
| "caFile": exampleCA, | ||
| }, | ||
| } | ||
| err = k8sClient.Create(context.Background(), &cert) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| gitServer, err = gittestserver.NewTempGitServer() | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| gitServer.AutoCreate() | ||
|
|
@@ -88,6 +105,7 @@ var _ = Describe("GitRepositoryReconciler", func() { | |
| expectRevision string | ||
|
|
||
| gitImplementation string | ||
| certSecretRef *meta.LocalObjectReference | ||
| } | ||
|
|
||
| DescribeTable("Git references tests", func(t refTestCase) { | ||
|
|
@@ -274,6 +292,55 @@ var _ = Describe("GitRepositoryReconciler", func() { | |
| Expect(err).NotTo(HaveOccurred()) | ||
| u.Path = path.Join(u.Path, fmt.Sprintf("repository-%s.git", randStringRunes(5))) | ||
|
|
||
| var transport = httptransport.NewClient(&http.Client{ | ||
| Transport: &http.Transport{ | ||
| TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, | ||
| }, | ||
| }) | ||
| client.InstallProtocol("https", transport) | ||
|
|
||
| fs := memfs.New() | ||
| gitrepo, err := git.Init(memory.NewStorage(), fs) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| wt, err := gitrepo.Worktree() | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| ff, _ := fs.Create("fixture") | ||
| _ = ff.Close() | ||
| _, err = wt.Add(fs.Join("fixture")) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| commit, err := wt.Commit("Sample", &git.CommitOptions{Author: &object.Signature{ | ||
| Name: "John Doe", | ||
| Email: "[email protected]", | ||
| When: time.Now(), | ||
| }}) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| gitrepo.Worktree() | ||
|
|
||
| for _, ref := range t.createRefs { | ||
| hRef := plumbing.NewHashReference(plumbing.ReferenceName(ref), commit) | ||
| err = gitrepo.Storer.SetReference(hRef) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| } | ||
|
|
||
| remote, err := gitrepo.CreateRemote(&config.RemoteConfig{ | ||
| Name: "origin", | ||
| URLs: []string{u.String()}, | ||
| }) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| err = remote.Push(&git.PushOptions{ | ||
| RefSpecs: []config.RefSpec{"refs/heads/*:refs/heads/*", "refs/tags/*:refs/tags/*"}, | ||
| }) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| t.reference.Commit = strings.Replace(t.reference.Commit, "<commit>", commit.String(), 1) | ||
|
|
||
| client.InstallProtocol("https", httptransport.DefaultClient) | ||
|
|
||
| key := types.NamespacedName{ | ||
| Name: fmt.Sprintf("git-ref-test-%s", randStringRunes(5)), | ||
| Namespace: namespace.Name, | ||
|
|
@@ -288,6 +355,8 @@ var _ = Describe("GitRepositoryReconciler", func() { | |
| Interval: metav1.Duration{Duration: indexInterval}, | ||
| Reference: t.reference, | ||
| GitImplementation: t.gitImplementation, | ||
| SecretRef: nil, | ||
| CertSecretRef: t.certSecretRef, | ||
| }, | ||
| } | ||
| Expect(k8sClient.Create(context.Background(), created)).Should(Succeed()) | ||
|
|
@@ -316,13 +385,22 @@ var _ = Describe("GitRepositoryReconciler", func() { | |
| expectStatus: metav1.ConditionFalse, | ||
| expectMessage: "x509: certificate signed by unknown authority", | ||
| }), | ||
| Entry("self signed v2", refTestCase{ | ||
| Entry("self signed v2 without CA", refTestCase{ | ||
| reference: &sourcev1.GitRepositoryRef{Branch: "main"}, | ||
| waitForReason: sourcev1.GitOperationFailedReason, | ||
| expectStatus: metav1.ConditionFalse, | ||
| expectMessage: "error: user rejected certificate", | ||
| gitImplementation: sourcev1.LibGit2Implementation, | ||
| }), | ||
| Entry("self signed v2 with CA", refTestCase{ | ||
| reference: &sourcev1.GitRepositoryRef{Branch: "some-branch"}, | ||
| createRefs: []string{"refs/heads/some-branch"}, | ||
| waitForReason: sourcev1.GitOperationSucceedReason, | ||
| expectStatus: metav1.ConditionTrue, | ||
| expectRevision: "some-branch", | ||
| certSecretRef: &meta.LocalObjectReference{Name: "cert"}, | ||
| gitImplementation: sourcev1.LibGit2Implementation, | ||
| }), | ||
| ) | ||
| }) | ||
| }) | ||
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
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.