fluxcd
/
source-controller
mirror of https://github.com/fluxcd/source-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix public key naming 

Co-Authored-By: Hidde Beydals <hiddeco@users.noreply.github.com>
This commit is contained in:
Stefan Prodan 2020-04-14 16:31:15 +03:00 committed by stefanprodan
parent 96e289fda0
commit 440c70d010
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/v1alpha1/gitrepository_types.go
View File

@ -45,7 +45,7 @@ type GitRepositorySpec struct {
// +optional // +optional
Reference *GitRepositoryRef `json:"ref,omitempty"` Reference *GitRepositoryRef `json:"ref,omitempty"`
// Verify PGP signature for the commit that HEAD points to. // Verify OpenPGP signature for the commit that HEAD points to.
// +optional // +optional
Verification *GitRepositoryVerification `json:"verify,omitempty"` Verification *GitRepositoryVerification `json:"verify,omitempty"`
} }
@ -70,10 +70,9 @@ type GitRepositoryRef struct {
Commit string `json:"commit"` Commit string `json:"commit"`
} }
// GitRepositoryStatus defines the observed state of the GitRepository. // GitRepositoryVerification defines the OpenPGP signature verification process.
// GitRepositoryVerification defines the GPG signature verification process
type GitRepositoryVerification struct { type GitRepositoryVerification struct {
// Mode describes what git object should be verified. // Mode describes what git object should be verified, currently ('head').
// +kubebuilder:validation:Enum=head // +kubebuilder:validation:Enum=head
Mode string `json:"mode"` Mode string `json:"mode"`
@ -81,7 +80,7 @@ type GitRepositoryVerification struct {
SecretRef corev1.LocalObjectReference `json:"secretRef,omitempty"` SecretRef corev1.LocalObjectReference `json:"secretRef,omitempty"`
} }
// GitRepositoryStatus defines the observed state of GitRepository // GitRepositoryStatus defines the observed state of Git repository.
type GitRepositoryStatus struct { type GitRepositoryStatus struct {
// +optional // +optional
Conditions []SourceCondition `json:"conditions,omitempty"` Conditions []SourceCondition `json:"conditions,omitempty"`

2
controllers/gitrepository_controller.go
View File

@ -282,7 +282,7 @@ func (r *GitRepositoryReconciler) sync(ctx context.Context, repository sourcev1.
var secret corev1.Secret var secret corev1.Secret
err = r.Client.Get(ctx, name, &secret) err = r.Client.Get(ctx, name, &secret)
if err != nil { if err != nil {
err = fmt.Errorf("GPG public keys secret error: %w", err) err = fmt.Errorf("PGP public keys secret error: %w", err)
return sourcev1.GitRepositoryNotReady(repository, sourcev1.GitOperationFailedReason, err.Error()), err return sourcev1.GitRepositoryNotReady(repository, sourcev1.GitOperationFailedReason, err.Error()), err
} }