From fc2cb3827c3ec10add0adeb165b5e8232f1772f4 Mon Sep 17 00:00:00 2001 From: Eguo Wang Date: Sun, 26 Feb 2023 21:07:00 +0800 Subject: [PATCH] Update actor and playbook CRDs --- charts/amphitheatre/Chart.yaml | 4 +- .../charts/amphitheatre-crds/Chart.yaml | 2 +- .../amphitheatre-crds/templates/actor.yaml | 92 +++++++++++++------ .../amphitheatre-crds/templates/playbook.yaml | 92 +++++++++++++------ 4 files changed, 127 insertions(+), 63 deletions(-) diff --git a/charts/amphitheatre/Chart.yaml b/charts/amphitheatre/Chart.yaml index b7fbc3a..840f47d 100644 --- a/charts/amphitheatre/Chart.yaml +++ b/charts/amphitheatre/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.4.4 +version: 0.4.5 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to @@ -29,7 +29,7 @@ dependencies: # version: 1.11.0 # condition: cert-manager.enabled - name: amphitheatre-crds - version: 0.1.3 + version: 0.1.4 condition: crds.install # - name: harbor # repository: https://charts.bitnami.com/bitnami diff --git a/charts/amphitheatre/charts/amphitheatre-crds/Chart.yaml b/charts/amphitheatre/charts/amphitheatre-crds/Chart.yaml index 7babd5c..b0a93a0 100644 --- a/charts/amphitheatre/charts/amphitheatre-crds/Chart.yaml +++ b/charts/amphitheatre/charts/amphitheatre-crds/Chart.yaml @@ -15,4 +15,4 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.3 +version: 0.1.4 diff --git a/charts/amphitheatre/charts/amphitheatre-crds/templates/actor.yaml b/charts/amphitheatre/charts/amphitheatre-crds/templates/actor.yaml index bd048f0..e565e2f 100644 --- a/charts/amphitheatre/charts/amphitheatre-crds/templates/actor.yaml +++ b/charts/amphitheatre/charts/amphitheatre-crds/templates/actor.yaml @@ -42,16 +42,26 @@ spec: description: Environment variables, in the key=value form, passed to the build. nullable: true type: object + exclude: + description: Files to exclude when building. + items: + type: string + nullable: true + type: array + include: + description: Files to include when building. + items: + type: string + nullable: true + type: array type: object command: description: overrides the default command declared by the container image (i.e. by Dockerfile’s CMD) nullable: true type: string - commit: - description: The selected commit of the actor. - type: string description: description: The description of the actor. + nullable: true type: string environments: additionalProperties: @@ -66,59 +76,58 @@ spec: description: The name of the actor. type: string partners: - description: Depend on other partners from other repositories, or subdirectories on your local file system. - items: + additionalProperties: + description: Your characters can depend on other partners from other registries, git repositories, or subdirectories on your local file system. properties: - name: - description: The name of the character. + branch: + description: Git branch the partner should be cloned from. eg. master or main + nullable: true type: string path: - description: Relative path from the repo root to the configuration file. eg. getting-started/amp.toml. default is `./.amp.toml`. + description: Relative path from the repo root to the configuration file. eg. getting-started/.amp.toml. default is `./.amp.toml`. nullable: true type: string - reference: - description: Git ref the package should be cloned from. eg. master or main - nullable: true + repo: + description: Source code repository the partner should be cloned from. e.g. https://github.com/amphitheatre-app/amphitheatre.git. + type: string + rev: + description: A commit hash like rev = "4c59b707", or a named reference exposed by the remote repository such as rev = "refs/pull/493/head". What references are available varies by where the repo is hosted. type: string - repository: - description: Source code repository the package should be cloned from. e.g. https://github.com/amphitheatre-app/amphitheatre.git. + tag: + description: Git tag the partner should be cloned from. eg. v1.0 + nullable: true type: string required: - - name - - repository + - repo + - rev type: object + description: Depend on other partners from other repositories, or subdirectories on your local file system. nullable: true - type: array - path: - description: Relative path from the repo root to the configuration file. eg. getting-started/.amp.toml. default is `./.amp.toml`. - nullable: true - type: string - reference: - description: Git ref the package should be cloned from. eg. master or main - nullable: true - type: string - repository: - description: Source code repository the package should be cloned from. e.g. https://github.com/amphitheatre-app/amphitheatre.git. - type: string + type: object services: description: Defines the behavior of a service items: description: Defines the behavior of a service properties: kind: + description: Type determines how the Service is exposed. Defaults to ClusterIP. Valid options are ExternalName, ClusterIP, NodePort, and LoadBalancer. nullable: true type: string ports: + description: The list of ports that are exposed by this service. items: description: List of ports to expose from the container. properties: expose: + description: Exposes HTTP and HTTPS routes from outside the cluster to services within the cluster. nullable: true type: boolean port: + description: The port that will be exposed by this service. format: int32 type: integer protocol: + description: The IP protocol for this port. Supports "TCP", "UDP", and "SCTP". Default is TCP. nullable: true type: string required: @@ -130,16 +139,39 @@ spec: type: object nullable: true type: array + source: + description: The source of the actor. + properties: + branch: + description: Git branch the partner should be cloned from. eg. master or main + nullable: true + type: string + path: + description: Relative path from the repo root to the configuration file. eg. getting-started/.amp.toml. default is `./.amp.toml`. + nullable: true + type: string + repo: + description: Source code repository the partner should be cloned from. e.g. https://github.com/amphitheatre-app/amphitheatre.git. + type: string + rev: + description: A commit hash like rev = "4c59b707", or a named reference exposed by the remote repository such as rev = "refs/pull/493/head". What references are available varies by where the repo is hosted. + type: string + tag: + description: Git tag the partner should be cloned from. eg. v1.0 + nullable: true + type: string + required: + - repo + - rev + type: object sync: description: sync mode, if enabled, pulls the latest code from source version control in real time via Webhook, etc. and then rebuilds and deploys it nullable: true type: boolean required: - - commit - - description - image - name - - repository + - source type: object status: nullable: true diff --git a/charts/amphitheatre/charts/amphitheatre-crds/templates/playbook.yaml b/charts/amphitheatre/charts/amphitheatre-crds/templates/playbook.yaml index 6e48d52..e6afde3 100644 --- a/charts/amphitheatre/charts/amphitheatre-crds/templates/playbook.yaml +++ b/charts/amphitheatre/charts/amphitheatre-crds/templates/playbook.yaml @@ -46,16 +46,26 @@ spec: description: Environment variables, in the key=value form, passed to the build. nullable: true type: object + exclude: + description: Files to exclude when building. + items: + type: string + nullable: true + type: array + include: + description: Files to include when building. + items: + type: string + nullable: true + type: array type: object command: description: overrides the default command declared by the container image (i.e. by Dockerfile’s CMD) nullable: true type: string - commit: - description: The selected commit of the actor. - type: string description: description: The description of the actor. + nullable: true type: string environments: additionalProperties: @@ -70,59 +80,58 @@ spec: description: The name of the actor. type: string partners: - description: Depend on other partners from other repositories, or subdirectories on your local file system. - items: + additionalProperties: + description: Your characters can depend on other partners from other registries, git repositories, or subdirectories on your local file system. properties: - name: - description: The name of the character. + branch: + description: Git branch the partner should be cloned from. eg. master or main + nullable: true type: string path: - description: Relative path from the repo root to the configuration file. eg. getting-started/amp.toml. default is `./.amp.toml`. + description: Relative path from the repo root to the configuration file. eg. getting-started/.amp.toml. default is `./.amp.toml`. nullable: true type: string - reference: - description: Git ref the package should be cloned from. eg. master or main - nullable: true + repo: + description: Source code repository the partner should be cloned from. e.g. https://github.com/amphitheatre-app/amphitheatre.git. + type: string + rev: + description: A commit hash like rev = "4c59b707", or a named reference exposed by the remote repository such as rev = "refs/pull/493/head". What references are available varies by where the repo is hosted. type: string - repository: - description: Source code repository the package should be cloned from. e.g. https://github.com/amphitheatre-app/amphitheatre.git. + tag: + description: Git tag the partner should be cloned from. eg. v1.0 + nullable: true type: string required: - - name - - repository + - repo + - rev type: object + description: Depend on other partners from other repositories, or subdirectories on your local file system. nullable: true - type: array - path: - description: Relative path from the repo root to the configuration file. eg. getting-started/.amp.toml. default is `./.amp.toml`. - nullable: true - type: string - reference: - description: Git ref the package should be cloned from. eg. master or main - nullable: true - type: string - repository: - description: Source code repository the package should be cloned from. e.g. https://github.com/amphitheatre-app/amphitheatre.git. - type: string + type: object services: description: Defines the behavior of a service items: description: Defines the behavior of a service properties: kind: + description: Type determines how the Service is exposed. Defaults to ClusterIP. Valid options are ExternalName, ClusterIP, NodePort, and LoadBalancer. nullable: true type: string ports: + description: The list of ports that are exposed by this service. items: description: List of ports to expose from the container. properties: expose: + description: Exposes HTTP and HTTPS routes from outside the cluster to services within the cluster. nullable: true type: boolean port: + description: The port that will be exposed by this service. format: int32 type: integer protocol: + description: The IP protocol for this port. Supports "TCP", "UDP", and "SCTP". Default is TCP. nullable: true type: string required: @@ -134,16 +143,39 @@ spec: type: object nullable: true type: array + source: + description: The source of the actor. + properties: + branch: + description: Git branch the partner should be cloned from. eg. master or main + nullable: true + type: string + path: + description: Relative path from the repo root to the configuration file. eg. getting-started/.amp.toml. default is `./.amp.toml`. + nullable: true + type: string + repo: + description: Source code repository the partner should be cloned from. e.g. https://github.com/amphitheatre-app/amphitheatre.git. + type: string + rev: + description: A commit hash like rev = "4c59b707", or a named reference exposed by the remote repository such as rev = "refs/pull/493/head". What references are available varies by where the repo is hosted. + type: string + tag: + description: Git tag the partner should be cloned from. eg. v1.0 + nullable: true + type: string + required: + - repo + - rev + type: object sync: description: sync mode, if enabled, pulls the latest code from source version control in real time via Webhook, etc. and then rebuilds and deploys it nullable: true type: boolean required: - - commit - - description - image - name - - repository + - source type: object minItems: 1 type: array