GA: Promote GitRepository API to source.toolkit.fluxcd.io/v1

Makefile

@@ -117,7 +117,8 @@ manifests: controller-gen ## Generate manifests, e.g. CRD, RBAC, etc.
  cd api; $(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role paths="./..." output:crd:artifacts:config="../config/crd/bases"
 
 api-docs: gen-crd-api-reference-docs ## Generate API reference documentation
- $(GEN_CRD_API_REFERENCE_DOCS) -api-dir=./api/v1beta2 -config=./hack/api-docs/config.json -template-dir=./hack/api-docs/template -out-file=./docs/api/source.md
+ $(GEN_CRD_API_REFERENCE_DOCS) -api-dir=./api/v1beta2 -config=./hack/api-docs/config.json -template-dir=./hack/api-docs/template -out-file=./docs/api/v1beta2/source.md
+ $(GEN_CRD_API_REFERENCE_DOCS) -api-dir=./api/v1 -config=./hack/api-docs/config.json -template-dir=./hack/api-docs/template -out-file=./docs/api/v1/source.md
 
 tidy: ## Run go mod tidy
  cd api; rm -f go.sum; go mod tidy -compat=1.20

PROJECT

@@ -1,6 +1,9 @@
 domain: toolkit.fluxcd.io
 repo: github.com/fluxcd/source-controller
 resources:
+- group: source
+ kind: GitRepository
+ version: v1
 - group: source
  kind: GitRepository
  version: v1beta2

api/go.mod

@@ -4,8 +4,8 @@ go 1.18
 
 require (
  github.com/fluxcd/pkg/apis/acl v0.1.0
- github.com/fluxcd/pkg/apis/meta v0.19.1
- k8s.io/apimachinery v0.26.2
+ github.com/fluxcd/pkg/apis/meta v1.0.0
+ k8s.io/apimachinery v0.26.3
  sigs.k8s.io/controller-runtime v0.14.5
 )
 

api/go.sum

@@ -3,8 +3,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fluxcd/pkg/apis/acl v0.1.0 h1:EoAl377hDQYL3WqanWCdifauXqXbMyFuK82NnX6pH4Q=
 github.com/fluxcd/pkg/apis/acl v0.1.0/go.mod h1:zfEZzz169Oap034EsDhmCAGgnWlcWmIObZjYMusoXS8=
-github.com/fluxcd/pkg/apis/meta v0.19.1 h1:fCI5CnTXpAqr67UlaI9q0H+OztMKB5kDTr6xV6vlAo0=
-github.com/fluxcd/pkg/apis/meta v0.19.1/go.mod h1:ZPPMYrPnWwPQYNEGM/Uc0N4SurUPS3xNI3IIpCQEfuM=
+github.com/fluxcd/pkg/apis/meta v1.0.0 h1:i9IGHd/VNEZELX7mepkiYFbJxs2J5znaB4cN9z2nPm8=
+github.com/fluxcd/pkg/apis/meta v1.0.0/go.mod h1:04ZdpZYm1x+aL93K4daNHW1UX6E8K7Gyf5za9OhrE+U=
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
 github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
@@ -74,8 +74,8 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 k8s.io/api v0.26.1 h1:f+SWYiPd/GsiWwVRz+NbFyCgvv75Pk9NK6dlkZgpCRQ=
-k8s.io/apimachinery v0.26.2 h1:da1u3D5wfR5u2RpLhE/ZtZS2P7QvDgLZTi9wrNZl/tQ=
-k8s.io/apimachinery v0.26.2/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I=
+k8s.io/apimachinery v0.26.3 h1:dQx6PNETJ7nODU3XPtrwkfuubs6w7sX0M8n61zHIV/k=
+k8s.io/apimachinery v0.26.3/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I=
 k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
 k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 h1:KTgPnR10d5zhztWptI952TNtt/4u5h3IzDXkdIMuo2Y=

api/v1/artifact_types.go

@@ -0,0 +1,93 @@
+/*
+Copyright 2023 The Flux authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1
+
+import (
+ "path"
+ "strings"
+
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// Artifact represents the output of a Source reconciliation.
+type Artifact struct {
+ // Path is the relative file path of the Artifact. It can be used to locate
+ // the file in the root of the Artifact storage on the local file system of
+ // the controller managing the Source.
+ // +required
+ Path string `json:"path"`
+
+ // URL is the HTTP address of the Artifact as exposed by the controller
+ // managing the Source. It can be used to retrieve the Artifact for
+ // consumption, e.g. by another controller applying the Artifact contents.
+ // +required
+ URL string `json:"url"`
+
+ // Revision is a human-readable identifier traceable in the origin source
+ // system. It can be a Git commit SHA, Git tag, a Helm chart version, etc.
+ // +required
+ Revision string `json:"revision"`
+
+ // Digest is the digest of the file in the form of '<algorithm>:<checksum>'.
+ // +optional
+ // +kubebuilder:validation:Pattern="^[a-z0-9]+(?:[.+_-][a-z0-9]+)*:[a-zA-Z0-9=_-]+$"
+ Digest string `json:"digest,omitempty"`
+
+ // LastUpdateTime is the timestamp corresponding to the last update of the
+ // Artifact.
+ // +required
+ LastUpdateTime metav1.Time `json:"lastUpdateTime"`
+
+ // Size is the number of bytes in the file.
+ // +optional
+ Size *int64 `json:"size,omitempty"`
+
+ // Metadata holds upstream information such as OCI annotations.
+ // +optional
+ Metadata map[string]string `json:"metadata,omitempty"`
+}
+
+// HasRevision returns if the given revision matches the current Revision of
+// the Artifact.
+func (in *Artifact) HasRevision(revision string) bool {
+ if in == nil {
+ return false
+ }
+ return in.Revision == revision
+}
+
+// HasDigest returns if the given digest matches the current Digest of the
+// Artifact.
+func (in *Artifact) HasDigest(digest string) bool {
+ if in == nil {
+ return false
+ }
+ return in.Digest == digest
+}
+
+// ArtifactDir returns the artifact dir path in the form of
+// '<kind>/<namespace>/<name>'.
+func ArtifactDir(kind, namespace, name string) string {
+ kind = strings.ToLower(kind)
+ return path.Join(kind, namespace, name)
+}
+
+// ArtifactPath returns the artifact path in the form of
+// '<kind>/<namespace>/name>/<filename>'.
+func ArtifactPath(kind, namespace, name, filename string) string {
+ return path.Join(ArtifactDir(kind, namespace, name), filename)
+}

api/v1/condition_types.go

@@ -0,0 +1,107 @@
+/*
+Copyright 2023 The Flux authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1
+
+const SourceFinalizer = "finalizers.fluxcd.io"
+
+const (
+ // ArtifactInStorageCondition indicates the availability of the Artifact in
+ // the storage.
+ // If True, the Artifact is stored successfully.
+ // This Condition is only present on the resource if the Artifact is
+ // successfully stored.
+ ArtifactInStorageCondition string = "ArtifactInStorage"
+
+ // ArtifactOutdatedCondition indicates the current Artifact of the Source
+ // is outdated.
+ // This is a "negative polarity" or "abnormal-true" type, and is only
+ // present on the resource if it is True.
+ ArtifactOutdatedCondition string = "ArtifactOutdated"
+
+ // SourceVerifiedCondition indicates the integrity verification of the
+ // Source.
+ // If True, the integrity check succeeded. If False, it failed.
+ // This Condition is only present on the resource if the integrity check
+ // is enabled.
+ SourceVerifiedCondition string = "SourceVerified"
+
+ // FetchFailedCondition indicates a transient or persistent fetch failure
+ // of an upstream Source.
+ // If True, observations on the upstream Source revision may be impossible,
+ // and the Artifact available for the Source may be outdated.
+ // This is a "negative polarity" or "abnormal-true" type, and is only
+ // present on the resource if it is True.
+ FetchFailedCondition string = "FetchFailed"
+
+ // BuildFailedCondition indicates a transient or persistent build failure
+ // of a Source's Artifact.
+ // If True, the Source can be in an ArtifactOutdatedCondition.
+ // This is a "negative polarity" or "abnormal-true" type, and is only
+ // present on the resource if it is True.
+ BuildFailedCondition string = "BuildFailed"
+
+ // StorageOperationFailedCondition indicates a transient or persistent
+ // failure related to storage. If True, the reconciliation failed while
+ // performing some filesystem operation.
+ // This is a "negative polarity" or "abnormal-true" type, and is only
+ // present on the resource if it is True.
+ StorageOperationFailedCondition string = "StorageOperationFailed"
+)
+
+// Reasons are provided as utility, and not part of the declarative API.
+const (
+ // URLInvalidReason signals that a given Source has an invalid URL.
+ URLInvalidReason string = "URLInvalid"
+
+ // AuthenticationFailedReason signals that a Secret does not have the
+ // required fields, or the provided credentials do not match.
+ AuthenticationFailedReason string = "AuthenticationFailed"
+
+ // VerificationError signals that the Source's verification
+ // check failed.
+ VerificationError string = "VerificationError"
+
+ // DirCreationFailedReason signals a failure caused by a directory creation
+ // operation.
+ DirCreationFailedReason string = "DirectoryCreationFailed"
+
+ // StatOperationFailedReason signals a failure caused by a stat operation on
+ // a path.
+ StatOperationFailedReason string = "StatOperationFailed"
+
+ // ReadOperationFailedReason signals a failure caused by a read operation.
+ ReadOperationFailedReason string = "ReadOperationFailed"
+
+ // AcquireLockFailedReason signals a failure in acquiring lock.
+ AcquireLockFailedReason string = "AcquireLockFailed"
+
+ // InvalidPathReason signals a failure caused by an invalid path.
+ InvalidPathReason string = "InvalidPath"
+
+ // ArchiveOperationFailedReason signals a failure in archive operation.
+ ArchiveOperationFailedReason string = "ArchiveOperationFailed"
+
+ // SymlinkUpdateFailedReason signals a failure in updating a symlink.
+ SymlinkUpdateFailedReason string = "SymlinkUpdateFailed"
+
+ // ArtifactUpToDateReason signals that an existing Artifact is up-to-date
+ // with the Source.
+ ArtifactUpToDateReason string = "ArtifactUpToDate"
+
+ // CacheOperationFailedReason signals a failure in cache operation.
+ CacheOperationFailedReason string = "CacheOperationFailed"
+)

api/v1/doc.go

@@ -0,0 +1,20 @@
+/*
+Copyright 2023 The Flux authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package v1 contains API Schema definitions for the source v1 API group
+// +kubebuilder:object:generate=true
+// +groupName=source.toolkit.fluxcd.io
+package v1