Skip to content

Commit

Permalink
Java build items
Browse files Browse the repository at this point in the history
  • Loading branch information
@rshade
rshade committed Dec 17, 2024
1 parent 89513ea commit f061f20
Show file tree
Hide file tree
Showing 6 changed files with 76 additions and 65 deletions.
6 changes: 3 additions & 3 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,10 @@ install_python_sdk:: # Required by CI

# Java SDK

generate_java: # Required by CI
pulumi package gen-sdk ${SCHEMA_PATH} -o sdk --language java
generate_java: .pulumi/bin/pulumi # Required by CI
.pulumi/bin/pulumi package gen-sdk ${SCHEMA_PATH} -o sdk --language java
cp ${WORKING_DIR}/README.md sdk/java
build_java: # Required by CI
build_java: generate_java # Required by CI
cd sdk/java && gradle --console=plain build

install_java_sdk: # Required by CI
Expand Down
62 changes: 31 additions & 31 deletions provider/cmd/pulumi-resource-kubernetes-cert-manager/schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"isComponent": true,
"inputProperties": {
"affinity": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:core/v1:Affinity"
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:Affinity"
},
"cainjector": {
"$ref": "#/types/kubernetes-cert-manager:index:CertManagerCaInjector"
Expand All @@ -29,7 +29,7 @@
"type": "string"
},
"containerSecurityContext": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:core/v1:SecurityContext",
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:SecurityContext",
"description": "Container Security Context to be set on the controller component container. ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/"
},
"deploymentAnnotations": {
Expand All @@ -48,19 +48,19 @@
},
"extraEnv": {
"items": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:core/v1:EnvVar"
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:EnvVar"
},
"type": "array"
},
"extraVolumeMounts": {
"items": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:core/v1:VolumeMount"
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:VolumeMount"
},
"type": "array"
},
"extraVolumes": {
"items": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:core/v1:Volume"
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:Volume"
},
"type": "array"
},
Expand Down Expand Up @@ -97,7 +97,7 @@
"type": "array"
},
"nodeSelector": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:core/v1:NodeSelector"
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:NodeSelector"
},
"podAnnotations": {
"additionalProperties": {
Expand All @@ -107,7 +107,7 @@
"type": "object"
},
"podDnsConfig": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:core/v1:PodDNSConfig"
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:PodDNSConfig"
},
"podDnsPolicy": {
"description": "Optional DNS settings, useful if you have a public and private DNS zone for the same domain on Route 53. What follows is an example of ensuring cert-manager can access an ingress or DNS TXT records at all times. NOTE: This requires Kubernetes 1.10 or `CustomPodDNS` feature gate enabled for the cluster to work.",
Expand All @@ -126,10 +126,10 @@
"type": "integer"
},
"resources": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:core/v1:ResourceRequirements"
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:ResourceRequirements"
},
"securityContext": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:core/v1:PodSecurityContext",
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:PodSecurityContext",
"description": "Pod Security Context. ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/"
},
"serviceAccount": {
Expand All @@ -153,11 +153,11 @@
"$ref": "#/types/kubernetes-cert-manager:index:CertManagerStartupAPICheck"
},
"strategy": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:apps/v1:DeploymentStrategy"
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:apps/v1:DeploymentStrategy"
},
"tolerations": {
"items": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:core/v1:Toleration"
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:Toleration"
},
"type": "array"
},
Expand Down Expand Up @@ -418,10 +418,10 @@
"kubernetes-cert-manager:index:CertManagerCaInjector": {
"properties": {
"affinity": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:core/v1:Affinity"
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:Affinity"
},
"containerSecurityContext": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:core/v1:SecurityContext",
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:SecurityContext",
"description": "Container Security Context to be set on the cainjector component container. ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/"
},
"deploymentAnnotations": {
Expand Down Expand Up @@ -462,27 +462,27 @@
"type": "object"
},
"podSecurityContext": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:core/v1:PodSecurityContext",
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:PodSecurityContext",
"description": "Pod Security Context to be set on the cainjector component Pod. ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/"
},
"replicaCount": {
"type": "integer"
},
"resources": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:core/v1:ResourceRequirements"
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:ResourceRequirements"
},
"serviceAccount": {
"$ref": "#/types/kubernetes-cert-manager:index:CertManagerServiceAccount"
},
"strategy": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:apps/v1:DeploymentStrategy"
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:apps/v1:DeploymentStrategy"
},
"timeoutSeconds": {
"type": "integer"
},
"tolerations": {
"items": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:core/v1:Toleration"
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:Toleration"
},
"type": "array"
}
Expand All @@ -494,7 +494,7 @@
"imagePullSecrets": {
"description": "Reference to one or more secrets to be used when pulling images. ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/",
"items": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:core/v1:LocalObjectReference"
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:LocalObjectReference"
},
"type": "array"
},
Expand Down Expand Up @@ -659,7 +659,7 @@
"kubernetes-cert-manager:index:CertManagerStartupAPICheck": {
"properties": {
"affinity": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:core/v1:Affinity"
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:Affinity"
},
"backoffLimit": {
"description": "Job backoffLimit",
Expand Down Expand Up @@ -709,10 +709,10 @@
"$ref": "#/types/kubernetes-cert-manager:index:CertManagerStartupAPICheckRBAC"
},
"resources": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:core/v1:ResourceRequirements"
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:ResourceRequirements"
},
"securityContext": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:core/v1:PodSecurityContext",
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:PodSecurityContext",
"description": "Pod Security Context to be set on the startupapicheck component Pod. ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/"
},
"serviceAccount": {
Expand All @@ -724,7 +724,7 @@
},
"tolerations": {
"items": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:core/v1:Toleration"
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:Toleration"
},
"type": "array"
}
Expand All @@ -746,10 +746,10 @@
"kubernetes-cert-manager:index:CertManagerWebhook": {
"properties": {
"affinity": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:core/v1:Affinity"
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:Affinity"
},
"containerSecurityContext": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:core/v1:SecurityContext",
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:SecurityContext",
"description": "Container Security Context to be set on the webhook component container. ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/"
},
"deploymentAnnotations": {
Expand All @@ -774,7 +774,7 @@
"$ref": "#/types/kubernetes-cert-manager:index:CertManagerImage"
},
"livenessProbe": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:core/v1:Probe",
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:Probe",
"description": "Liveness probe values. Ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes"
},
"loadBalancerIP": {
Expand Down Expand Up @@ -808,21 +808,21 @@
"type": "object"
},
"readinessProbe": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:core/v1:Probe",
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:Probe",
"description": "Readiness probe values. Ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes"
},
"replicaCount": {
"type": "integer"
},
"resources": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:core/v1:ResourceRequirements"
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:ResourceRequirements"
},
"securePort": {
"description": "The port that the webhook should listen on for requests. In GKE private clusters, by default kubernetes apiservers are allowed to talk to the cluster nodes only on 443 and 10250. so configuring securePort: 10250, will work out of the box without needing to add firewall rules or requiring NET_BIND_SERVICE capabilities to bind port numbers <1000",
"type": "integer"
},
"securityContext": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:core/v1:PodSecurityContext",
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:PodSecurityContext",
"description": "Pod Security Context to be set on the webhook component Pod. ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/"
},
"serviceAccount": {
Expand All @@ -847,14 +847,14 @@
"type": "string"
},
"strategy": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:apps/v1:DeploymentStrategy"
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:apps/v1:DeploymentStrategy"
},
"timeoutSeconds": {
"type": "integer"
},
"tolerations": {
"items": {
"$ref": "/kubernetes/v4.7.1/schema.json#/types/kubernetes:core/v1:Toleration"
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:Toleration"
},
"type": "array"
},
Expand Down Expand Up @@ -903,7 +903,7 @@
"dependencies": {
"com.google.code.findbugs:jsr305": "3.0.2",
"com.google.code.gson:gson": "2.8.9",
"com.pulumi:pulumi": "0.13.0",
"com.pulumi:pulumi": "0.20.0",
"com.pulumi:kubernetes": "4.19.0"
},
"gradleNexusPublishPluginVersion": "1.1.0",
Expand Down
2 changes: 0 additions & 2 deletions provider/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ module github.com/pulumi/pulumi-kubernetes-cert-manager

