From e70591d1d4eddc796d5376156622bd2f7ade063a Mon Sep 17 00:00:00 2001 From: 012xx Date: Thu, 29 Aug 2024 07:11:31 +0000 Subject: [PATCH] chore: Update generated files via make manifests generate apidoc make[1]: Entering directory '/home/hibiki_takehara/cattage' controller-gen "crd:crdVersions=v1" rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases kustomize build config/helm/crds | yq e "." - > charts/cattage/crds/tenant.yaml kustomize build config/helm/templates | yq e "." - > charts/cattage/templates/generated.yaml controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./..." crd-to-markdown --links docs/links.csv -f api/v1beta1/tenant_types.go -n Tenant > docs/crd_tenant.md make[1]: Leaving directory '/home/hibiki_takehara/cattage' git diff --exit-code --name-only --- charts/cattage/crds/tenant.yaml | 11 +++------- charts/cattage/templates/generated.yaml | 11 ---------- .../crd/bases/cattage.cybozu.io_tenants.yaml | 21 ++++--------------- config/rbac/role.yaml | 11 ---------- 4 files changed, 7 insertions(+), 47 deletions(-) diff --git a/charts/cattage/crds/tenant.yaml b/charts/cattage/crds/tenant.yaml index e12779d..c81ac30 100644 --- a/charts/cattage/crds/tenant.yaml +++ b/charts/cattage/crds/tenant.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.0-beta.0.0.20240813171610-057cd0c852dd labels: app.kubernetes.io/name: cattage name: tenants.cattage.cybozu.io @@ -117,7 +117,7 @@ spec: conditions: description: Conditions is an array of conditions. items: - description: "Condition contains details for one aspect of the current state of this API Resource.\n---\nThis struct is intended for direct use as an array at the field path .status.conditions. For example,\n\n\n\ttype FooStatus struct{\n\t // Represents the observations of a foo's current state.\n\t // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t // other fields\n\t}" + description: Condition contains details for one aspect of the current state of this API Resource. properties: lastTransitionTime: description: |- @@ -158,12 +158,7 @@ spec: - Unknown type: string type: - description: |- - type of condition in CamelCase or in foo.example.com/CamelCase. - --- - Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be - useful (see .node.status.conditions), the ability to deconflict is important. - The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) + description: type of condition in CamelCase or in foo.example.com/CamelCase. maxLength: 316 pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ type: string diff --git a/charts/cattage/templates/generated.yaml b/charts/cattage/templates/generated.yaml index adfda26..e4bc3b4 100644 --- a/charts/cattage/templates/generated.yaml +++ b/charts/cattage/templates/generated.yaml @@ -86,17 +86,6 @@ rules: - argoproj.io resources: - applications - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - argoproj.io - resources: - appprojects verbs: - create diff --git a/config/crd/bases/cattage.cybozu.io_tenants.yaml b/config/crd/bases/cattage.cybozu.io_tenants.yaml index 2576399..8a50611 100644 --- a/config/crd/bases/cattage.cybozu.io_tenants.yaml +++ b/config/crd/bases/cattage.cybozu.io_tenants.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.0-beta.0.0.20240813171610-057cd0c852dd name: tenants.cattage.cybozu.io spec: group: cattage.cybozu.io @@ -121,16 +121,8 @@ spec: conditions: description: Conditions is an array of conditions. items: - description: "Condition contains details for one aspect of the current - state of this API Resource.\n---\nThis struct is intended for - direct use as an array at the field path .status.conditions. For - example,\n\n\n\ttype FooStatus struct{\n\t // Represents the - observations of a foo's current state.\n\t // Known .status.conditions.type - are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // - +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t - \ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" - patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t - \ // other fields\n\t}" + description: Condition contains details for one aspect of the current + state of this API Resource. properties: lastTransitionTime: description: |- @@ -171,12 +163,7 @@ spec: - Unknown type: string type: - description: |- - type of condition in CamelCase or in foo.example.com/CamelCase. - --- - Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be - useful (see .node.status.conditions), the ability to deconflict is important. - The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) + description: type of condition in CamelCase or in foo.example.com/CamelCase. maxLength: 316 pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ type: string diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 4ba9b7b..49a2b6e 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -28,17 +28,6 @@ rules: - argoproj.io resources: - applications - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - argoproj.io - resources: - appprojects verbs: - create