From 51ab4aea6f1ed99bb0318145948e0657b3aee5bc Mon Sep 17 00:00:00 2001 From: Florian Stadler Date: Mon, 15 Jul 2024 22:01:47 +0200 Subject: [PATCH 1/4] Define Supported Languages for Chart v3 docsgen supports defining the supported languages for an overlay. This will ensure only the supported languages show up in the language choosers of the docs. --- provider/cmd/pulumi-resource-kubernetes/schema.json | 6 ++++++ provider/pkg/gen/overlays.go | 1 + 2 files changed, 7 insertions(+) diff --git a/provider/cmd/pulumi-resource-kubernetes/schema.json b/provider/cmd/pulumi-resource-kubernetes/schema.json index e2d4d7d235..f270d3fbea 100644 --- a/provider/cmd/pulumi-resource-kubernetes/schema.json +++ b/provider/cmd/pulumi-resource-kubernetes/schema.json @@ -86998,6 +86998,12 @@ }, "type": "object", "isOverlay": true, + "overlaySupportedLanguages": [ + "csharp", + "go", + "python", + "nodejs" + ], "inputProperties": { "chart": { "type": "string", diff --git a/provider/pkg/gen/overlays.go b/provider/pkg/gen/overlays.go index 464293a4fe..0425f3e63a 100644 --- a/provider/pkg/gen/overlays.go +++ b/provider/pkg/gen/overlays.go @@ -55,6 +55,7 @@ var helmV3ChartResource = pschema.ResourceSpec{ IsComponent: true, ObjectTypeSpec: pschema.ObjectTypeSpec{ IsOverlay: true, + OverlaySupportedLanguages: []string{"csharp", "go", "python", "nodejs"}, Description: helmV3ChartMD, Properties: map[string]pschema.PropertySpec{ "resources": { From 8927efd348d9333c252cfc1b0e247b3b3c536d03 Mon Sep 17 00:00:00 2001 From: Florian Stadler Date: Mon, 15 Jul 2024 22:07:31 +0200 Subject: [PATCH 2/4] Add changelog entry --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd94cabf6d..eba3363398 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## Unreleased +### Added + +- Define Supported Languages for Chart v3 (https://github.com/pulumi/pulumi-kubernetes/pull/3107) + ### Fixed - Updated logic to accurately detect if a resource is a Patch variant (https://github.com/pulumi/pulumi-kubernetes/pull/3102) From 956e547e69bc504270aa06c2237066339792c3b5 Mon Sep 17 00:00:00 2001 From: Florian Stadler Date: Mon, 15 Jul 2024 23:20:30 +0200 Subject: [PATCH 3/4] Add supported languages for all overlay resources --- .../pulumi-resource-kubernetes/schema.json | 30 +++++++++++++++++++ provider/pkg/gen/overlays.go | 5 ++++ 2 files changed, 35 insertions(+) diff --git a/provider/cmd/pulumi-resource-kubernetes/schema.json b/provider/cmd/pulumi-resource-kubernetes/schema.json index f270d3fbea..f590daef7a 100644 --- a/provider/cmd/pulumi-resource-kubernetes/schema.json +++ b/provider/cmd/pulumi-resource-kubernetes/schema.json @@ -72586,6 +72586,12 @@ "kind" ], "isOverlay": true, + "overlaySupportedLanguages": [ + "csharp", + "go", + "python", + "nodejs" + ], "inputProperties": { "apiVersion": { "type": "string", @@ -72636,6 +72642,12 @@ "kind" ], "isOverlay": true, + "overlaySupportedLanguages": [ + "csharp", + "go", + "python", + "nodejs" + ], "inputProperties": { "apiVersion": { "type": "string", @@ -87554,6 +87566,12 @@ "directory" ], "isOverlay": true, + "overlaySupportedLanguages": [ + "csharp", + "go", + "python", + "nodejs" + ], "inputProperties": { "directory": { "type": "string", @@ -99784,6 +99802,12 @@ }, "type": "object", "isOverlay": true, + "overlaySupportedLanguages": [ + "csharp", + "go", + "python", + "nodejs" + ], "inputProperties": { "file": { "type": "string", @@ -99816,6 +99840,12 @@ }, "type": "object", "isOverlay": true, + "overlaySupportedLanguages": [ + "csharp", + "go", + "python", + "nodejs" + ], "inputProperties": { "files": { "oneOf": [ diff --git a/provider/pkg/gen/overlays.go b/provider/pkg/gen/overlays.go index 0425f3e63a..f2f1560f54 100644 --- a/provider/pkg/gen/overlays.go +++ b/provider/pkg/gen/overlays.go @@ -1174,6 +1174,7 @@ var kustomizeDirectoryResource = pschema.ResourceSpec{ IsComponent: true, ObjectTypeSpec: pschema.ObjectTypeSpec{ IsOverlay: true, + OverlaySupportedLanguages: []string{"csharp", "go", "python", "nodejs"}, Description: kustomizeDirectoryMD, Properties: map[string]pschema.PropertySpec{ "directory": { @@ -1287,6 +1288,7 @@ var yamlConfigFileResource = pschema.ResourceSpec{ IsComponent: true, ObjectTypeSpec: pschema.ObjectTypeSpec{ IsOverlay: true, + OverlaySupportedLanguages: []string{"csharp", "go", "python", "nodejs"}, Description: configFileMD, Properties: map[string]pschema.PropertySpec{ "resources": { @@ -1379,6 +1381,7 @@ var yamlConfigGroupResource = pschema.ResourceSpec{ IsComponent: true, ObjectTypeSpec: pschema.ObjectTypeSpec{ IsOverlay: true, + OverlaySupportedLanguages: []string{"csharp", "go", "python", "nodejs"}, Description: configGroupMD, Properties: map[string]pschema.PropertySpec{ "resources": { @@ -1521,6 +1524,7 @@ var yamlConfigGroupV2Resource = pschema.ResourceSpec{ var apiextensionsCustomResource = pschema.ResourceSpec{ ObjectTypeSpec: pschema.ObjectTypeSpec{ IsOverlay: true, + OverlaySupportedLanguages: []string{"csharp", "go", "python", "nodejs"}, Description: "CustomResource represents an instance of a CustomResourceDefinition (CRD). For example, the\n CoreOS Prometheus operator exposes a CRD `monitoring.coreos.com/ServiceMonitor`; to\n instantiate this as a Pulumi resource, one could call `new CustomResource`, passing the\n `ServiceMonitor` resource definition as an argument.", Properties: map[string]pschema.PropertySpec{ "apiVersion": { @@ -1588,6 +1592,7 @@ var apiextensionsCustomResource = pschema.ResourceSpec{ var apiextensionsCustomResourcePatch = pschema.ResourceSpec{ ObjectTypeSpec: pschema.ObjectTypeSpec{ IsOverlay: true, + OverlaySupportedLanguages: []string{"csharp", "go", "python", "nodejs"}, Description: "CustomResourcePatch represents an instance of a CustomResourceDefinition (CRD). For example, the\n CoreOS Prometheus operator exposes a CRD `monitoring.coreos.com/ServiceMonitor`; to\n instantiate this as a Pulumi resource, one could call `new CustomResourcePatch`, passing the\n `ServiceMonitor` resource definition as an argument.", Properties: map[string]pschema.PropertySpec{ "apiVersion": { From ab0f7d9e07f0a6a9ab7f22515a0c657dd6d2affc Mon Sep 17 00:00:00 2001 From: Florian Stadler Date: Mon, 15 Jul 2024 23:21:33 +0200 Subject: [PATCH 4/4] Update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eba3363398..7c268fed8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ### Added -- Define Supported Languages for Chart v3 (https://github.com/pulumi/pulumi-kubernetes/pull/3107) +- Define Supported Languages for Overlays (https://github.com/pulumi/pulumi-kubernetes/pull/3107) ### Fixed