From 97a2cdd883bab01061784e6c4d26ba71d0480fe4 Mon Sep 17 00:00:00 2001
From: Hidde Beydals
Date: Fri, 24 Mar 2023 11:49:14 +0100
Subject: [PATCH] api/v1: Remove deprecated `GitImplementation`
Signed-off-by: Hidde Beydals
---
api/v1/gitrepository_types.go | 9 ------
...rce.toolkit.fluxcd.io_gitrepositories.yaml | 10 -------
controllers/gitrepository_controller_test.go | 7 ++---
docs/api/v1/source.md | 30 -------------------
4 files changed, 3 insertions(+), 53 deletions(-)
diff --git a/api/v1/gitrepository_types.go b/api/v1/gitrepository_types.go
index 4b76560a..2235c9bc 100644
--- a/api/v1/gitrepository_types.go
+++ b/api/v1/gitrepository_types.go
@@ -94,15 +94,6 @@ type GitRepositorySpec struct {
// +optional
Suspend bool `json:"suspend,omitempty"`
- // GitImplementation specifies which Git client library implementation to
- // use. Defaults to 'go-git', valid values are ('go-git', 'libgit2').
- // Deprecated: gitImplementation is deprecated now that 'go-git' is the
- // only supported implementation.
- // +kubebuilder:validation:Enum=go-git;libgit2
- // +kubebuilder:default:=go-git
- // +optional
- GitImplementation string `json:"gitImplementation,omitempty"`
-
// RecurseSubmodules enables the initialization of all submodules within
// the GitRepository as cloned from the URL, using their default settings.
// +optional
diff --git a/config/crd/bases/source.toolkit.fluxcd.io_gitrepositories.yaml b/config/crd/bases/source.toolkit.fluxcd.io_gitrepositories.yaml
index 6f9a0bfb..e5610057 100644
--- a/config/crd/bases/source.toolkit.fluxcd.io_gitrepositories.yaml
+++ b/config/crd/bases/source.toolkit.fluxcd.io_gitrepositories.yaml
@@ -51,16 +51,6 @@ spec:
description: GitRepositorySpec specifies the required configuration to
produce an Artifact for a Git repository.
properties:
- gitImplementation:
- default: go-git
- description: 'GitImplementation specifies which Git client library
- implementation to use. Defaults to ''go-git'', valid values are
- (''go-git'', ''libgit2''). Deprecated: gitImplementation is deprecated
- now that ''go-git'' is the only supported implementation.'
- enum:
- - go-git
- - libgit2
- type: string
ignore:
description: Ignore overrides the set of excluded patterns in the
.sourceignore format (which is the same as .gitignore). If not provided,
diff --git a/controllers/gitrepository_controller_test.go b/controllers/gitrepository_controller_test.go
index 688db75d..bbea4e73 100644
--- a/controllers/gitrepository_controller_test.go
+++ b/controllers/gitrepository_controller_test.go
@@ -1740,10 +1740,9 @@ func TestGitRepositoryReconciler_ConditionsUpdate(t *testing.T) {
Finalizers: []string{sourcev1.SourceFinalizer},
},
Spec: sourcev1.GitRepositorySpec{
- URL: server.HTTPAddress() + repoPath,
- GitImplementation: sourcev1.GoGitImplementation,
- Interval: metav1.Duration{Duration: interval},
- Timeout: &metav1.Duration{Duration: timeout},
+ URL: server.HTTPAddress() + repoPath,
+ Interval: metav1.Duration{Duration: interval},
+ Timeout: &metav1.Duration{Duration: timeout},
},
}
diff --git a/docs/api/v1/source.md b/docs/api/v1/source.md
index 64d12846..785733ec 100644
--- a/docs/api/v1/source.md
+++ b/docs/api/v1/source.md
@@ -184,21 +184,6 @@ GitRepository.
-gitImplementation
-
-string
-
- |
-
-(Optional)
- GitImplementation specifies which Git client library implementation to
-use. Defaults to ‘go-git’, valid values are (‘go-git’, ‘libgit2’).
-Deprecated: gitImplementation is deprecated now that ‘go-git’ is the
-only supported implementation.
- |
-
-
-
recurseSubmodules
bool
@@ -635,21 +620,6 @@ GitRepository.
|
-gitImplementation
-
-string
-
- |
-
-(Optional)
- GitImplementation specifies which Git client library implementation to
-use. Defaults to ‘go-git’, valid values are (‘go-git’, ‘libgit2’).
-Deprecated: gitImplementation is deprecated now that ‘go-git’ is the
-only supported implementation.
- |
-
-
-
recurseSubmodules
bool
|