Skip to content

Commit

Permalink
Fix build (#782)
Browse files Browse the repository at this point in the history
I kicked off some updates (via
#755) for
some k8s dependencies last month:
* #769
* #768
* #767

Tests failed on those due to some of our binaries installed via `make`
being out of sync with the bumps.

As it turns out we also weren't requiring any status checks, so those
PRs merged with failing tests.

This PR fixes the build by bumping corresponding dependencies in our
Makefile and regenerating types.

I've also added required checks to the repo: "Build", "E2E Tests", and
"Unit Tests".

Fixes #778
  • Loading branch information
blampe authored Jan 2, 2025
1 parent 482cb65 commit fa4e2b5
Show file tree
Hide file tree
Showing 34 changed files with 5,848 additions and 4,327 deletions.
21 changes: 4 additions & 17 deletions deploy/crds/auto.pulumi.com_updates.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.5
name: updates.auto.pulumi.com
spec:
group: auto.pulumi.com
Expand Down Expand Up @@ -125,16 +125,8 @@ spec:
Represents the observations of an update's current state.
Known .status.conditions.type are: "Complete", "Failed", and "Progressing"
items:
description: "Condition contains details for one aspect of the current
state of this API Resource.\n---\nThis struct is intended for
direct use as an array at the field path .status.conditions. For
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
observations of a foo's current state.\n\t // Known .status.conditions.type
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
\ // other fields\n\t}"
description: Condition contains details for one aspect of the current
state of this API Resource.
properties:
lastTransitionTime:
description: |-
Expand Down Expand Up @@ -175,12 +167,7 @@ spec:
- Unknown
type: string
type:
description: |-
type of condition in CamelCase or in foo.example.com/CamelCase.
---
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
useful (see .node.status.conditions), the ability to deconflict is important.
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
description: type of condition in CamelCase or in foo.example.com/CamelCase.
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
Expand Down
676 changes: 378 additions & 298 deletions deploy/crds/auto.pulumi.com_workspaces.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion deploy/crds/pulumi.com_programs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.5
name: programs.pulumi.com
spec:
group: pulumi.com
Expand Down
1,509 changes: 812 additions & 697 deletions deploy/crds/pulumi.com_stacks.yaml

Large diffs are not rendered by default.

21 changes: 4 additions & 17 deletions deploy/helm/pulumi-operator/crds/auto.pulumi.com_updates.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.5
name: updates.auto.pulumi.com
spec:
group: auto.pulumi.com
Expand Down Expand Up @@ -125,16 +125,8 @@ spec:
Represents the observations of an update's current state.
Known .status.conditions.type are: "Complete", "Failed", and "Progressing"
items:
description: "Condition contains details for one aspect of the current
state of this API Resource.\n---\nThis struct is intended for
direct use as an array at the field path .status.conditions. For
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
observations of a foo's current state.\n\t // Known .status.conditions.type
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
\ // other fields\n\t}"
description: Condition contains details for one aspect of the current
state of this API Resource.
properties:
lastTransitionTime:
description: |-
Expand Down Expand Up @@ -175,12 +167,7 @@ spec:
- Unknown
type: string
type:
description: |-
type of condition in CamelCase or in foo.example.com/CamelCase.
---
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
useful (see .node.status.conditions), the ability to deconflict is important.
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
description: type of condition in CamelCase or in foo.example.com/CamelCase.
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
Expand Down
Loading

0 comments on commit fa4e2b5

Please sign in to comment.