diff --git a/Dockerfile b/Dockerfile index 62129fa..fb96ffd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -55,7 +55,8 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \ curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "/tmp/awscliv2.zip"; \ fi && \ unzip "/tmp/awscliv2.zip" && \ - ./aws/install + ./aws/install && \ + rm -rf /aws /tmp/awscliv2.zip WORKDIR / diff --git a/input/v1alpha1/parameters.go b/input/v1alpha1/parameters.go index 81445d1..0f8a591 100644 --- a/input/v1alpha1/parameters.go +++ b/input/v1alpha1/parameters.go @@ -94,7 +94,7 @@ func (sev *ShellEnvVar) GetType() ShellEnvVarType { return sev.Type } -// ShellEnvVarsRef refers to an environment variable or secret leaded into +// ShellEnvVarsRef refers to an environment variable or secret loaded into // the function pod. type ShellEnvVarsRef struct { // The Key whose value is the secret diff --git a/package/input/template.fn.crossplane.io_parameters.yaml b/package/input/template.fn.crossplane.io_parameters.yaml index d19e627..bdbc65b 100644 --- a/package/input/template.fn.crossplane.io_parameters.yaml +++ b/package/input/template.fn.crossplane.io_parameters.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.18.0 + controller-gen.kubebuilder.io/version: v0.21.0 name: parameters.template.fn.crossplane.io spec: group: template.fn.crossplane.io @@ -19,7 +19,7 @@ spec: - name: v1alpha1 schema: openAPIV3Schema: - description: Input can be used to provide input to this Function. + description: Parameters can be used to provide input to this Function. properties: apiVersion: description: |- @@ -54,9 +54,11 @@ spec: shellEnvVars: description: shellEnvVars items: + description: ShellEnvVar is a Shell Environment Variable of the form + key=value. properties: fieldRef: - description: FieldRef is a reference to a field in the Composition + description: FieldRef is a reference to a field in the Composition. properties: defaultValue: description: DefaultValue when Policy is Optional and field @@ -79,13 +81,18 @@ spec: - path type: object key: + description: Key is the Environment Variable key like API_KEY type: string type: - description: ShellEnvVarType is a type of ShellEnvVar + description: 'Type is the type of ShellEnVar: Value, ValueRef, FieldRef.' type: string value: + description: Value is a fixed value, like http://api.example.com type: string valueRef: + description: |- + ValueRef retrieves a Environment Variable value from a composite field. + Can result in error if field is not set: use FieldRef which can handle missing fields. type: string type: object type: array @@ -107,6 +114,8 @@ spec: stdoutField: description: stdoutField type: string + required: + - metadata type: object served: true storage: true