Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Loading
Loading status checks…
Java 1, Adding Make Ensure, Syncing all go modules.
Browse files Browse the repository at this point in the history 
Updating editorconfig so that schema.json doesn't try to reformat each time
@rshade
rshade committed Jan 23, 2025
1 parent de5f332 commit 2d59472
Showing 7 changed files with 174 additions and 42 deletions.
45 changes: 43 additions & 2 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,57 @@
# EditorConfig helps maintain consistent coding styles across editors and IDEs
# More details at https://editorconfig.org

# Root editorconfig file
root = true

# Apply to all files
[*]
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

# JSON files - noticed in schema.json using 4 spaces
[*.json]
indent_style = space
indent_size = 4

# YAML files
[*.{yml,yaml}]
indent_style = space
indent_size = 2

# Markdown files
[*.md]
trim_trailing_whitespace = false

# TypeScript files
[*.{ts,tsx}]
indent_style = space
indent_size = 2

# Go files
[*.go]
indent_style = tab
tab_width = 4

# Python files
[*.py]
indent_size = 4
max_line_length = 100

# Java files
[*.java]
indent_size = 4

# JavaScript files
[*.{js,jsx}]
indent_style = space
indent_size = 2

# Ignore venv folders
[**/venv/**]
indent_style = unset
indent_size = unset
49 changes: 49 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -128,3 +128,52 @@ install_java_sdk: # Required by CI
.pulumi/bin/pulumi: HOME := $(WORKING_DIR)
.pulumi/bin/pulumi: .pulumi.version
curl -fsSL https://get.pulumi.com | sh -s -- --version "$(PULUMI_VERSION)"

.PHONY: ensure
ensure:
@echo "Ensuring Go module and Pulumi version consistency..."

@# First tidy and download in provider directory
@echo "Updating provider/go.mod..."
@cd provider && \
go mod tidy && \
go mod download

@# Extract Pulumi SDK version from provider/go.mod
@echo "Syncing Pulumi version..."
@awk 'BEGIN {p=0} \
/^require[ \t]*\(/ {p=1; next} \
/^\)/ {p=0} \
p==1 && $$1 ~ /^github.com\/pulumi\/pulumi\/(sdk|pkg)\/v3/ && !(/\/\//) {print $$1 " " $$2}' provider/go.mod > /tmp/pulumi_deps.txt

@# Extract all other direct dependencies from provider/go.mod
@awk 'BEGIN {p=0} \
/^require[ \t]*\(/ {p=1; next} \
/^\)/ {p=0} \
p==1 && $$1 !~ /^github.com\/pulumi\/pulumi\/(sdk|pkg)\/v3/ && !(/\/\//) {print $$1 " " $$2}' provider/go.mod > /tmp/direct_deps.txt

@# Update sdk/go.mod
@echo "Updating sdk/go.mod..."
@cd sdk && \
while read -r dep version; do \
go get "$$dep@$$version"; \
done < /tmp/direct_deps.txt && \
while read -r dep version; do \
go get "$$dep@$$version"; \
done < /tmp/pulumi_deps.txt && \
go mod tidy

@# Update examples/go.mod
@echo "Updating examples/go.mod..."
@cd examples && \
while read -r dep version; do \
go get "$$dep@$$version"; \
done < /tmp/direct_deps.txt && \
while read -r dep version; do \
go get "$$dep@$$version"; \
done < /tmp/pulumi_deps.txt && \
go mod tidy

@# Clean up
@rm -f /tmp/direct_deps.txt /tmp/pulumi_deps.txt
@echo "Done ensuring Go module and Pulumi version consistency"
69 changes: 35 additions & 34 deletions provider/cmd/pulumi-resource-kubernetes-cert-manager/schema.json
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
"isComponent": true,
"inputProperties": {
"affinity": {
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:Affinity"
"$ref": "/kubernetes/v4.21.0/schema.json#/types/kubernetes:core/v1:Affinity"
},
"cainjector": {
"$ref": "#/types/kubernetes-cert-manager:index:CertManagerCaInjector"
@@ -29,7 +29,7 @@
"type": "string"
},
"containerSecurityContext": {
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:SecurityContext",
"$ref": "/kubernetes/v4.21.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": {
@@ -48,19 +48,19 @@
},
"extraEnv": {
"items": {
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:EnvVar"
"$ref": "/kubernetes/v4.21.0/schema.json#/types/kubernetes:core/v1:EnvVar"
},
"type": "array"
},
"extraVolumeMounts": {
"items": {
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:VolumeMount"
"$ref": "/kubernetes/v4.21.0/schema.json#/types/kubernetes:core/v1:VolumeMount"
},
"type": "array"
},
"extraVolumes": {
"items": {
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:Volume"
"$ref": "/kubernetes/v4.21.0/schema.json#/types/kubernetes:core/v1:Volume"
},
"type": "array"
},
@@ -97,7 +97,7 @@
"type": "array"
},
"nodeSelector": {
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:NodeSelector"
"$ref": "/kubernetes/v4.21.0/schema.json#/types/kubernetes:core/v1:NodeSelector"
},
"podAnnotations": {
"additionalProperties": {
@@ -107,7 +107,7 @@
"type": "object"
},
"podDnsConfig": {
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:PodDNSConfig"
"$ref": "/kubernetes/v4.21.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.",
@@ -126,10 +126,10 @@
"type": "integer"
},
"resources": {
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:ResourceRequirements"
"$ref": "/kubernetes/v4.21.0/schema.json#/types/kubernetes:core/v1:ResourceRequirements"
},
"securityContext": {
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:PodSecurityContext",
"$ref": "/kubernetes/v4.21.0/schema.json#/types/kubernetes:core/v1:PodSecurityContext",
"description": "Pod Security Context. ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/"
},
"serviceAccount": {
@@ -153,11 +153,11 @@
"$ref": "#/types/kubernetes-cert-manager:index:CertManagerStartupAPICheck"
},
"strategy": {
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:apps/v1:DeploymentStrategy"
"$ref": "/kubernetes/v4.21.0/schema.json#/types/kubernetes:apps/v1:DeploymentStrategy"
},
"tolerations": {
"items": {
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:Toleration"
"$ref": "/kubernetes/v4.21.0/schema.json#/types/kubernetes:core/v1:Toleration"
},
"type": "array"
},
@@ -418,10 +418,10 @@
"kubernetes-cert-manager:index:CertManagerCaInjector": {
"properties": {
"affinity": {
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:Affinity"
"$ref": "/kubernetes/v4.21.0/schema.json#/types/kubernetes:core/v1:Affinity"
},
"containerSecurityContext": {
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:SecurityContext",
"$ref": "/kubernetes/v4.21.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": {
@@ -462,27 +462,27 @@
"type": "object"
},
"podSecurityContext": {
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:PodSecurityContext",
"$ref": "/kubernetes/v4.21.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.19.0/schema.json#/types/kubernetes:core/v1:ResourceRequirements"
"$ref": "/kubernetes/v4.21.0/schema.json#/types/kubernetes:core/v1:ResourceRequirements"
},
"serviceAccount": {
"$ref": "#/types/kubernetes-cert-manager:index:CertManagerServiceAccount"
},
"strategy": {
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:apps/v1:DeploymentStrategy"
"$ref": "/kubernetes/v4.21.0/schema.json#/types/kubernetes:apps/v1:DeploymentStrategy"
},
"timeoutSeconds": {
"type": "integer"
},
"tolerations": {
"items": {
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:Toleration"
"$ref": "/kubernetes/v4.21.0/schema.json#/types/kubernetes:core/v1:Toleration"
},
"type": "array"
}
@@ -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.19.0/schema.json#/types/kubernetes:core/v1:LocalObjectReference"
"$ref": "/kubernetes/v4.21.0/schema.json#/types/kubernetes:core/v1:LocalObjectReference"
},
"type": "array"
},
@@ -659,7 +659,7 @@
"kubernetes-cert-manager:index:CertManagerStartupAPICheck": {
"properties": {
"affinity": {
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:Affinity"
"$ref": "/kubernetes/v4.21.0/schema.json#/types/kubernetes:core/v1:Affinity"
},
"backoffLimit": {
"description": "Job backoffLimit",
@@ -709,10 +709,10 @@
"$ref": "#/types/kubernetes-cert-manager:index:CertManagerStartupAPICheckRBAC"
},
"resources": {
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:ResourceRequirements"
"$ref": "/kubernetes/v4.21.0/schema.json#/types/kubernetes:core/v1:ResourceRequirements"
},
"securityContext": {
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:PodSecurityContext",
"$ref": "/kubernetes/v4.21.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": {
@@ -724,7 +724,7 @@
},
"tolerations": {
"items": {
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:Toleration"
"$ref": "/kubernetes/v4.21.0/schema.json#/types/kubernetes:core/v1:Toleration"
},
"type": "array"
}
@@ -746,10 +746,10 @@
"kubernetes-cert-manager:index:CertManagerWebhook": {
"properties": {
"affinity": {
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:Affinity"
"$ref": "/kubernetes/v4.21.0/schema.json#/types/kubernetes:core/v1:Affinity"
},
"containerSecurityContext": {
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:SecurityContext",
"$ref": "/kubernetes/v4.21.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": {
@@ -774,7 +774,7 @@
"$ref": "#/types/kubernetes-cert-manager:index:CertManagerImage"
},
"livenessProbe": {
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:Probe",
"$ref": "/kubernetes/v4.21.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": {
@@ -808,21 +808,21 @@
"type": "object"
},
"readinessProbe": {
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:Probe",
"$ref": "/kubernetes/v4.21.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.19.0/schema.json#/types/kubernetes:core/v1:ResourceRequirements"
"$ref": "/kubernetes/v4.21.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.19.0/schema.json#/types/kubernetes:core/v1:PodSecurityContext",
"$ref": "/kubernetes/v4.21.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": {
@@ -847,14 +847,14 @@
"type": "string"
},
"strategy": {
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:apps/v1:DeploymentStrategy"
"$ref": "/kubernetes/v4.21.0/schema.json#/types/kubernetes:apps/v1:DeploymentStrategy"
},
"timeoutSeconds": {
"type": "integer"
},
"tolerations": {
"items": {
"$ref": "/kubernetes/v4.19.0/schema.json#/types/kubernetes:core/v1:Toleration"
"$ref": "/kubernetes/v4.21.0/schema.json#/types/kubernetes:core/v1:Toleration"
},
"type": "array"
},
@@ -895,6 +895,7 @@
"go": {
"generateResourceContainerTypes": true,
"importBasePath": "github.com/pulumi/pulumi-kubernetes-cert-manager/sdk/go/kubernetes-cert-manager",
"generateExtraInputTypes": true,
"respectSchemaVersion": true
},
"java": {
@@ -903,10 +904,10 @@
"dependencies": {
"com.google.code.findbugs:jsr305": "3.0.2",
"com.google.code.gson:gson": "2.8.9",
"com.pulumi:pulumi": "0.20.0",
"com.pulumi:kubernetes": "4.19.0"
"com.pulumi:pulumi": "1.0.0",
"com.pulumi:kubernetes": "4.21.0"
},
"gradleNexusPublishPluginVersion": "1.1.0",
"gradleNexusPublishPluginVersion": "2.0.0",
"gradleTest": ""
},
"nodejs": {
@@ -928,4 +929,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion sdk/go.mod
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ go 1.22.4

require (
github.com/blang/semver v3.5.1+incompatible
github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.19.0
github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.21.0
github.com/pulumi/pulumi/sdk/v3 v3.147.0
)

4 changes: 2 additions & 2 deletions sdk/go.sum
View file
Original file line number Diff line number Diff line change
@@ -148,8 +148,8 @@ github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 h1:vkHw5I/plNdTr435
github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231/go.mod h1:murToZ2N9hNJzewjHBgfFdXhZKjY3z5cYC1VXk+lbFE=
github.com/pulumi/esc v0.10.0 h1:jzBKzkLVW0mePeanDRfqSQoCJ5yrkux0jIwAkUxpRKE=
github.com/pulumi/esc v0.10.0/go.mod h1:2Bfa+FWj/xl8CKqRTWbWgDX0SOD4opdQgvYSURTGK2c=
github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.19.0 h1:7AjJpUyW6YHHpZr0bI6Fy1A3/b7ERxq1LAo5mlyNN1Y=
github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.19.0/go.mod h1:ATS+UN8pguMxypQAK+SaPewesU+UN5dpf93PNqVuHzs=
github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.21.0 h1:UedeAwQ3afL/sK0eXl1cKLnqwfu2V+TQhZCVUaNmjJE=
github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.21.0/go.mod h1:RLaX8dqvWIqDV6VjScsc1tJWp1GoZ1IDSyOPIQ/y4ps=
github.com/pulumi/pulumi/sdk/v3 v3.147.0 h1:8ZDZnEsCZa6shw1dwIDUssbYMooYyebhpmx5feuZCqM=
github.com/pulumi/pulumi/sdk/v3 v3.147.0/go.mod h1:+WC9aIDo8fMgd2g0jCHuZU2S/VYNLRAZ3QXt6YVgwaA=
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
Loading

0 comments on commit 2d59472

Please sign in to comment.