Skip to content

Commit f94a115

Browse files
author
Nick Perry
committed
Merge branch 'main' into feature-nameconstraints
2 parents 3a78b1d + d5d1780 commit f94a115

15 files changed

+284
-301
lines changed

‎.github/workflows/on-safe-to-test-label.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,21 @@ jobs:
3232
run: |
3333
AWS_REGION=us-east-1
3434
VPC_ID=$(aws ec2 describe-vpcs --filters 'Name=tag-key,Values=GithubActionsTesting' --query 'Vpcs[0].VpcId' --output text)
35-
SUBNET_ID=$(aws ec2 describe-subnets --filters "Name=vpc-id,Values=$VPC_ID" "Name=tag-key,Values=GithubActionsTesting" --query 'Subnets[0].SubnetId' --output text)
3635
SG_ID=$(aws ec2 describe-security-groups --filters "Name=vpc-id,Values=$VPC_ID" "Name=tag-key,Values=GithubActionsTesting" --query 'SecurityGroups[0].GroupId' --output text)
3736
AMI=$(aws ssm get-parameter --name /aws/service/ami-amazon-linux-latest/al2023-ami-kernel-default-${{ inputs.architecture }} --query 'Parameter.Value' --output text)
3837
echo AWS_REGION=$AWS_REGION >> $GITHUB_ENV
39-
echo SUBNET_ID=$SUBNET_ID >> $GITHUB_ENV
38+
echo VPC_ID=$VPC_ID >> $GITHUB_ENV
4039
echo SG_ID=$SG_ID >> $GITHUB_ENV
4140
echo AMI=$AMI >> $GITHUB_ENV
4241
- name: Start EC2 runner
4342
id: start-ec2-runner
44-
uses: aws-pca-k8s-plugin-ops-admin/ec2-github-runner@0444f5f46462bcf8d98932bc807d2f51c4945b58
43+
uses: aws-pca-k8s-plugin-ops-admin/ec2-github-runner@001b8975c07ebdbc838650b9ff7635735f915c5f
4544
with:
4645
mode: start
4746
github-token: GithubToken-test-us-east-1
4847
ec2-image-id: ${{ env.AMI }}
4948
ec2-instance-type: ${{ env.EC2_INSTANCE_TYPE }}
50-
subnet-id: ${{ env.SUBNET_ID }}
49+
vpc-id: ${{ env.VPC_ID }}
5150
security-group-id: ${{ env.SG_ID }}
5251
iam-role-name: K8sPluginInstanceProfile-test-us-east-1
5352
ec2-launch-template: GithubRunnerLaunchTemplate-test-us-east-1
@@ -244,7 +243,7 @@ jobs:
244243
AWS_REGION=us-east-1
245244
echo AWS_REGION=$AWS_REGION >> $GITHUB_ENV
246245
- name: Stop EC2 runner
247-
uses: aws-pca-k8s-plugin-ops-admin/ec2-github-runner@0444f5f46462bcf8d98932bc807d2f51c4945b58
246+
uses: aws-pca-k8s-plugin-ops-admin/ec2-github-runner@001b8975c07ebdbc838650b9ff7635735f915c5f
248247
with:
249248
mode: stop
250249
github-token: GithubToken-test-us-east-1

‎charts/aws-pca-issuer/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ apiVersion: v2
22
name: aws-privateca-issuer
33
description: An addon for cert-manager to sign certificates using AWS PCA
44
type: application
5-
version: v1.7.0
6-
appVersion: v1.7.0
5+
version: v1.7.1
6+
appVersion: v1.7.1

‎charts/aws-pca-issuer/crds/awspca.cert-manager.io_awspcaclusterissuers.yaml‎

