From 07d1dadeda8f56ea35f041df84eeef1d6e35660e Mon Sep 17 00:00:00 2001 From: Steve Loranz Date: Feb 11 2022 03:38:59 +0000 Subject: [PATCH 1/2] add schema properties to CRDs --- diff --git a/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojibuilders.yaml b/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojibuilders.yaml index f7f5f09..99c32c4 100644 --- a/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojibuilders.yaml +++ b/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojibuilders.yaml @@ -32,11 +32,48 @@ spec: spec: description: Spec defines the desired state of KojiBuilder type: object - x-kubernetes-preserve-unknown-fields: true + # x-kubernetes-preserve-unknown-fields: true + properties: + image: + description: Image is a string that specifies the container image to use. + type: string + type: + description: Type defines the type of builds the builder handles. + type: string + max_jobs: + description: max_jobs is a number that specifies the maximum number of jobs the builder will handle at a time. + type: integer + archs: + description: Archs is a list of architectures for which the builder will build. + type: array + items: + type: string + channels: + description: Channels is a list of channels from which the builder accepts jobs. + type: array + items: + type: string + ssl_verify: + description: ssl_verify is a boolean that enables or disables SSL verification for https calls. + type: boolean + volume: + description: Volume is a boolean that enables or disables a volume mount for /mnt/koji on the builder. + type: boolean + required: + - image + - type + - max_jobs + - archs + - channels + - ssl_verify + - volume status: description: Status defines the observed state of KojiBuilder type: object - x-kubernetes-preserve-unknown-fields: true + # x-kubernetes-preserve-unknown-fields: true + properties: + ready: + type: boolean type: object served: true storage: true diff --git a/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojihubs.yaml b/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojihubs.yaml index 108bf2b..2aa1ffa 100644 --- a/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojihubs.yaml +++ b/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojihubs.yaml @@ -32,11 +32,48 @@ spec: spec: description: Spec defines the desired state of KojiHub type: object - x-kubernetes-preserve-unknown-fields: true + # x-kubernetes-preserve-unknown-fields: true + properties: + image: + description: Image is a string that specifies the container image to use. + type: string + replicas: + description: Replicas specifies the number of koji hubs. + type: integer + default: 1 + host: + description: Host is a string that specifies the hostname of the hub. + type: string + postgres_secret: + description: postgres_secret defines the secret koji hub uses to connect to postgres. + type: string + http_enabled: + description: http_enabled is a boolean enabling or disabling http access to koji hub. + type: boolean + default: true + https_enabled: + description: https_enabled is a boolean enabling or disabling https access to koji hub. + type: boolean + default: true + ingress_backend: + description: ingress_backend is a string that specifies which ingress backend to use for external access. + type: string + mnt_pvc_size: + description: mnt_pvc_size is a string defining the size of the persistent volume claim. Ex. '10Gi' + type: string + required: + - image + - host + - postgres_secret + - ingress_backend + - mnt_pvc_size status: description: Status defines the observed state of KojiHub type: object - x-kubernetes-preserve-unknown-fields: true + # x-kubernetes-preserve-unknown-fields: true + properties: + ready: + type: boolean type: object served: true storage: true diff --git a/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojiras.yaml b/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojiras.yaml index fd764ef..e1e380e 100644 --- a/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojiras.yaml +++ b/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojiras.yaml @@ -32,11 +32,31 @@ spec: spec: description: Spec defines the desired state of Kojira type: object - x-kubernetes-preserve-unknown-fields: true + # x-kubernetes-preserve-unknown-fields: true + properties: + image: + description: Image is a string that specifies the container image to use. + type: string + src: #TODO: 'with_src' is a deprecated option, no longer used by kojira. Should probably remove this. + description: src supports a deprecated kojira option 'with_src' + type: string + max_repo_tasks: + description: max_repo_tasks is a number specifying the upper limit of newRepo tasks to take on at a time. + type: integer + repo_tasks_limit: + description: repo_tasks_limit is a number specifying the upper limit of overall limit on running tasks. + type: integer + required: + - image + - max_repo_tasks + - repo_tasks_limit status: description: Status defines the observed state of Kojira type: object - x-kubernetes-preserve-unknown-fields: true + # x-kubernetes-preserve-unknown-fields: true + properties: + ready: + type: boolean type: object served: true storage: true diff --git a/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojiusers.yaml b/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojiusers.yaml index ddbfe81..fc6f93c 100644 --- a/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojiusers.yaml +++ b/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojiusers.yaml @@ -32,7 +32,19 @@ spec: spec: description: Spec defines the desired state of KojiUser type: object - x-kubernetes-preserve-unknown-fields: true + # x-kubernetes-preserve-unknown-fields: true + properties: + permissions: + description: Permissions is an array defining the koji permissions for the user. + type: array + items: + type: string + ssl: + description: SSL is a boolean that enables or disables the generation of SSL certificates for user authentication. + type: boolean + required: + - permissions + - ssl status: description: Status defines the observed state of KojiUser type: object From f1bae7d523ac04d34446852eb1ee165c9bd5c934 Mon Sep 17 00:00:00 2001 From: Steve Loranz Date: Feb 14 2022 23:37:37 +0000 Subject: [PATCH 2/2] add schema properties to CRDs --- diff --git a/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojibuilders.yaml b/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojibuilders.yaml index 99c32c4..28f09da 100644 --- a/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojibuilders.yaml +++ b/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojibuilders.yaml @@ -32,7 +32,6 @@ spec: spec: description: Spec defines the desired state of KojiBuilder type: object - # x-kubernetes-preserve-unknown-fields: true properties: image: description: Image is a string that specifies the container image to use. @@ -70,10 +69,7 @@ spec: status: description: Status defines the observed state of KojiBuilder type: object - # x-kubernetes-preserve-unknown-fields: true - properties: - ready: - type: boolean + x-kubernetes-preserve-unknown-fields: true type: object served: true storage: true diff --git a/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojihubs.yaml b/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojihubs.yaml index 2aa1ffa..d9f9b36 100644 --- a/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojihubs.yaml +++ b/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojihubs.yaml @@ -32,7 +32,6 @@ spec: spec: description: Spec defines the desired state of KojiHub type: object - # x-kubernetes-preserve-unknown-fields: true properties: image: description: Image is a string that specifies the container image to use. @@ -70,10 +69,7 @@ spec: status: description: Status defines the observed state of KojiHub type: object - # x-kubernetes-preserve-unknown-fields: true - properties: - ready: - type: boolean + x-kubernetes-preserve-unknown-fields: true type: object served: true storage: true diff --git a/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojiras.yaml b/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojiras.yaml index e1e380e..f34a36b 100644 --- a/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojiras.yaml +++ b/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojiras.yaml @@ -32,7 +32,6 @@ spec: spec: description: Spec defines the desired state of Kojira type: object - # x-kubernetes-preserve-unknown-fields: true properties: image: description: Image is a string that specifies the container image to use. @@ -53,10 +52,7 @@ spec: status: description: Status defines the observed state of Kojira type: object - # x-kubernetes-preserve-unknown-fields: true - properties: - ready: - type: boolean + x-kubernetes-preserve-unknown-fields: true type: object served: true storage: true diff --git a/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojiusers.yaml b/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojiusers.yaml index fc6f93c..0033d91 100644 --- a/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojiusers.yaml +++ b/operator/config/crd/bases/buildsys.apps.fedoraproject.org_kojiusers.yaml @@ -32,7 +32,6 @@ spec: spec: description: Spec defines the desired state of KojiUser type: object - # x-kubernetes-preserve-unknown-fields: true properties: permissions: description: Permissions is an array defining the koji permissions for the user.