This repository has been archived by the owner on Aug 25, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 386
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
fbb122c
commit afec8ec
Showing
10 changed files
with
215 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| {{- if .Values.controller.enabled }} | ||
| --- | ||
| apiVersion: apiextensions.k8s.io/v1 | ||
| kind: CustomResourceDefinition | ||
| metadata: | ||
| annotations: | ||
| controller-gen.kubebuilder.io/version: v0.5.0 | ||
| creationTimestamp: null | ||
| name: meshes.consul.hashicorp.com | ||
| labels: | ||
| app: {{ template "consul.name" . }} | ||
| chart: {{ template "consul.chart" . }} | ||
| heritage: {{ .Release.Service }} | ||
| release: {{ .Release.Name }} | ||
| component: crd | ||
| spec: | ||
| group: consul.hashicorp.com | ||
| names: | ||
| kind: Mesh | ||
| listKind: MeshList | ||
| plural: meshes | ||
| singular: mesh | ||
| scope: Namespaced | ||
| versions: | ||
| - additionalPrinterColumns: | ||
| - description: The sync status of the resource with Consul | ||
| jsonPath: .status.conditions[?(@.type=="Synced")].status | ||
| name: Synced | ||
| type: string | ||
| - description: The last successful synced time of the resource with Consul | ||
| jsonPath: .status.lastSyncedTime | ||
| name: Last Synced | ||
| type: date | ||
| - description: The age of the resource | ||
| jsonPath: .metadata.creationTimestamp | ||
| name: Age | ||
| type: date | ||
| name: v1alpha1 | ||
| schema: | ||
| openAPIV3Schema: | ||
| description: Mesh is the Schema for the mesh 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: MeshSpec defines the desired state of Mesh | ||
| properties: | ||
| transparentProxy: | ||
| properties: | ||
| catalogDestinationsOnly: | ||
| type: boolean | ||
| type: object | ||
| type: object | ||
| status: | ||
| properties: | ||
| conditions: | ||
| description: Conditions indicate the latest available observations of a resource's current state. | ||
| items: | ||
| description: 'Conditions define a readiness condition for a Consul resource. See: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#typical-status-properties' | ||
| properties: | ||
| lastTransitionTime: | ||
| description: LastTransitionTime is the last time the condition transitioned from one status to another. | ||
| format: date-time | ||
| type: string | ||
| message: | ||
| description: A human readable message indicating details about the transition. | ||
| type: string | ||
| reason: | ||
| description: The reason for the condition's last transition. | ||
| type: string | ||
| status: | ||
| description: Status of the condition, one of True, False, Unknown. | ||
| type: string | ||
| type: | ||
| description: Type of condition. | ||
| type: string | ||
| required: | ||
| - status | ||
| - type | ||
| type: object | ||
| type: array | ||
| lastSyncedTime: | ||
| description: LastSyncedTime is the last time the resource successfully synced with Consul. | ||
| format: date-time | ||
| type: string | ||
| type: object | ||
| type: object | ||
| served: true | ||
| storage: true | ||
| subresources: | ||
| status: {} | ||
| status: | ||
| acceptedNames: | ||
| kind: "" | ||
| plural: "" | ||
| conditions: [] | ||
| storedVersions: [] | ||
| {{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| apiVersion: consul.hashicorp.com/v1alpha1 | ||
| kind: Mesh | ||
| metadata: | ||
| name: mesh | ||
| spec: | ||
| transparentProxy: | ||
| catalogDestinationsOnly: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| #!/usr/bin/env bats | ||
|
|
||
| load _helpers | ||
|
|
||
| @test "mesh/CustomerResourceDefinition: disabled by default" { | ||
| cd `chart_dir` | ||
| assert_empty helm template \ | ||
| -s templates/crd-meshes.yaml \ | ||
| . | ||
| } | ||
|
|
||
| @test "mesh/CustomerResourceDefinition: enabled with controller.enabled=true" { | ||
| cd `chart_dir` | ||
| local actual=$(helm template \ | ||
| -s templates/crd-meshes.yaml \ | ||
| --set 'controller.enabled=true' \ | ||
| . | tee /dev/stderr | | ||
| # The generated CRDs have "---" at the top which results in two objects | ||
| # being detected by yq, the first of which is null. We must therefore use | ||
| # yq -s so that length operates on both objects at once rather than | ||
| # individually, which would output false\ntrue and fail the test. | ||
| yq -s 'length > 0' | tee /dev/stderr) | ||
| [ "${actual}" = "true" ] | ||
| } |