Lines changed: 48 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.4.1
8-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.17.3
97
name: awspcaclusterissuers.awspca.cert-manager.io
108
spec:
119
group: awspca.cert-manager.io
@@ -23,14 +21,19 @@ spec:
2321
API
2422
properties:
2523
apiVersion:
26-
description: 'APIVersion defines the versioned schema of this representation
27-
of an object. Servers should convert recognized schemas to the latest
28-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
24+
description: |-
25+
APIVersion defines the versioned schema of this representation of an object.
26+
Servers should convert recognized schemas to the latest internal value, and
27+
may reject unrecognized values.
28+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2929
type: string
3030
kind:
31-
description: 'Kind is a string value representing the REST resource this
32-
object represents. Servers may infer this from the endpoint the client
33-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
31+
description: |-
32+
Kind is a string value representing the REST resource this object represents.
33+
Servers may infer this from the endpoint the client submits requests to.
34+
Cannot be updated.
35+
In CamelCase.
36+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3437
type: string
3538
metadata:
3639
type: object
@@ -56,8 +59,13 @@ spec:
5659
a valid secret key.
5760
type: string
5861
name:
59-
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
60-
TODO: Add other useful fields. apiVersion, kind, uid?'
62+
default: ""
63+
description: |-
64+
Name of the referent.
65+
This field is effectively required, but due to backwards compatibility is
66+
allowed to be empty. Instances of this type with an empty value here are
67+
almost certainly wrong.
68+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
6169
type: string
6270
optional:
6371
description: Specify whether the Secret or its key must be
@@ -66,12 +74,13 @@ spec:
6674
required:
6775
- key
6876
type: object
77+
x-kubernetes-map-type: atomic
6978
name:
70-
description: Name is unique within a namespace to reference a
79+
description: name is unique within a namespace to reference a
7180
secret resource.
7281
type: string
7382
namespace:
74-
description: Namespace defines the space within which the secret
83+
description: namespace defines the space within which the secret
7584
name must be unique.
7685
type: string
7786
secretAccessKeySelector:
@@ -83,8 +92,13 @@ spec:
8392
a valid secret key.
8493
type: string
8594
name:
86-
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
87-
TODO: Add other useful fields. apiVersion, kind, uid?'
95+
default: ""
96+
description: |-
97+
Name of the referent.
98+
This field is effectively required, but due to backwards compatibility is
99+
allowed to be empty. Instances of this type with an empty value here are
100+
almost certainly wrong.
101+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
88102
type: string
89103
optional:
90104
description: Specify whether the Secret or its key must be
@@ -93,51 +107,44 @@ spec:
93107
required:
94108
- key
95109
type: object
110+
x-kubernetes-map-type: atomic
96111
type: object
112+
x-kubernetes-map-type: atomic
97113
type: object
98114
status:
99115
description: AWSPCAIssuerStatus defines the observed state of AWSPCAIssuer
100116
properties:
101117
conditions:
102118
items:
103-
description: "Condition contains details for one aspect of the current
104-
state of this API Resource. --- This struct is intended for direct
105-
use as an array at the field path .status.conditions. For example,
106-
type FooStatus struct{ // Represents the observations of a
107-
foo's current state. // Known .status.conditions.type are:
108-
\"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type
109-
\ // +patchStrategy=merge // +listType=map // +listMapKey=type
110-
\ Conditions []metav1.Condition `json:\"conditions,omitempty\"
111-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`
112-
\n // other fields }"
119+
description: Condition contains details for one aspect of the current
120+
state of this API Resource.
113121
properties:
114122
lastTransitionTime:
115-
description: lastTransitionTime is the last time the condition
116-
transitioned from one status to another. This should be when
117-
the underlying condition changed. If that is not known, then
118-
using the time when the API field changed is acceptable.
123+
description: |-
124+
lastTransitionTime is the last time the condition transitioned from one status to another.
125+
This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
119126
format: date-time
120127
type: string
121128
message:
122-
description: message is a human readable message indicating
123-
details about the transition. This may be an empty string.
129+
description: |-
130+
message is a human readable message indicating details about the transition.
131+
This may be an empty string.
124132
maxLength: 32768
125133
type: string
126134
observedGeneration:
127-
description: observedGeneration represents the .metadata.generation
128-
that the condition was set based upon. For instance, if .metadata.generation
129-
is currently 12, but the .status.conditions[x].observedGeneration
130-
is 9, the condition is out of date with respect to the current
131-
state of the instance.
135+
description: |-
136+
observedGeneration represents the .metadata.generation that the condition was set based upon.
137+
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
138+
with respect to the current state of the instance.
132139
format: int64
133140
minimum: 0
134141
type: integer
135142
reason:
136-
description: reason contains a programmatic identifier indicating
137-
the reason for the condition's last transition. Producers
138-
of specific condition types may define expected values and
139-
meanings for this field, and whether the values are considered
140-
a guaranteed API. The value should be a CamelCase string.
143+
description: |-
144+
reason contains a programmatic identifier indicating the reason for the condition's last transition.
145+
Producers of specific condition types may define expected values and meanings for this field,
146+
and whether the values are considered a guaranteed API.
147+
The value should be a CamelCase string.
141148
This field may not be empty.
142149
maxLength: 1024
143150
minLength: 1
@@ -152,10 +159,6 @@ spec:
152159
type: string
153160
type:
154161
description: type of condition in CamelCase or in foo.example.com/CamelCase.
155-
--- Many .condition.type values are consistent across resources
156-
like Available, but because arbitrary conditions can be useful
157-
(see .node.status.conditions), the ability to deconflict is
158-
important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
159162
maxLength: 316
160163
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])$
161164
type: string
@@ -173,9 +176,3 @@ spec:
173176
storage: true
174177
subresources:
175178
status: {}
176-
status:
177-
acceptedNames:
178-
kind: ""
179-
plural: ""
180-
conditions: []
181-
storedVersions: []

0 commit comments

Comments
 (0)