Merge pull request #13 from hiddeco/spec/domain-change

Change CRDs domain to 'image.toolkit.fluxcd.io'
This commit is contained in:
Michael Bridgen 2020-07-31 15:26:13 +01:00 committed by GitHub
commit 387ed23736
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 34 additions and 34 deletions

View File

@ -1,4 +1,4 @@
domain: fluxcd.io
domain: toolkit.fluxcd.io
repo: github.com/squaremo/image-reflector-controller
resources:
- group: image

View File

@ -16,7 +16,7 @@ limitations under the License.
// Package v1alpha1 contains API Schema definitions for the image v1alpha1 API group
// +kubebuilder:object:generate=true
// +groupName=image.fluxcd.io
// +groupName=image.toolkit.fluxcd.io
package v1alpha1
import (
@ -26,7 +26,7 @@ import (
var (
// GroupVersion is group version used to register these objects
GroupVersion = schema.GroupVersion{Group: "image.fluxcd.io", Version: "v1alpha1"}
GroupVersion = schema.GroupVersion{Group: "image.toolkit.fluxcd.io", Version: "v1alpha1"}
// SchemeBuilder is used to add go types to the GroupVersionKind scheme
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

View File

@ -4,15 +4,15 @@ apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.2.5
controller-gen.kubebuilder.io/version: v0.3.0
creationTimestamp: null
name: imagepolicies.image.fluxcd.io
name: imagepolicies.image.toolkit.fluxcd.io
spec:
additionalPrinterColumns:
- JSONPath: .status.latestImage
name: LatestImage
type: string
group: image.fluxcd.io
group: image.toolkit.fluxcd.io
names:
kind: ImagePolicy
listKind: ImagePolicyList

View File

@ -4,9 +4,9 @@ apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.2.5
controller-gen.kubebuilder.io/version: v0.3.0
creationTimestamp: null
name: imagerepositories.image.fluxcd.io
name: imagerepositories.image.toolkit.fluxcd.io
spec:
additionalPrinterColumns:
- JSONPath: .status.lastScanTime
@ -15,7 +15,7 @@ spec:
- JSONPath: .status.lastScanResult.tagCount
name: Tags
type: string
group: image.fluxcd.io
group: image.toolkit.fluxcd.io
names:
kind: ImageRepository
listKind: ImageRepositoryList

View File

@ -2,8 +2,8 @@
# since it depends on service name and namespace that are out of this kustomize package.
# It should be run by config/default
resources:
- bases/image.fluxcd.io_imagerepositories.yaml
- bases/image.fluxcd.io_imagepolicies.yaml
- bases/image.toolkit.fluxcd.io_imagerepositories.yaml
- bases/image.toolkit.fluxcd.io_imagepolicies.yaml
# +kubebuilder:scaffold:crdkustomizeresource
patchesStrategicMerge:

View File

@ -5,4 +5,4 @@ kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
name: imagepolicies.image.fluxcd.io
name: imagepolicies.image.toolkit.fluxcd.io

View File

@ -5,4 +5,4 @@ kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
name: imagerepositories.image.fluxcd.io
name: imagerepositories.image.toolkit.fluxcd.io

View File

@ -3,7 +3,7 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: imagepolicies.image.fluxcd.io
name: imagepolicies.image.toolkit.fluxcd.io
spec:
conversion:
strategy: Webhook

View File

@ -3,7 +3,7 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: imagerepositories.image.fluxcd.io
name: imagerepositories.image.toolkit.fluxcd.io
spec:
conversion:
strategy: Webhook

View File

@ -5,7 +5,7 @@ metadata:
name: imagepolicy-editor-role
rules:
- apiGroups:
- image.fluxcd.io
- image.toolkit.fluxcd.io
resources:
- imagepolicies
verbs:
@ -17,7 +17,7 @@ rules:
- update
- watch
- apiGroups:
- image.fluxcd.io
- image.toolkit.fluxcd.io
resources:
- imagepolicies/status
verbs:

View File

@ -5,7 +5,7 @@ metadata:
name: imagepolicy-viewer-role
rules:
- apiGroups:
- image.fluxcd.io
- image.toolkit.fluxcd.io
resources:
- imagepolicies
verbs:
@ -13,7 +13,7 @@ rules:
- list
- watch
- apiGroups:
- image.fluxcd.io
- image.toolkit.fluxcd.io
resources:
- imagepolicies/status
verbs:

View File

@ -5,7 +5,7 @@ metadata:
name: imagerepository-editor-role
rules:
- apiGroups:
- image.fluxcd.io
- image.toolkit.fluxcd.io
resources:
- imagerepositories
verbs:
@ -17,7 +17,7 @@ rules:
- update
- watch
- apiGroups:
- image.fluxcd.io
- image.toolkit.fluxcd.io
resources:
- imagerepositories/status
verbs:

View File

@ -5,7 +5,7 @@ metadata:
name: imagerepository-viewer-role
rules:
- apiGroups:
- image.fluxcd.io
- image.toolkit.fluxcd.io
resources:
- imagerepositories
verbs:
@ -13,7 +13,7 @@ rules:
- list
- watch
- apiGroups:
- image.fluxcd.io
- image.toolkit.fluxcd.io
resources:
- imagerepositories/status
verbs:

View File

@ -7,7 +7,7 @@ metadata:
name: manager-role
rules:
- apiGroups:
- image.fluxcd.io
- image.toolkit.fluxcd.io
resources:
- imagepolicies
verbs:
@ -19,7 +19,7 @@ rules:
- update
- watch
- apiGroups:
- image.fluxcd.io
- image.toolkit.fluxcd.io
resources:
- imagepolicies/status
verbs:
@ -27,7 +27,7 @@ rules:
- patch
- update
- apiGroups:
- image.fluxcd.io
- image.toolkit.fluxcd.io
resources:
- imagerepositories
verbs:
@ -39,7 +39,7 @@ rules:
- update
- watch
- apiGroups:
- image.fluxcd.io
- image.toolkit.fluxcd.io
resources:
- imagerepositories/status
verbs:

View File

@ -1,4 +1,4 @@
apiVersion: image.fluxcd.io/v1alpha1
apiVersion: image.toolkit.fluxcd.io/v1alpha1
kind: ImagePolicy
metadata:
name: latest-flux

View File

@ -1,4 +1,4 @@
apiVersion: image.fluxcd.io/v1alpha1
apiVersion: image.toolkit.fluxcd.io/v1alpha1
kind: ImageRepository
metadata:
name: flux-repo

View File

@ -49,9 +49,9 @@ type ImagePolicyReconciler struct {
Database DatabaseReader
}
// +kubebuilder:rbac:groups=image.fluxcd.io,resources=imagepolicies,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=image.fluxcd.io,resources=imagepolicies/status,verbs=get;update;patch
// +kubebuilder:rbac:groups=image.fluxcd.io,resources=imagerepositories,verbs=get;list;watch
// +kubebuilder:rbac:groups=image.toolkit.fluxcd.io,resources=imagepolicies,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=image.toolkit.fluxcd.io,resources=imagepolicies/status,verbs=get;update;patch
// +kubebuilder:rbac:groups=image.toolkit.fluxcd.io,resources=imagerepositories,verbs=get;list;watch
func (r *ImagePolicyReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
ctx := context.Background()

View File

@ -51,8 +51,8 @@ type ImageRepositoryReconciler struct {
}
}
// +kubebuilder:rbac:groups=image.fluxcd.io,resources=imagerepositories,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=image.fluxcd.io,resources=imagerepositories/status,verbs=get;update;patch
// +kubebuilder:rbac:groups=image.toolkit.fluxcd.io,resources=imagerepositories,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=image.toolkit.fluxcd.io,resources=imagerepositories/status,verbs=get;update;patch
func (r *ImageRepositoryReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
ctx := context.Background()