From ef44644f63e8e587dd563b515e3db98366183109 Mon Sep 17 00:00:00 2001 From: Gabriel Saratura Date: Thu, 21 Mar 2024 12:59:43 +0100 Subject: [PATCH] Update controller-ger --- Makefile | 2 +- api/v1alpha1/zz_generated.deepcopy.go | 1 - api/v1beta1/zz_generated.deepcopy.go | 1 - .../crd/bases/stardog.vshn.ch_databases.yaml | 116 --------------- .../bases/stardog.vshn.ch_organizations.yaml | 132 ------------------ .../stardog.vshn.ch_stardoginstances.yaml | 93 ------------ .../bases/stardog.vshn.ch_stardogroles.yaml | 121 ---------------- .../bases/stardog.vshn.ch_stardogusers.yaml | 94 ------------- config/rbac/role.yaml | 1 - 9 files changed, 1 insertion(+), 560 deletions(-) delete mode 100644 config/crd/bases/stardog.vshn.ch_databases.yaml delete mode 100644 config/crd/bases/stardog.vshn.ch_organizations.yaml delete mode 100644 config/crd/bases/stardog.vshn.ch_stardoginstances.yaml delete mode 100644 config/crd/bases/stardog.vshn.ch_stardogroles.yaml delete mode 100644 config/crd/bases/stardog.vshn.ch_stardogusers.yaml diff --git a/Makefile b/Makefile index 04838dc..f99f25c 100644 --- a/Makefile +++ b/Makefile @@ -123,7 +123,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest ## Tool Versions KUSTOMIZE_VERSION ?= v4.5.7 -CONTROLLER_TOOLS_VERSION ?= v0.9.0 +CONTROLLER_TOOLS_VERSION ?= v0.14.0 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" .PHONY: kustomize diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index b22e2c2..783c3ac 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go index a437618..370ad5a 100644 --- a/api/v1beta1/zz_generated.deepcopy.go +++ b/api/v1beta1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/config/crd/bases/stardog.vshn.ch_databases.yaml b/config/crd/bases/stardog.vshn.ch_databases.yaml deleted file mode 100644 index 1bc828c..0000000 --- a/config/crd/bases/stardog.vshn.ch_databases.yaml +++ /dev/null @@ -1,116 +0,0 @@ ---- -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - controller-gen.kubebuilder.io/version: v0.9.0 - creationTimestamp: null - name: databases.stardog.vshn.ch -spec: - group: stardog.vshn.ch - names: - kind: Database - listKind: DatabaseList - plural: databases - singular: database - scope: Cluster - versions: - - name: v1beta1 - schema: - openAPIV3Schema: - description: Database is the Schema for the databases API - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - description: DatabaseSpec defines the desired state of the Database - properties: - addUserForNonHiddenGraphs: - description: AddUserForNonHiddenGraphs a dynamically managed user - of this db with custom permissions Mainly used to not have access - to hidden graphs - type: string - databaseName: - description: DatabaseName the database name that has to be created - in the Stardog server - type: string - namedGraphPrefix: - description: NamedGraphPrefix a prefix for a Stardog Named Graph. - type: string - options: - description: Options is the Stardog configuration options for this - database. Only json input is valid. - type: string - stardogInstanceRefs: - description: StardogInstanceRefs contains the reference to the Stardog - instance the database should exist in - items: - description: StardogInstanceRef contains name and namespace for - a stardog instance - properties: - name: - type: string - namespace: - type: string - type: object - type: array - type: object - status: - description: DatabaseStatus defines the observed state of the Database - properties: - addUserForNonHiddenGraphs: - type: string - conditions: - items: - description: StardogCondition describes a status condition of a - StardogRole - properties: - lastTransitionTime: - format: date-time - type: string - message: - type: string - reason: - type: string - status: - type: string - type: - type: string - required: - - status - - type - type: object - type: array - databaseName: - type: string - namedGraphPrefix: - type: string - options: - type: string - stardogInstanceRef: - items: - description: StardogInstanceRef contains name and namespace for - a stardog instance - properties: - name: - type: string - namespace: - type: string - type: object - type: array - type: object - type: object - served: true - storage: true - subresources: - status: {} diff --git a/config/crd/bases/stardog.vshn.ch_organizations.yaml b/config/crd/bases/stardog.vshn.ch_organizations.yaml deleted file mode 100644 index c9b51d8..0000000 --- a/config/crd/bases/stardog.vshn.ch_organizations.yaml +++ /dev/null @@ -1,132 +0,0 @@ ---- -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - controller-gen.kubebuilder.io/version: v0.9.0 - creationTimestamp: null - name: organizations.stardog.vshn.ch -spec: - group: stardog.vshn.ch - names: - kind: Organization - listKind: OrganizationList - plural: organizations - singular: organization - scope: Cluster - versions: - - name: v1beta1 - schema: - openAPIV3Schema: - description: Organization is the Schema for the organizations API - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - description: OrganizationSpec defines the desired state of an Organization - properties: - databaseRef: - description: DatabaseRef is the name of the Database this Organization - is assigned to - type: string - displayName: - description: DisplayName is the long name of an organization - type: string - name: - description: Name is the short name of an organization - type: string - namedGraphs: - description: NamedGraphs are the suffix graph names for this organization. - The prefix can be found in the Database resource. The final graphs - is defined as prefix + "/" + orgName + "/" suffix - items: - description: NamedGraph defines the name and if necessary add another - hidden named graph for this named graph - properties: - addHidden: - default: false - description: AddHidden adds another graph with the same name - but with a prefix "