go 1.22.4

toolchain go1.23.4

require (
github.com/pulumi/pulumi-go-helmbase v0.1.0
github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.19.0
Expand Down
2 changes: 1 addition & 1 deletion sdk/java/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ dependencies {
implementation("com.google.code.findbugs:jsr305:3.0.2")
implementation("com.google.code.gson:gson:2.8.9")
implementation("com.pulumi:kubernetes:4.19.0")
implementation("com.pulumi:pulumi:0.13.0")
implementation("com.pulumi:pulumi:0.20.0")
}

task sourcesJar(type: Jar) {
Expand Down
31 changes: 22 additions & 9 deletions sdk/java/src/main/java/com/pulumi/kubernetescertmanager/Utilities.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import javax.annotation.Nullable;
import com.pulumi.core.internal.Environment;
import com.pulumi.deployment.InvokeOptions;
import com.pulumi.deployment.InvokeOutputOptions;

public class Utilities {

Expand Down Expand Up @@ -57,16 +58,28 @@ public static Optional<java.lang.Double> getEnvDouble(java.lang.String... names)
return Optional.empty();
}

public static InvokeOptions withVersion(@Nullable InvokeOptions options) {
if (options != null && options.getVersion().isPresent()) {
return options;
}
return new InvokeOptions(
options == null ? null : options.getParent().orElse(null),
options == null ? null : options.getProvider().orElse(null),
getVersion()
);
public static InvokeOptions withVersion(@Nullable InvokeOptions options) {
if (options != null && options.getVersion().isPresent()) {
return options;
}
return new InvokeOptions(
options == null ? null : options.getParent().orElse(null),
options == null ? null : options.getProvider().orElse(null),
getVersion()
);
}

public static InvokeOutputOptions withVersion(@Nullable InvokeOutputOptions options) {
if (options != null && options.getVersion().isPresent()) {
return options;
}
return new InvokeOutputOptions(
options == null ? null : options.getParent().orElse(null),
options == null ? null : options.getProvider().orElse(null),
getVersion(),
options == null ? null : options.getDependsOn()
);
}

private static final java.lang.String version;
public static java.lang.String getVersion() {
Expand Down
Loading

0 comments on commit f061f20

Please sign in to comment.