Rename root-certificate to brupop-selfsigned-ca #595
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,193 @@ | ||
| --- | ||
|
There was a problem hiding this comment. Was this file autogenerated? I'm not sure where it came from? |
||
| source: deploy/tests/insta_tests.rs | ||
| assertion_line: 30 | ||
| expression: crds | ||
| --- | ||
| apiVersion: apiextensions.k8s.io/v1 | ||
| kind: CustomResourceDefinition | ||
| metadata: | ||
| annotations: | ||
| cert-manager.io/inject-ca-from: brupop-bottlerocket-aws/brupop-selfsigned-ca | ||
| name: bottlerocketshadows.brupop.bottlerocket.aws | ||
| spec: | ||
| conversion: | ||
| strategy: Webhook | ||
| webhook: | ||
| clientConfig: | ||
| service: | ||
| name: brupop-apiserver | ||
| namespace: brupop-bottlerocket-aws | ||
| path: /crdconvert | ||
| port: 443 | ||
| conversionReviewVersions: | ||
| - v2 | ||
| - v1 | ||
| group: brupop.bottlerocket.aws | ||
| names: | ||
| kind: BottlerocketShadow | ||
| plural: bottlerocketshadows | ||
| shortNames: | ||
| - brs | ||
| singular: bottlerocketshadow | ||
| scope: Namespaced | ||
| versions: | ||
| - additionalPrinterColumns: | ||
| - jsonPath: .status.current_state | ||
| name: State | ||
| type: string | ||
| - jsonPath: .status.current_version | ||
| name: Version | ||
| type: string | ||
| - jsonPath: .spec.state | ||
| name: Target State | ||
| type: string | ||
| - jsonPath: .spec.version | ||
| name: Target Version | ||
| type: string | ||
| - jsonPath: .status.crash_count | ||
| name: Crash Count | ||
| type: string | ||
| name: v2 | ||
| schema: | ||
| openAPIV3Schema: | ||
| description: Auto-generated derived type for BottlerocketShadowSpec via `CustomResource` | ||
| properties: | ||
| spec: | ||
| description: The `BottlerocketShadowSpec` can be used to drive a node through the update state machine. A node linearly drives towards the desired state. The brupop controller updates the spec to specify a node's desired state, and the host agent drives state changes forward and updates the `BottlerocketShadowStatus`. | ||
| properties: | ||
| state: | ||
| description: Records the desired state of the `BottlerocketShadow` | ||
| enum: | ||
| - Idle | ||
| - StagedAndPerformedUpdate | ||
| - RebootedIntoUpdate | ||
| - MonitoringUpdate | ||
| - ErrorReset | ||
| type: string | ||
| state_transition_timestamp: | ||
| description: The time at which the most recent state was set as the desired state. | ||
| nullable: true | ||
| type: string | ||
| version: | ||
| description: The desired update version, if any. | ||
| nullable: true | ||
| pattern: ^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$ | ||
| type: string | ||
| required: | ||
| - state | ||
| type: object | ||
| status: | ||
| description: '`BottlerocketShadowStatus` surfaces the current state of a bottlerocket node. The status is updated by the host agent, while the spec is updated by the brupop controller.' | ||
| nullable: true | ||
| properties: | ||
| crash_count: | ||
| format: uint32 | ||
| minimum: 0.0 | ||
| type: integer | ||
| current_state: | ||
| description: BottlerocketShadowState represents a node's state in the update state machine. | ||
| enum: | ||
| - Idle | ||
| - StagedAndPerformedUpdate | ||
| - RebootedIntoUpdate | ||
| - MonitoringUpdate | ||
| - ErrorReset | ||
| type: string | ||
| current_version: | ||
| pattern: ^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$ | ||
| type: string | ||
| state_transition_failure_timestamp: | ||
| nullable: true | ||
| type: string | ||
| target_version: | ||
| pattern: ^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$ | ||
| type: string | ||
| required: | ||
| - crash_count | ||
| - current_state | ||
| - current_version | ||
| - target_version | ||
| type: object | ||
| required: | ||
| - spec | ||
| title: BottlerocketShadow | ||
| type: object | ||
| served: true | ||
| storage: true | ||
| subresources: | ||
| status: {} | ||
| - additionalPrinterColumns: | ||
| - jsonPath: .status.current_state | ||
| name: State | ||
| type: string | ||
| - jsonPath: .status.current_version | ||
| name: Version | ||
| type: string | ||
| - jsonPath: .spec.state | ||
| name: Target State | ||
| type: string | ||
| - jsonPath: .spec.version | ||
| name: Target Version | ||
| type: string | ||
| name: v1 | ||
| schema: | ||
| openAPIV3Schema: | ||
| description: Auto-generated derived type for BottlerocketShadowSpec via `CustomResource` | ||
| properties: | ||
| spec: | ||
| description: The `BottlerocketShadowSpec` can be used to drive a node through the update state machine. A node linearly drives towards the desired state. The brupop controller updates the spec to specify a node's desired state, and the host agent drives state changes forward and updates the `BottlerocketShadowStatus`. | ||
| properties: | ||
| state: | ||
| description: Records the desired state of the `BottlerocketShadow` | ||
| enum: | ||
| - Idle | ||
| - StagedUpdate | ||
| - PerformedUpdate | ||
| - RebootedIntoUpdate | ||
| - MonitoringUpdate | ||
| type: string | ||
| state_transition_timestamp: | ||
| description: The time at which the most recent state was set as the desired state. | ||
| nullable: true | ||
| type: string | ||
| version: | ||
| description: The desired update version, if any. | ||
| nullable: true | ||
| pattern: ^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$ | ||
| type: string | ||
| required: | ||
| - state | ||
| type: object | ||
| status: | ||
| description: '`BottlerocketShadowStatus` surfaces the current state of a bottlerocket node. The status is updated by the host agent, while the spec is updated by the brupop controller.' | ||
| nullable: true | ||
| properties: | ||
| current_state: | ||
| description: BottlerocketShadowState represents a node's state in the update state machine. | ||
| enum: | ||
| - Idle | ||
| - StagedUpdate | ||
| - PerformedUpdate | ||
| - RebootedIntoUpdate | ||
| - MonitoringUpdate | ||
| type: string | ||
| current_version: | ||
| pattern: ^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$ | ||
| type: string | ||
| target_version: | ||
| pattern: ^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$ | ||
| type: string | ||
| required: | ||
| - current_state | ||
| - current_version | ||
| - target_version | ||
| type: object | ||
| required: | ||
| - spec | ||
| title: BottlerocketShadow | ||
| type: object | ||
| served: true | ||
| storage: false | ||
| subresources: | ||
| status: {} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,7 +39,7 @@ pub const PUBLIC_KEY_NAME: &str = "tls.crt"; | |
| pub const PRIVATE_KEY_NAME: &str = "tls.key"; | ||
| pub const TLS_KEY_MOUNT_PATH: &str = "/etc/brupop-tls-keys"; | ||
| // Certificate object name | ||
| pub const ROOT_CERTIFICATE_NAME: &str = "brupop-selfsigned-ca"; | ||
|
There was a problem hiding this comment. I think this is probably safe but I'm digging into how we use cert-manager under the hood to ensure we aren't going to break something else down the line. Do you happen to have links to what led you to this change? There was a problem hiding this comment. I do not unfortunately. I can just attest from what Jack mentions here that this resolved an issue on our end. There was a problem hiding this comment. Since it might help you: I just fixed this bug and set the value to cert-manager.io/inject-ca-from: brupop-bottlerocket-aws/brupop-apiserver-certificate in the CRD |
||
|
|
||
| // Label keys | ||
| pub const LABEL_COMPONENT: &str = brupop_domain!("component"); | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When running
make manifestthis ends up at the end rather than here. We might just move this to the end of the file to avoid it creating a dirty tree when running it, functionally it works the same.