Skip to content

Commit 462178e

Browse files
committed
api/v1: Remove deprecated ContentConfigChecksum
Signed-off-by: Hidde Beydals <[email protected]>
1 parent b2da6f0 commit 462178e

File tree

4 files changed

+3
-51
lines changed

4 files changed

+3
-51
lines changed

api/v1/gitrepository_types.go

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -212,21 +212,6 @@ type GitRepositoryStatus struct {
212212
// +optional
213213
IncludedArtifacts []*Artifact `json:"includedArtifacts,omitempty"`
214214

215-
// ContentConfigChecksum is a checksum of all the configurations related to
216-
// the content of the source artifact:
217-
// - .spec.ignore
218-
// - .spec.recurseSubmodules
219-
// - .spec.included and the checksum of the included artifacts
220-
// observed in .status.observedGeneration version of the object. This can
221-
// be used to determine if the content of the included repository has
222-
// changed.
223-
// It has the format of `<algo>:<checksum>`, for example: `sha256:<checksum>`.
224-
//
225-
// Deprecated: Replaced with explicit fields for observed artifact content
226-
// config in the status.
227-
// +optional
228-
ContentConfigChecksum string `json:"contentConfigChecksum,omitempty"`
229-
230215
// ObservedIgnore is the observed exclusion patterns used for constructing
231216
// the source artifact.
232217
// +optional
@@ -238,7 +223,7 @@ type GitRepositoryStatus struct {
238223
ObservedRecurseSubmodules bool `json:"observedRecurseSubmodules,omitempty"`
239224

240225
// ObservedInclude is the observed list of GitRepository resources used to
241-
// to produce the current Artifact.
226+
// produce the current Artifact.
242227
// +optional
243228
ObservedInclude []GitRepositoryInclude `json:"observedInclude,omitempty"`
244229

config/crd/bases/source.toolkit.fluxcd.io_gitrepositories.yaml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -305,16 +305,6 @@ spec:
305305
- type
306306
type: object
307307
type: array
308-
contentConfigChecksum:
309-
description: "ContentConfigChecksum is a checksum of all the configurations
310-
related to the content of the source artifact: - .spec.ignore -
311-
.spec.recurseSubmodules - .spec.included and the checksum of the
312-
included artifacts observed in .status.observedGeneration version
313-
of the object. This can be used to determine if the content of the
314-
included repository has changed. It has the format of `<algo>:<checksum>`,
315-
for example: `sha256:<checksum>`. \n Deprecated: Replaced with explicit
316-
fields for observed artifact content config in the status."
317-
type: string
318308
includedArtifacts:
319309
description: IncludedArtifacts contains a list of the last successfully
320310
included Artifacts as instructed by GitRepositorySpec.Include.
@@ -379,7 +369,7 @@ spec:
379369
type: string
380370
observedInclude:
381371
description: ObservedInclude is the observed list of GitRepository
382-
resources used to to produce the current Artifact.
372+
resources used to produce the current Artifact.
383373
items:
384374
description: GitRepositoryInclude specifies a local reference to
385375
a GitRepository which Artifact (sub-)contents must be included,

controllers/gitrepository_controller.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,6 @@ func (r *GitRepositoryReconciler) reconcileArtifact(ctx context.Context, sp *pat
696696
// Record the observations on the object.
697697
obj.Status.Artifact = artifact.DeepCopy()
698698
obj.Status.IncludedArtifacts = *includes
699-
obj.Status.ContentConfigChecksum = "" // To be removed in the next API version.
700699
obj.Status.ObservedIgnore = obj.Spec.Ignore
701700
obj.Status.ObservedRecurseSubmodules = obj.Spec.RecurseSubmodules
702701
obj.Status.ObservedInclude = obj.Spec.Include

docs/api/v1/source.md

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -768,28 +768,6 @@ Artifacts as instructed by GitRepositorySpec.Include.</p>
768768
</tr>
769769
<tr>
770770
<td>
771-
<code>contentConfigChecksum</code><br>
772-
<em>
773-
string
774-
</em>
775-
</td>
776-
<td>
777-
<em>(Optional)</em>
778-
<p>ContentConfigChecksum is a checksum of all the configurations related to
779-
the content of the source artifact:
780-
- .spec.ignore
781-
- .spec.recurseSubmodules
782-
- .spec.included and the checksum of the included artifacts
783-
observed in .status.observedGeneration version of the object. This can
784-
be used to determine if the content of the included repository has
785-
changed.
786-
It has the format of <code>&lt;algo&gt;:&lt;checksum&gt;</code>, for example: <code>sha256:&lt;checksum&gt;</code>.</p>
787-
<p>Deprecated: Replaced with explicit fields for observed artifact content
788-
config in the status.</p>
789-
</td>
790-
</tr>
791-
<tr>
792-
<td>
793771
<code>observedIgnore</code><br>
794772
<em>
795773
string
@@ -826,7 +804,7 @@ configuration used to produce the current Artifact.</p>
826804
<td>
827805
<em>(Optional)</em>
828806
<p>ObservedInclude is the observed list of GitRepository resources used to
829-
to produce the current Artifact.</p>
807+
produce the current Artifact.</p>
830808
</td>
831809
</tr>
832810
<tr>

0 commit comments

Comments
 (0)