-
Notifications
You must be signed in to change notification settings - Fork 326
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for PartitionExports (#802)
* Add support for PartitionExports - This PR does not include acceptance tests. The desired acceptance tests will be determined based on the expected behavior of PartitionExports when partitions are disabled. - Similarly, controller tests have not been added as our existing controller tests only account for namespace. The behavior with partitions has not been resolved. * CHANGELOG
- Loading branch information
Ashwin Venkatesh
authored
Oct 27, 2021
1 parent
de51017
commit e7c2ad3
Showing
27 changed files
with
1,450 additions
and
129 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,10 @@ | ||
| apiVersion: consul.hashicorp.com/v1alpha1 | ||
| kind: PartitionExports | ||
| metadata: | ||
| name: exports | ||
| spec: | ||
| services: | ||
| - name: frontend | ||
| namespace: frontend | ||
| consumers: | ||
| - partition: other |
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,137 @@ | ||
| {{- if .Values.controller.enabled }} | ||
| --- | ||
| apiVersion: apiextensions.k8s.io/v1 | ||
| kind: CustomResourceDefinition | ||
| metadata: | ||
| annotations: | ||
| controller-gen.kubebuilder.io/version: v0.6.0 | ||
| creationTimestamp: null | ||
| name: partitionexports.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: PartitionExports | ||
| listKind: PartitionExportsList | ||
| plural: partitionexports | ||
| singular: partitionexports | ||
| 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: PartitionExports is the Schema for the partitionexports 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: PartitionExportsSpec defines the desired state of PartitionExports | ||
| properties: | ||
| services: | ||
| description: Services is a list of services to be exported and the | ||
| list of partitions to expose them to. | ||
| items: | ||
| description: ExportedService manages the exporting of a service | ||
| in the local partition to other partitions. | ||
| properties: | ||
| consumers: | ||
| description: Consumers is a list of downstream consumers of | ||
| the service to be exported. | ||
| items: | ||
| description: ServiceConsumer represents a downstream consumer | ||
| of the service to be exported. | ||
| properties: | ||
| partition: | ||
| description: Partition is the admin partition to export | ||
| the service to. | ||
| type: string | ||
| type: object | ||
| type: array | ||
| name: | ||
| description: Name is the name of the service to be exported. | ||
| type: string | ||
| namespace: | ||
| description: Namespace is the namespace to export the service | ||
| from. | ||
| type: string | ||
| type: object | ||
| type: array | ||
| 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| #!/usr/bin/env bats | ||
|
|
||
| load _helpers | ||
|
|
||
| @test "partitionExports/CustomerResourceDefinition: disabled by default" { | ||
| cd `chart_dir` | ||
| assert_empty helm template \ | ||
| -s templates/crd-partitionexports.yaml \ | ||
| . | ||
| } | ||
|
|
||
| @test "partitionExports/CustomerResourceDefinition: enabled with controller.enabled=true" { | ||
| cd `chart_dir` | ||
| local actual=$(helm template \ | ||
| -s templates/crd-partitionexports.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" ] | ||
| } |
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 |
|---|---|---|
| @@ -1,63 +1,62 @@ | ||
| domain: hashicorp.com | ||
| layout: go.kubebuilder.io/v2 | ||
| layout: | ||
| - go.kubebuilder.io/v2 | ||
| plugins: | ||
| go.operator-sdk.io/v2-alpha: {} | ||
| repo: github.com/hashicorp/consul-k8s | ||
| resources: | ||
| - | ||
| controller: true | ||
| - controller: true | ||
| domain: hashicorp.com | ||
| group: consul | ||
| kind: IngressGateway | ||
| path: github.com/hashicorp/consul-k8s/api/v1alpha1 | ||
| version: v1alpha1 | ||
| - | ||
| controller: true | ||
| - controller: true | ||
| domain: hashicorp.com | ||
| group: consul | ||
| kind: ProxyDefaults | ||
| path: github.com/hashicorp/consul-k8s/api/v1alpha1 | ||
| version: v1alpha1 | ||
| - | ||
| controller: true | ||
| - controller: true | ||
| domain: hashicorp.com | ||
| group: consul | ||
| kind: ServiceIntentions | ||
| path: github.com/hashicorp/consul-k8s/api/v1alpha1 | ||
| version: v1alpha1 | ||
| - | ||
| controller: true | ||
| - controller: true | ||
| domain: hashicorp.com | ||
| group: consul | ||
| kind: ServiceDefaults | ||
| path: github.com/hashicorp/consul-k8s/api/v1alpha1 | ||
| version: v1alpha1 | ||
| - | ||
| controller: true | ||
| - controller: true | ||
| domain: hashicorp.com | ||
| group: consul | ||
| kind: ServiceResolver | ||
| path: github.com/hashicorp/consul-k8s/api/v1alpha1 | ||
| version: v1alpha1 | ||
| - | ||
| controller: true | ||
| - controller: true | ||
| domain: hashicorp.com | ||
| group: consul | ||
| kind: ServiceRouter | ||
| path: github.com/hashicorp/consul-k8s/api/v1alpha1 | ||
| version: v1alpha1 | ||
| - | ||
| controller: true | ||
| - controller: true | ||
| domain: hashicorp.com | ||
| group: consul | ||
| kind: ServiceSplitter | ||
| path: github.com/hashicorp/consul-k8s/api/v1alpha1 | ||
| version: v1alpha1 | ||
| - | ||
| controller: true | ||
| - controller: true | ||
| domain: hashicorp.com | ||
| group: consul | ||
| kind: TerminatingGateway | ||
| path: github.com/hashicorp/consul-k8s/api/v1alpha1 | ||
| version: v1alpha1 | ||
| - controller: true | ||
| domain: hashicorp.com | ||
| group: consul | ||
| kind: PartitionExport | ||
| path: github.com/hashicorp/consul-k8s/api/v1alpha1 | ||
| version: v1alpha1 | ||
| version: "3" | ||
| plugins: | ||
| go.operator-sdk.io/v2-alpha: {} |
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
Oops, something went wrong.