Skip to content

Commit dc5f7d0

Browse files
Merge pull request #1062 from renyunkang/ca
update agocd repo skip tls verify
2 parents 6831f77 + ada02a9 commit dc5f7d0

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

controllers/argocd/git-repository-controller.go

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,13 @@ import (
2222

2323
"github.com/go-logr/logr"
2424
"github.com/kubesphere/ks-devops/pkg/api/devops/v1alpha3"
25+
"github.com/kubesphere/ks-devops/pkg/constants"
2526
"github.com/kubesphere/ks-devops/pkg/utils/k8sutil"
2627
v1 "k8s.io/api/core/v1"
2728
"k8s.io/apimachinery/pkg/types"
2829
"k8s.io/client-go/tools/record"
2930
ctrl "sigs.k8s.io/controller-runtime"
31+
"sigs.k8s.io/controller-runtime/pkg/builder"
3032
"sigs.k8s.io/controller-runtime/pkg/client"
3133
"sigs.k8s.io/controller-runtime/pkg/predicate"
3234
)
@@ -132,6 +134,12 @@ func (c *GitRepositoryController) setArgoGitRepoFields(repo *v1alpha3.GitReposit
132134
secret.Data["type"] = []byte("git")
133135
secret.Data["url"] = []byte(repo.Spec.URL)
134136

137+
if skip, exist := repo.Annotations[constants.InsecureSkipTLSAnnotationKey]; exist && skip == "true" {
138+
secret.Data["insecure"] = []byte("true")
139+
} else {
140+
delete(secret.Data, "insecure")
141+
}
142+
135143
c.setArgoGitRepoAuth(secret, repo.Spec.Secret)
136144
}
137145

@@ -176,7 +184,8 @@ func (c *GitRepositoryController) SetupWithManager(mgr ctrl.Manager) error {
176184
c.recorder = mgr.GetEventRecorderFor(c.GetName())
177185
return ctrl.NewControllerManagedBy(mgr).
178186
Named("argocd_git_repository_controller").
179-
WithEventFilter(predicate.GenerationChangedPredicate{}).
180-
For(&v1alpha3.GitRepository{}).
187+
For(&v1alpha3.GitRepository{}, builder.WithPredicates(
188+
predicate.ResourceVersionChangedPredicate{},
189+
)).
181190
Complete(c)
182191
}

0 commit comments

Comments
 (0)