panxiao81/helm-charts-hardened
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade the spire-controller-manager (#896)

Browse Source 
Signed-off-by: Kevin Fox <[email protected]>
This commit is contained in:
kfox1111
2026-07-30 11:53:13 -07:00
committed by GitHub
parent 709d000b9d
commit c0bee5ee15
6 changed files with 178 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/spire-crds/templates/spire.spiffe.io_clusterfederatedtrustdomains.yaml
+25 -15
View File
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:
controller-gen.kubebuilder.io/version: v0.11.1 controller-gen.kubebuilder.io/version: v0.19.0
{{- .Values.annotations | toYaml | nindent 4 }} {{- .Values.annotations | toYaml | nindent 4 }}
creationTimestamp: null creationTimestamp: null
name: clusterfederatedtrustdomains.spire.spiffe.io name: clusterfederatedtrustdomains.spire.spiffe.io
@@ -30,14 +30,19 @@ spec:
API API
properties: properties:
apiVersion: apiVersion:
description: 'APIVersion defines the versioned schema of this representation description: |-
of an object. Servers should convert recognized schemas to the latest APIVersion defines the versioned schema of this representation of an object.
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' 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
type: string type: string
kind: kind:
description: 'Kind is a string value representing the REST resource this description: |-
object represents. Servers may infer this from the endpoint the client Kind is a string value representing the REST resource this object represents.
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' 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
type: string type: string
metadata: metadata:
type: object type: object
@@ -49,8 +54,9 @@ spec:
description: BundleEndpointProfile is the profile for the bundle endpoint. description: BundleEndpointProfile is the profile for the bundle endpoint.
properties: properties:
endpointSPIFFEID: endpointSPIFFEID:
description: EndpointSPIFFEID is the SPIFFE ID of the bundle endpoint. description: |-
It is required for the "https_spiffe" profile. EndpointSPIFFEID is the SPIFFE ID of the bundle endpoint. It is
required for the "https_spiffe" profile.
type: string type: string
type: type:
description: Type is the type of the bundle endpoint profile. description: Type is the type of the bundle endpoint profile.
@@ -62,11 +68,12 @@ spec:
- type - type
type: object type: object
bundleEndpointURL: bundleEndpointURL:
description: BundleEndpointURL is the URL of the bundle endpoint. description: |-
It must be an HTTPS URL and cannot contain userinfo (i.e. username/password). BundleEndpointURL is the URL of the bundle endpoint. It must be an
HTTPS URL and cannot contain userinfo (i.e. username/password).
type: string type: string
className: className:
description: Set the class of controller to handle this object. description: Set which Controller Class will act on this object
type: string type: string
trustDomain: trustDomain:
description: TrustDomain is the name of the trust domain to federate description: TrustDomain is the name of the trust domain to federate
@@ -74,9 +81,9 @@ spec:
pattern: '[a-z0-9._-]{1,255}' pattern: '[a-z0-9._-]{1,255}'
type: string type: string
trustDomainBundle: trustDomainBundle:
description: TrustDomainBundle is the contents of the bundle for the description: |-
referenced trust domain. This field is optional when the resource TrustDomainBundle is the contents of the bundle for the referenced trust
is created. domain. This field is optional when the resource is created.
type: string type: string
required: required:
- bundleEndpointProfile - bundleEndpointProfile
@@ -87,6 +94,9 @@ spec:
description: ClusterFederatedTrustDomainStatus defines the observed state description: ClusterFederatedTrustDomainStatus defines the observed state
of ClusterFederatedTrustDomain of ClusterFederatedTrustDomain
type: object type: object
required:
- metadata
- spec
type: object type: object
served: true served: true
storage: true storage: true
charts/spire-crds/templates/spire.spiffe.io_clusterspiffeids.yaml
+134 -115
View File
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:
controller-gen.kubebuilder.io/version: v0.11.1 controller-gen.kubebuilder.io/version: v0.19.0
{{- .Values.annotations | toYaml | nindent 4 }} {{- .Values.annotations | toYaml | nindent 4 }}
creationTimestamp: null creationTimestamp: null
name: clusterspiffeids.spire.spiffe.io name: clusterspiffeids.spire.spiffe.io
@@ -22,14 +22,19 @@ spec:
description: ClusterSPIFFEID is the Schema for the clusterspiffeids API description: ClusterSPIFFEID is the Schema for the clusterspiffeids API
properties: properties:
apiVersion: apiVersion:
description: 'APIVersion defines the versioned schema of this representation description: |-
of an object. Servers should convert recognized schemas to the latest APIVersion defines the versioned schema of this representation of an object.
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' 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
type: string type: string
kind: kind:
description: 'Kind is a string value representing the REST resource this description: |-
object represents. Servers may infer this from the endpoint the client Kind is a string value representing the REST resource this object represents.
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' 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
type: string type: string
metadata: metadata:
type: object type: object
@@ -37,24 +42,24 @@ spec:
description: ClusterSPIFFEIDSpec defines the desired state of ClusterSPIFFEID description: ClusterSPIFFEIDSpec defines the desired state of ClusterSPIFFEID
properties: properties:
admin: admin:
description: Admin indicates whether or not the SVID can be used to description: |-
access the SPIRE administrative APIs. Extra care should be taken Admin indicates whether or not the SVID can be used to access the SPIRE
to only apply this SPIFFE ID to admin workloads. administrative APIs. Extra care should be taken to only apply this
SPIFFE ID to admin workloads.
type: boolean type: boolean
autoPopulateDNSNames: autoPopulateDNSNames:
description: AutoPopulateDNSNames indicates whether or not to auto description: AutoPopulateDNSNames indicates whether or not to auto
populate service DNS names. populate service DNS names.
type: boolean type: boolean
fallback: className:
description: |- description: Set which Controller Class will act on this object
Apply this ID only if there are no other matching non fallback type: string
ClusterSPIFFEIDs
type: boolean
dnsNameTemplates: dnsNameTemplates:
description: DNSNameTemplate represents templates for extra DNS names description: |-
that are applicable to SVIDs minted for this ClusterSPIFFEID. The DNSNameTemplate represents templates for extra DNS names that are
node and pod spec are made available to the template under .NodeSpec, applicable to SVIDs minted for this ClusterSPIFFEID.
.PodSpec respectively. The node and pod spec are made available to the template under
.NodeSpec, .PodSpec respectively.
items: items:
type: string type: string
type: array type: array
@@ -62,12 +67,14 @@ spec:
description: Downstream indicates that the entry describes a downstream description: Downstream indicates that the entry describes a downstream
SPIRE server. SPIRE server.
type: boolean type: boolean
className: fallback:
description: Set the class of controller to handle this object. description: Apply this ID only if there are no other matching non
type: string fallback ClusterSPIFFEIDs.
type: boolean
federatesWith: federatesWith:
description: FederatesWith is a list of trust domain names that workloads description: |-
that obtain this SPIFFE ID will federate with. FederatesWith is a list of trust domain names that workloads that
obtain this SPIFFE ID will federate with.
items: items:
type: string type: string
type: array type: array
@@ -75,118 +82,125 @@ spec:
description: Set the entry hint description: Set the entry hint
type: string type: string
jwtTtl: jwtTtl:
description: JWTTTL indicates an upper-bound time-to-live for JWT description: |-
SVIDs minted for this ClusterSPIFFEID. JWTTTL indicates an upper-bound time-to-live for JWT SVIDs minted for this
ClusterSPIFFEID.
type: string type: string
namespaceSelector: namespaceSelector:
description: NamespaceSelector selects the namespaces that are targeted description: |-
by this CRD. NamespaceSelector selects the namespaces that are targeted by this
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
The requirements are ANDed.
items:
description: A label selector requirement is a selector that
contains values, a key, and an operator that relates the key
and values.
properties:
key:
description: key is the label key that the selector applies
to.
type: string
operator:
description: operator represents a key's relationship to
a set of values. Valid operators are In, NotIn, Exists
and DoesNotExist.
type: string
values:
description: values is an array of string values. If the
operator is In or NotIn, the values array must be non-empty.
If the operator is Exists or DoesNotExist, the values
array must be empty. This array is replaced during a strategic
merge patch.
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchLabels:
additionalProperties:
type: string
description: matchLabels is a map of {key,value} pairs. A single
{key,value} in the matchLabels map is equivalent to an element
of matchExpressions, whose key field is "key", the operator
is "In", and the values array contains only "value". The requirements
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
podSelector:
description: PodSelector selects the pods that are targeted by this
CRD. CRD.
properties: properties:
matchExpressions: matchExpressions:
description: matchExpressions is a list of label selector requirements. description: matchExpressions is a list of label selector requirements.
The requirements are ANDed. The requirements are ANDed.
items: items:
description: A label selector requirement is a selector that description: |-
contains values, a key, and an operator that relates the key A label selector requirement is a selector that contains values, a key, and an operator that
and values. relates the key and values.
properties: properties:
key: key:
description: key is the label key that the selector applies description: key is the label key that the selector applies
to. to.
type: string type: string
operator: operator:
description: operator represents a key's relationship to description: |-
a set of values. Valid operators are In, NotIn, Exists operator represents a key's relationship to a set of values.
and DoesNotExist. Valid operators are In, NotIn, Exists and DoesNotExist.
type: string type: string
values: values:
description: values is an array of string values. If the description: |-
operator is In or NotIn, the values array must be non-empty. values is an array of string values. If the operator is In or NotIn,
If the operator is Exists or DoesNotExist, the values the values array must be non-empty. If the operator is Exists or DoesNotExist,
array must be empty. This array is replaced during a strategic the values array must be empty. This array is replaced during a strategic
merge patch. merge patch.
items: items:
type: string type: string
type: array type: array
x-kubernetes-list-type: atomic
required: required:
- key - key
- operator - operator
type: object type: object
type: array type: array
x-kubernetes-list-type: atomic
matchLabels: matchLabels:
additionalProperties: additionalProperties:
type: string type: string
description: matchLabels is a map of {key,value} pairs. A single description: |-
{key,value} in the matchLabels map is equivalent to an element matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
of matchExpressions, whose key field is "key", the operator map is equivalent to an element of matchExpressions, whose key field is "key", the
is "In", and the values array contains only "value". The requirements operator is "In", and the values array contains only "value". The requirements are ANDed.
are ANDed. type: object
type: object
x-kubernetes-map-type: atomic
podSelector:
description: |-
PodSelector selects the pods that are targeted by this
CRD.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
The requirements are ANDed.
items:
description: |-
A label selector requirement is a selector that contains values, a key, and an operator that
relates the key and values.
properties:
key:
description: key is the label key that the selector applies
to.
type: string
operator:
description: |-
operator represents a key's relationship to a set of values.
Valid operators are In, NotIn, Exists and DoesNotExist.
type: string
values:
description: |-
values is an array of string values. If the operator is In or NotIn,
the values array must be non-empty. If the operator is Exists or DoesNotExist,
the values array must be empty. This array is replaced during a strategic
merge patch.
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
description: |-
matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
map is equivalent to an element of matchExpressions, whose key field is "key", the
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic x-kubernetes-map-type: atomic
spiffeIDTemplate: spiffeIDTemplate:
description: SPIFFEID is the SPIFFE ID template. The node and pod description: |-
spec are made available to the template under .NodeSpec, .PodSpec SPIFFEID is the SPIFFE ID template. The node and pod spec are made
respectively. available to the template under .NodeSpec, .PodSpec respectively.
type: string type: string
ttl: ttl:
description: TTL indicates an upper-bound time-to-live for X509 SVIDs description: |-
minted for this ClusterSPIFFEID. If unset, a default will be chosen. TTL indicates an upper-bound time-to-live for X509 SVIDs minted for this
ClusterSPIFFEID. If unset, a default will be chosen.
type: string type: string
workloadSelectorTemplates: workloadSelectorTemplates:
description: WorkloadSelectorTemplates are templates to produce arbitrary description: |-
workload selectors that apply to a given workload before it will WorkloadSelectorTemplates are templates to produce arbitrary workload
receive this SPIFFE ID. The rendered value is interpreted by SPIRE selectors that apply to a given workload before it will receive this
and are of the form type:value, where the value may, and often does, SPIFFE ID. The rendered value is interpreted by SPIRE and are of the
contain semicolons, .e.g., k8s:container-image:docker/hello-world form type:value, where the value may, and often does, contain
The node and pod spec are made available to the template under .NodeSpec, semicolons, .e.g., k8s:container-image:docker/hello-world
.PodSpec respectively. The node and pod spec are made available to the template under
.NodeSpec, .PodSpec respectively.
items: items:
type: string type: string
type: array type: array
@@ -200,21 +214,22 @@ spec:
description: Stats produced by the last entry reconciliation run description: Stats produced by the last entry reconciliation run
properties: properties:
entriesMasked: entriesMasked:
description: How many entries were masked by entries for other description: |-
ClusterSPIFFEIDs. This happens when one or more ClusterSPIFFEIDs How many entries were masked by entries for other ClusterSPIFFEIDs.
produce an entry for the same pod with the same set of workload This happens when one or more ClusterSPIFFEIDs produce an entry for
selectors. the same pod with the same set of workload selectors.
type: integer type: integer
entriesToSet: entriesToSet:
description: How many entries are to be set for this ClusterSPIFFEID. description: |-
In nominal conditions, this should reflect the number of pods How many entries are to be set for this ClusterSPIFFEID. In nominal
selected, but not always if there were problems encountered conditions, this should reflect the number of pods selected, but not
rendering an entry for the pod (RenderFailures) or entries are always if there were problems encountered rendering an entry for the pod
masked (EntriesMasked). (RenderFailures) or entries are masked (EntriesMasked).
type: integer type: integer
entryFailures: entryFailures:
description: How many entries were unable to be set due to failures description: |-
to create or update the entries via the SPIRE Server API. How many entries were unable to be set due to failures to create or
update the entries via the SPIRE Server API.
type: integer type: integer
namespacesIgnored: namespacesIgnored:
description: How many (selected) namespaces were ignored (based description: How many (selected) namespaces were ignored (based
@@ -224,16 +239,20 @@ spec:
description: How many namespaces were selected. description: How many namespaces were selected.
type: integer type: integer
podEntryRenderFailures: podEntryRenderFailures:
description: How many failures were encountered rendering an entry description: |-
selected pods. This could be due to either a bad template in How many failures were encountered rendering an entry selected pods.
the ClusterSPIFFEID or Pod metadata that when applied to the This could be due to either a bad template in the ClusterSPIFFEID or
template did not produce valid entry values. Pod metadata that when applied to the template did not produce valid
entry values.
type: integer type: integer
podsSelected: podsSelected:
description: How many pods were selected out of the namespaces. description: How many pods were selected out of the namespaces.
type: integer type: integer
type: object type: object
type: object type: object
required:
- metadata
- spec
type: object type: object
served: true served: true
storage: true storage: true
charts/spire-crds/templates/spire.spiffe.io_clusterstaticentries.yaml
+16 -8
View File
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:
controller-gen.kubebuilder.io/version: v0.11.1 controller-gen.kubebuilder.io/version: v0.19.0
{{- .Values.annotations | toYaml | nindent 4 }} {{- .Values.annotations | toYaml | nindent 4 }}
creationTimestamp: null creationTimestamp: null
name: clusterstaticentries.spire.spiffe.io name: clusterstaticentries.spire.spiffe.io
@@ -23,14 +23,19 @@ spec:
API API
properties: properties:
apiVersion: apiVersion:
description: 'APIVersion defines the versioned schema of this representation description: |-
of an object. Servers should convert recognized schemas to the latest APIVersion defines the versioned schema of this representation of an object.
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' 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
type: string type: string
kind: kind:
description: 'Kind is a string value representing the REST resource this description: |-
object represents. Servers may infer this from the endpoint the client Kind is a string value representing the REST resource this object represents.
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' 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
type: string type: string
metadata: metadata:
type: object type: object
@@ -40,7 +45,7 @@ spec:
admin: admin:
type: boolean type: boolean
className: className:
description: Set the class of controller to handle this object. description: Set which Controller Class will act on this object
type: string type: string
dnsNames: dnsNames:
items: items:
@@ -90,6 +95,9 @@ spec:
- rendered - rendered
- set - set
type: object type: object
required:
- metadata
- spec
type: object type: object
served: true served: true
storage: true storage: true
charts/spire/README.md
+1
View File
@@ -81,6 +81,7 @@ We only support upgrading one major/minor version at a time. Version skipping is
### 0.30.X ### 0.30.X
- Upgrade the spire-crds chart first
- The OIDC discovery issuer is now set automatically. We do not anticipate any negative impact; however, please verify your OIDC provider's integration with other services during your upgrade testing. - The OIDC discovery issuer is now set automatically. We do not anticipate any negative impact; however, please verify your OIDC provider's integration with other services during your upgrade testing.
- The x509POP plugin in spiffe mode has had its defaults changed. It allows easier and more secure setups. If using and upgrading, please review the settings. - The x509POP plugin in spiffe mode has had its defaults changed. It allows easier and more secure setups. If using and upgrading, please review the settings.
- To add the spike entries, you now must also specify spire-server.spike.enabled=true. - To add the spike entries, you now must also specify spire-server.spike.enabled=true.
charts/spire/charts/spire-server/README.md
+1 -1
View File
@@ -325,7 +325,7 @@ In order to run Tornjak with simple HTTP Connection only, make sure you don't cr
| `controllerManager.image.registry` | The OCI registry to pull the image from | `ghcr.io` | | `controllerManager.image.registry` | The OCI registry to pull the image from | `ghcr.io` |
| `controllerManager.image.repository` | The repository within the registry | `spiffe/spire-controller-manager` | | `controllerManager.image.repository` | The repository within the registry | `spiffe/spire-controller-manager` |
| `controllerManager.image.pullPolicy` | The image pull policy | `IfNotPresent` | | `controllerManager.image.pullPolicy` | The image pull policy | `IfNotPresent` |
| `controllerManager.image.tag` | Overrides the image tag whose default is the chart appVersion | `0.6.6` | | `controllerManager.image.tag` | Overrides the image tag whose default is the chart appVersion | `0.7.0` |
| `controllerManager.resources` | Resource requests and limits for controller manager | `{}` | | `controllerManager.resources` | Resource requests and limits for controller manager | `{}` |
| `controllerManager.securityContext` | Security context | `{}` | | `controllerManager.securityContext` | Security context | `{}` |
| `controllerManager.service.type` | Service type for controller manager | `ClusterIP` | | `controllerManager.service.type` | Service type for controller manager | `ClusterIP` |
charts/spire/charts/spire-server/values.yaml
+1 -1
View File
@@ -692,7 +692,7 @@ controllerManager:
registry: ghcr.io registry: ghcr.io
repository: spiffe/spire-controller-manager repository: spiffe/spire-controller-manager
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
tag: "0.6.6" tag: "0.7.0"
## @param controllerManager.resources [object] Resource requests and limits for controller manager ## @param controllerManager.resources [object] Resource requests and limits for controller manager
resources: {} resources: {}