Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Update Pulumi Java SDK to v0.8.0 #2337

Merged
merged 1 commit into from
Mar 16, 2023
Merged

chore: Update Pulumi Java SDK to v0.8.0 #2337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## Unreleased

- Update Pulumi Java SDK to v0.8.0 (https://github.com/pulumi/pulumi-kubernetes/pull/2337)

## 3.24.1 (February 16, 2023)

- Move `invoke_yaml_decode` into ConfigGroup for python (https://github.com/pulumi/pulumi-kubernetes/pull/2317)
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ SCHEMA_FILE := provider/cmd/pulumi-resource-kubernetes/schema.json
GOPATH := $(shell go env GOPATH)

JAVA_GEN := pulumi-java-gen
JAVA_GEN_VERSION := v0.5.2
JAVA_GEN_VERSION := v0.8.0

WORKING_DIR := $(shell pwd)
TESTPARALLELISM := 4
Expand Down
10 changes: 5 additions & 5 deletions sdk/java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,17 @@ repositories {
dependencies {
implementation("com.google.code.findbugs:jsr305:3.0.2")
implementation("com.google.code.gson:gson:2.8.9")
implementation("com.pulumi:pulumi:0.5.2")
implementation("com.pulumi:pulumi:0.8.0")
}

task sourcesJar(type: Jar) {
from sourceSets.main.allJava
classifier = 'sources'
archiveClassifier.set('sources')
}

task javadocJar(type: Jar) {
from javadoc
classifier = 'javadoc'
archiveClassifier.set('javadoc')
}

def genPulumiResources = tasks.register('genPulumiResources') {
Expand Down Expand Up @@ -123,7 +123,7 @@ javadoc {
if (JavaVersion.current().isJava9Compatible()) {
options.addBooleanOption('html5', true)
}
options.jFlags("-Xmx2g", "-Xms512m")
options.jFlags("-Xmx8g", "-Xms512m")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we rely on having that much on CI runners?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Assume this will just act as unbounded and will fail if the host won't give it more memory - this is only the max and not the inital memory to be reserved?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is max, yes

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the extra memory required? I'm not opposed to the change, but curious what the motivation is.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Think this is generated by the java language - was increased because some providers (probably AWS or Azure) crash with only 2gb

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, these changes come from upstream (in the make build, particularly, building the Java sdk step) when we updated to the latest Java gen version. Xmx indicates the maximum allowed, so it won't fail on start, only if the program requires more and the host can't allocate it.

}

if (publishRepoUsername) {
Expand All @@ -144,4 +144,4 @@ if (signingKey) {
useInMemoryPgpKeys(signingKey, signingPassword)
sign publishing.publications.mainPublication
}
}
}
8 changes: 4 additions & 4 deletions ...ain/java/com/pulumi/kubernetes/admissionregistration/v1/MutatingWebhookConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class MutatingWebhookConfiguration extends com.pulumi.resources.CustomRes
* 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
*
*/
@Export(name="apiVersion", type=String.class, parameters={})
@Export(name="apiVersion", refs={String.class}, tree="[0]")
private Output</* @Nullable */ String> apiVersion;

/**
Expand All @@ -41,7 +41,7 @@ public Output<Optional<String>> apiVersion() {
* 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
*
*/
@Export(name="kind", type=String.class, parameters={})
@Export(name="kind", refs={String.class}, tree="[0]")
private Output</* @Nullable */ String> kind;

/**
Expand All @@ -55,7 +55,7 @@ public Output<Optional<String>> kind() {
* Standard object metadata; More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata.
*
*/
@Export(name="metadata", type=ObjectMeta.class, parameters={})
@Export(name="metadata", refs={ObjectMeta.class}, tree="[0]")
private Output</* @Nullable */ ObjectMeta> metadata;

/**
Expand All @@ -69,7 +69,7 @@ public Output<Optional<ObjectMeta>> metadata() {
* Webhooks is a list of webhooks and the affected resources and operations.
*
*/
@Export(name="webhooks", type=List.class, parameters={MutatingWebhook.class})
@Export(name="webhooks", refs={List.class,MutatingWebhook.class}, tree="[0,1]")
private Output</* @Nullable */ List<MutatingWebhook>> webhooks;

/**
Expand Down
8 changes: 4 additions & 4 deletions ...java/com/pulumi/kubernetes/admissionregistration/v1/MutatingWebhookConfigurationList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class MutatingWebhookConfigurationList extends com.pulumi.resources.Custo
* 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
*
*/
@Export(name="apiVersion", type=String.class, parameters={})
@Export(name="apiVersion", refs={String.class}, tree="[0]")
private Output</* @Nullable */ String> apiVersion;

/**
Expand All @@ -40,7 +40,7 @@ public Output<Optional<String>> apiVersion() {
* List of MutatingWebhookConfiguration.
*
*/
@Export(name="items", type=List.class, parameters={MutatingWebhookConfiguration.class})
@Export(name="items", refs={List.class,MutatingWebhookConfiguration.class}, tree="[0,1]")
private Output<List<MutatingWebhookConfiguration>> items;

/**
Expand All @@ -54,7 +54,7 @@ public Output<List<MutatingWebhookConfiguration>> items() {
* 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
*
*/
@Export(name="kind", type=String.class, parameters={})
@Export(name="kind", refs={String.class}, tree="[0]")
private Output</* @Nullable */ String> kind;

/**
Expand All @@ -68,7 +68,7 @@ public Output<Optional<String>> kind() {
* Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
*
*/
@Export(name="metadata", type=ListMeta.class, parameters={})
@Export(name="metadata", refs={ListMeta.class}, tree="[0]")
private Output</* @Nullable */ ListMeta> metadata;

/**
Expand Down
8 changes: 4 additions & 4 deletions ...ava/com/pulumi/kubernetes/admissionregistration/v1/MutatingWebhookConfigurationPatch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class MutatingWebhookConfigurationPatch extends com.pulumi.resources.Cust
* 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
*
*/
@Export(name="apiVersion", type=String.class, parameters={})
@Export(name="apiVersion", refs={String.class}, tree="[0]")
private Output</* @Nullable */ String> apiVersion;

/**
Expand All @@ -47,7 +47,7 @@ public Output<Optional<String>> apiVersion() {
* 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
*
*/
@Export(name="kind", type=String.class, parameters={})
@Export(name="kind", refs={String.class}, tree="[0]")
private Output</* @Nullable */ String> kind;

/**
Expand All @@ -61,7 +61,7 @@ public Output<Optional<String>> kind() {
* Standard object metadata; More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata.
*
*/
@Export(name="metadata", type=ObjectMetaPatch.class, parameters={})
@Export(name="metadata", refs={ObjectMetaPatch.class}, tree="[0]")
private Output</* @Nullable */ ObjectMetaPatch> metadata;

/**
Expand All @@ -75,7 +75,7 @@ public Output<Optional<ObjectMetaPatch>> metadata() {
* Webhooks is a list of webhooks and the affected resources and operations.
*
*/
@Export(name="webhooks", type=List.class, parameters={MutatingWebhookPatch.class})
@Export(name="webhooks", refs={List.class,MutatingWebhookPatch.class}, tree="[0,1]")
private Output</* @Nullable */ List<MutatingWebhookPatch>> webhooks;

/**
Expand Down
8 changes: 4 additions & 4 deletions ...n/java/com/pulumi/kubernetes/admissionregistration/v1/ValidatingWebhookConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class ValidatingWebhookConfiguration extends com.pulumi.resources.CustomR
* 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
*
*/
@Export(name="apiVersion", type=String.class, parameters={})
@Export(name="apiVersion", refs={String.class}, tree="[0]")
private Output</* @Nullable */ String> apiVersion;

/**
Expand All @@ -41,7 +41,7 @@ public Output<Optional<String>> apiVersion() {
* 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
*
*/
@Export(name="kind", type=String.class, parameters={})
@Export(name="kind", refs={String.class}, tree="[0]")
private Output</* @Nullable */ String> kind;

/**
Expand All @@ -55,7 +55,7 @@ public Output<Optional<String>> kind() {
* Standard object metadata; More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata.
*
*/
@Export(name="metadata", type=ObjectMeta.class, parameters={})
@Export(name="metadata", refs={ObjectMeta.class}, tree="[0]")
private Output</* @Nullable */ ObjectMeta> metadata;

/**
Expand All @@ -69,7 +69,7 @@ public Output<Optional<ObjectMeta>> metadata() {
* Webhooks is a list of webhooks and the affected resources and operations.
*
*/
@Export(name="webhooks", type=List.class, parameters={ValidatingWebhook.class})
@Export(name="webhooks", refs={List.class,ValidatingWebhook.class}, tree="[0,1]")
private Output</* @Nullable */ List<ValidatingWebhook>> webhooks;

/**
Expand Down
8 changes: 4 additions & 4 deletions ...va/com/pulumi/kubernetes/admissionregistration/v1/ValidatingWebhookConfigurationList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class ValidatingWebhookConfigurationList extends com.pulumi.resources.Cus
* 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
*
*/
@Export(name="apiVersion", type=String.class, parameters={})
@Export(name="apiVersion", refs={String.class}, tree="[0]")
private Output</* @Nullable */ String> apiVersion;

/**
Expand All @@ -40,7 +40,7 @@ public Output<Optional<String>> apiVersion() {
* List of ValidatingWebhookConfiguration.
*
*/
@Export(name="items", type=List.class, parameters={ValidatingWebhookConfiguration.class})
@Export(name="items", refs={List.class,ValidatingWebhookConfiguration.class}, tree="[0,1]")
private Output<List<ValidatingWebhookConfiguration>> items;

/**
Expand All @@ -54,7 +54,7 @@ public Output<List<ValidatingWebhookConfiguration>> items() {
* 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
*
*/
@Export(name="kind", type=String.class, parameters={})
@Export(name="kind", refs={String.class}, tree="[0]")
private Output</* @Nullable */ String> kind;

/**
Expand All @@ -68,7 +68,7 @@ public Output<Optional<String>> kind() {
* Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
*
*/
@Export(name="metadata", type=ListMeta.class, parameters={})
@Export(name="metadata", refs={ListMeta.class}, tree="[0]")
private Output</* @Nullable */ ListMeta> metadata;

/**
Expand Down
8 changes: 4 additions & 4 deletions ...a/com/pulumi/kubernetes/admissionregistration/v1/ValidatingWebhookConfigurationPatch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class ValidatingWebhookConfigurationPatch extends com.pulumi.resources.Cu
* 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
*
*/
@Export(name="apiVersion", type=String.class, parameters={})
@Export(name="apiVersion", refs={String.class}, tree="[0]")
private Output</* @Nullable */ String> apiVersion;

/**
Expand All @@ -47,7 +47,7 @@ public Output<Optional<String>> apiVersion() {
* 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
*
*/
@Export(name="kind", type=String.class, parameters={})
@Export(name="kind", refs={String.class}, tree="[0]")
private Output</* @Nullable */ String> kind;

/**
Expand All @@ -61,7 +61,7 @@ public Output<Optional<String>> kind() {
* Standard object metadata; More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata.
*
*/
@Export(name="metadata", type=ObjectMetaPatch.class, parameters={})
@Export(name="metadata", refs={ObjectMetaPatch.class}, tree="[0]")
private Output</* @Nullable */ ObjectMetaPatch> metadata;

/**
Expand All @@ -75,7 +75,7 @@ public Output<Optional<ObjectMetaPatch>> metadata() {
* Webhooks is a list of webhooks and the affected resources and operations.
*
*/
@Export(name="webhooks", type=List.class, parameters={ValidatingWebhookPatch.class})
@Export(name="webhooks", refs={List.class,ValidatingWebhookPatch.class}, tree="[0,1]")
private Output</* @Nullable */ List<ValidatingWebhookPatch>> webhooks;

/**
Expand Down
8 changes: 4 additions & 4 deletions .../java/com/pulumi/kubernetes/admissionregistration/v1alpha1/ValidatingAdmissionPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class ValidatingAdmissionPolicy extends com.pulumi.resources.CustomResour
* 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
*
*/
@Export(name="apiVersion", type=String.class, parameters={})
@Export(name="apiVersion", refs={String.class}, tree="[0]")
private Output</* @Nullable */ String> apiVersion;

/**
Expand All @@ -39,7 +39,7 @@ public Output<Optional<String>> apiVersion() {
* 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
*
*/
@Export(name="kind", type=String.class, parameters={})
@Export(name="kind", refs={String.class}, tree="[0]")
private Output</* @Nullable */ String> kind;

/**
Expand All @@ -53,7 +53,7 @@ public Output<Optional<String>> kind() {
* Standard object metadata; More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata.
*
*/
@Export(name="metadata", type=ObjectMeta.class, parameters={})
@Export(name="metadata", refs={ObjectMeta.class}, tree="[0]")
private Output</* @Nullable */ ObjectMeta> metadata;

/**
Expand All @@ -67,7 +67,7 @@ public Output<Optional<ObjectMeta>> metadata() {
* Specification of the desired behavior of the ValidatingAdmissionPolicy.
*
*/
@Export(name="spec", type=ValidatingAdmissionPolicySpec.class, parameters={})
@Export(name="spec", refs={ValidatingAdmissionPolicySpec.class}, tree="[0]")
private Output</* @Nullable */ ValidatingAdmissionPolicySpec> spec;

/**
Expand Down
8 changes: 4 additions & 4 deletions ...om/pulumi/kubernetes/admissionregistration/v1alpha1/ValidatingAdmissionPolicyBinding.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class ValidatingAdmissionPolicyBinding extends com.pulumi.resources.Custo
* 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
*
*/
@Export(name="apiVersion", type=String.class, parameters={})
@Export(name="apiVersion", refs={String.class}, tree="[0]")
private Output</* @Nullable */ String> apiVersion;

/**
Expand All @@ -39,7 +39,7 @@ public Output<Optional<String>> apiVersion() {
* 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
*
*/
@Export(name="kind", type=String.class, parameters={})
@Export(name="kind", refs={String.class}, tree="[0]")
private Output</* @Nullable */ String> kind;

/**
Expand All @@ -53,7 +53,7 @@ public Output<Optional<String>> kind() {
* Standard object metadata; More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata.
*
*/
@Export(name="metadata", type=ObjectMeta.class, parameters={})
@Export(name="metadata", refs={ObjectMeta.class}, tree="[0]")
private Output</* @Nullable */ ObjectMeta> metadata;

/**
Expand All @@ -67,7 +67,7 @@ public Output<Optional<ObjectMeta>> metadata() {
* Specification of the desired behavior of the ValidatingAdmissionPolicyBinding.
*
*/
@Export(name="spec", type=ValidatingAdmissionPolicyBindingSpec.class, parameters={})
@Export(name="spec", refs={ValidatingAdmissionPolicyBindingSpec.class}, tree="[0]")
private Output</* @Nullable */ ValidatingAdmissionPolicyBindingSpec> spec;

/**
Expand Down
8 changes: 4 additions & 4 deletions ...ulumi/kubernetes/admissionregistration/v1alpha1/ValidatingAdmissionPolicyBindingList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class ValidatingAdmissionPolicyBindingList extends com.pulumi.resources.C
* 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
*
*/
@Export(name="apiVersion", type=String.class, parameters={})
@Export(name="apiVersion", refs={String.class}, tree="[0]")
private Output</* @Nullable */ String> apiVersion;

/**
Expand All @@ -40,7 +40,7 @@ public Output<Optional<String>> apiVersion() {
* List of PolicyBinding.
*
*/
@Export(name="items", type=List.class, parameters={ValidatingAdmissionPolicyBinding.class})
@Export(name="items", refs={List.class,ValidatingAdmissionPolicyBinding.class}, tree="[0,1]")
private Output</* @Nullable */ List<ValidatingAdmissionPolicyBinding>> items;

/**
Expand All @@ -54,7 +54,7 @@ public Output<Optional<List<ValidatingAdmissionPolicyBinding>>> items() {
* 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
*
*/
@Export(name="kind", type=String.class, parameters={})
@Export(name="kind", refs={String.class}, tree="[0]")
private Output</* @Nullable */ String> kind;

/**
Expand All @@ -68,7 +68,7 @@ public Output<Optional<String>> kind() {
* Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
*
*/
@Export(name="metadata", type=ListMeta.class, parameters={})
@Export(name="metadata", refs={ListMeta.class}, tree="[0]")
private Output</* @Nullable */ ListMeta> metadata;

/**
Expand Down
Loading