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

Merge pull request #575 from pjbgf/fix-push 

Ensure git status is checked at the correct time
This commit is contained in:
Paulo Gomes 2022-05-09 16:28:55 +01:00 committed by GitHub
parent 43235df2b8 50cb97f331
commit 1a06b7ae49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -225,13 +225,12 @@ ifneq ($(shell grep -o 'LIBGIT2_TAG ?= \w.*' Makefile | cut -d ' ' -f 3), $(shel
exit 1; \ exit 1; \
} }
endif endif
ifneq (, $(shell git status --porcelain --untracked-files=no))
@{ \ @if [ ! "$$(git status --porcelain --untracked-files=no)" = "" ]; then \
echo "working directory is dirty:"; \ echo "working directory is dirty:"; \
git --no-pager diff; \ git --no-pager diff; \
exit 1; \ exit 1; \
} fi
endif
# go-install-tool will 'go install' any package $2 and install it to $1. # go-install-tool will 'go install' any package $2 and install it to $1.
define go-install-tool define go-install-tool

4
api/v1beta1/gitrepository_types.go
View File

@ -44,8 +44,8 @@ type GitRepositorySpec struct {
// The secret name containing the Git credentials. // The secret name containing the Git credentials.
// For HTTPS repositories the secret must contain username and password // For HTTPS repositories the secret must contain username and password
// fields. // fields.
// For SSH repositories the secret must contain identity, identity.pub and // For SSH repositories the secret must contain identity and known_hosts
// known_hosts fields. // fields.
// +optional // +optional
SecretRef *meta.LocalObjectReference `json:"secretRef,omitempty"` SecretRef *meta.LocalObjectReference `json:"secretRef,omitempty"`

4
docs/spec/v1beta1/gitrepositories.md
View File

@ -19,8 +19,8 @@ type GitRepositorySpec struct {
// The secret name containing the Git credentials. // The secret name containing the Git credentials.
// For HTTPS repositories the secret must contain username and password // For HTTPS repositories the secret must contain username and password
// fields. // fields.
// For SSH repositories the secret must contain identity, identity.pub and // For SSH repositories the secret must contain identity and known_hosts
// known_hosts fields. // fields.
// +optional // +optional
SecretRef *corev1.LocalObjectReference `json:"secretRef,omitempty"` SecretRef *corev1.LocalObjectReference `json:"secretRef,omitempty"`

2
main.go
View File

@ -245,7 +245,7 @@ func main() {
ControllerName: controllerName, ControllerName: controllerName,
Cache: c, Cache: c,
TTL: ttl, TTL: ttl,
CacheRecorder: cacheRecorder, CacheRecorder: cacheRecorder,
}).SetupWithManagerAndOptions(mgr, controllers.HelmChartReconcilerOptions{ }).SetupWithManagerAndOptions(mgr, controllers.HelmChartReconcilerOptions{
MaxConcurrentReconciles: concurrent, MaxConcurrentReconciles: concurrent,
RateLimiter: helper.GetRateLimiter(rateLimiterOptions), RateLimiter: helper.GetRateLimiter(rateLimiterOptions),