api/v1: Remove deprecated `ContentConfigChecksum`

Signed-off-by: Hidde Beydals <hidde@hhh.computer>
This commit is contained in:
Hidde Beydals 2023-03-24 11:47:34 +01:00
parent b2da6f0647
commit 462178e017
No known key found for this signature in database
GPG Key ID: 979F380FC2341744
4 changed files with 3 additions and 51 deletions

View File

@ -212,21 +212,6 @@ type GitRepositoryStatus struct {
// +optional // +optional
IncludedArtifacts []*Artifact `json:"includedArtifacts,omitempty"` IncludedArtifacts []*Artifact `json:"includedArtifacts,omitempty"`
// ContentConfigChecksum is a checksum of all the configurations related to
// the content of the source artifact:
// - .spec.ignore
// - .spec.recurseSubmodules
// - .spec.included and the checksum of the included artifacts
// observed in .status.observedGeneration version of the object. This can
// be used to determine if the content of the included repository has
// changed.
// It has the format of `<algo>:<checksum>`, for example: `sha256:<checksum>`.
//
// Deprecated: Replaced with explicit fields for observed artifact content
// config in the status.
// +optional
ContentConfigChecksum string `json:"contentConfigChecksum,omitempty"`
// ObservedIgnore is the observed exclusion patterns used for constructing // ObservedIgnore is the observed exclusion patterns used for constructing
// the source artifact. // the source artifact.
// +optional // +optional
@ -238,7 +223,7 @@ type GitRepositoryStatus struct {
ObservedRecurseSubmodules bool `json:"observedRecurseSubmodules,omitempty"` ObservedRecurseSubmodules bool `json:"observedRecurseSubmodules,omitempty"`
// ObservedInclude is the observed list of GitRepository resources used to // ObservedInclude is the observed list of GitRepository resources used to
// to produce the current Artifact. // produce the current Artifact.
// +optional // +optional
ObservedInclude []GitRepositoryInclude `json:"observedInclude,omitempty"` ObservedInclude []GitRepositoryInclude `json:"observedInclude,omitempty"`

View File

@ -305,16 +305,6 @@ spec:
- type - type
type: object type: object
type: array type: array
contentConfigChecksum:
description: "ContentConfigChecksum is a checksum of all the configurations
related to the content of the source artifact: - .spec.ignore -
.spec.recurseSubmodules - .spec.included and the checksum of the
included artifacts observed in .status.observedGeneration version
of the object. This can be used to determine if the content of the
included repository has changed. It has the format of `<algo>:<checksum>`,
for example: `sha256:<checksum>`. \n Deprecated: Replaced with explicit
fields for observed artifact content config in the status."
type: string
includedArtifacts: includedArtifacts:
description: IncludedArtifacts contains a list of the last successfully description: IncludedArtifacts contains a list of the last successfully
included Artifacts as instructed by GitRepositorySpec.Include. included Artifacts as instructed by GitRepositorySpec.Include.
@ -379,7 +369,7 @@ spec:
type: string type: string
observedInclude: observedInclude:
description: ObservedInclude is the observed list of GitRepository description: ObservedInclude is the observed list of GitRepository
resources used to to produce the current Artifact. resources used to produce the current Artifact.
items: items:
description: GitRepositoryInclude specifies a local reference to description: GitRepositoryInclude specifies a local reference to
a GitRepository which Artifact (sub-)contents must be included, a GitRepository which Artifact (sub-)contents must be included,

View File

@ -696,7 +696,6 @@ func (r *GitRepositoryReconciler) reconcileArtifact(ctx context.Context, sp *pat
// Record the observations on the object. // Record the observations on the object.
obj.Status.Artifact = artifact.DeepCopy() obj.Status.Artifact = artifact.DeepCopy()
obj.Status.IncludedArtifacts = *includes obj.Status.IncludedArtifacts = *includes
obj.Status.ContentConfigChecksum = "" // To be removed in the next API version.
obj.Status.ObservedIgnore = obj.Spec.Ignore obj.Status.ObservedIgnore = obj.Spec.Ignore
obj.Status.ObservedRecurseSubmodules = obj.Spec.RecurseSubmodules obj.Status.ObservedRecurseSubmodules = obj.Spec.RecurseSubmodules
obj.Status.ObservedInclude = obj.Spec.Include obj.Status.ObservedInclude = obj.Spec.Include

View File

@ -768,28 +768,6 @@ Artifacts as instructed by GitRepositorySpec.Include.</p>
</tr> </tr>
<tr> <tr>
<td> <td>
<code>contentConfigChecksum</code><br>
<em>
string
</em>
</td>
<td>
<em>(Optional)</em>
<p>ContentConfigChecksum is a checksum of all the configurations related to
the content of the source artifact:
- .spec.ignore
- .spec.recurseSubmodules
- .spec.included and the checksum of the included artifacts
observed in .status.observedGeneration version of the object. This can
be used to determine if the content of the included repository has
changed.
It has the format of <code>&lt;algo&gt;:&lt;checksum&gt;</code>, for example: <code>sha256:&lt;checksum&gt;</code>.</p>
<p>Deprecated: Replaced with explicit fields for observed artifact content
config in the status.</p>
</td>
</tr>
<tr>
<td>
<code>observedIgnore</code><br> <code>observedIgnore</code><br>
<em> <em>
string string
@ -826,7 +804,7 @@ configuration used to produce the current Artifact.</p>
<td> <td>
<em>(Optional)</em> <em>(Optional)</em>
<p>ObservedInclude is the observed list of GitRepository resources used to <p>ObservedInclude is the observed list of GitRepository resources used to
to produce the current Artifact.</p> produce the current Artifact.</p>
</td> </td>
</tr> </tr>
<tr> <tr>