Skip to content

Commit 50a7999

Browse files
rexnpChinmay Gadgil
rexnp
authored and
Chinmay Gadgil
committed
Fixes for v1.4.1 patch release
reverts default envoy image version to 1.16 (#494) Used EKS-D minimal non root as the base image instead of amazonlinux:2 (#501) Co-authored-by: Chinmay Gadgil <[email protected]> Use root image of minimal EKD-D to read service account token (#502) Fix for failing UT Updating unit-test.yml file to fix kubebuilder issue Co-authored-by: Chinmay Gadgil <[email protected]> Remove field length constraints from query parameter exact match criteria (#487) Updated Chart minor version Updated CRD field constraints for queryparameters Co-authored-by: Chinmay Gadgil <[email protected]> HTTPQueryParam CRD Description update CRD QueryParameter description update Update helm to use v1.4.1 of the appmesh-controller helm update
1 parent 33bda5c commit 50a7999

File tree

11 files changed

+21
-42
lines changed

11 files changed

+21
-42
lines changed

‎.github/workflows/unit-test.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ jobs:
2121
run: |
2222
arch=$(go env GOARCH)
2323
os=$(go env GOOS)
24-
curl -L https://go.kubebuilder.io/dl/2.3.1/${os}/${arch} | tar -xz -C /tmp/
25-
sudo mv /tmp/kubebuilder_2.3.1_${os}_${arch} /usr/local/kubebuilder
24+
version="2.3.1"
25+
curl -L https://github.com/kubernetes-sigs/kubebuilder/releases/download/v${version}/kubebuilder_${version}_${os}_${arch}.tar.gz | tar -xz -C /tmp/
26+
sudo mv /tmp/kubebuilder_${version}_${os}_${arch} /usr/local/kubebuilder
2627
export PATH=$PATH:/usr/local/kubebuilder/bin
2728
- name: checkout code
2829
uses: actions/checkout@v2

‎Dockerfile‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@ RUN GIT_VERSION=$(git describe --tags --dirty --always) && \
1717
-ldflags="-X ${VERSION_PKG}.GitVersion=${GIT_VERSION} -X ${VERSION_PKG}.GitCommit=${GIT_COMMIT} -X ${VERSION_PKG}.BuildDate=${BUILD_DATE}" -a -o controller main.go
1818

1919
# Build the container image
20-
FROM amazonlinux:2
21-
RUN yum update -y && \
22-
yum install -y ca-certificates && \
23-
yum clean all && \
24-
rm -rf /var/cache/yum
20+
FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base:2021-08-22-1629654770
2521

2622
WORKDIR /
2723
COPY --from=builder /workspace/controller .

‎apis/appmesh/v1beta2/types.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,14 +165,12 @@ type HTTPPathMatch struct {
165165
}
166166
type HTTPQueryParameters struct {
167167
Name *string `json:"name"`
168-
// The HeaderMatchMethod object.
168+
// The HTTPQueryMatchMethod object.
169169
// +optional
170170
Match *QueryMatchMethod `json:"match,omitempty"`
171171
}
172172

173173
type QueryMatchMethod struct {
174-
// +kubebuilder:validation:MinLength=1
175-
// +kubebuilder:validation:MaxLength=255
176174
// +optional
177175
Exact *string `json:"exact,omitempty"`
178176
}

‎config/crd/bases/appmesh.k8s.aws_gatewayroutes.yaml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -410,11 +410,9 @@ spec:
410410
items:
411411
properties:
412412
match:
413-
description: The HeaderMatchMethod object.
413+
description: The HTTPQueryMatchMethod object.
414414
properties:
415415
exact:
416-
maxLength: 255
417-
minLength: 1
418416
type: string
419417
type: object
420418
name:
@@ -634,11 +632,9 @@ spec:
634632
items:
635633
properties:
636634
match:
637-
description: The HeaderMatchMethod object.
635+
description: The HTTPQueryMatchMethod object.
638636
properties:
639637
exact:
640-
maxLength: 255
641-
minLength: 1
642638
type: string
643639
type: object
644640
name:

‎config/crd/bases/appmesh.k8s.aws_virtualrouters.yaml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -509,11 +509,9 @@ spec:
509509
items:
510510
properties:
511511
match:
512-
description: The HeaderMatchMethod object.
512+
description: The HTTPQueryMatchMethod object.
513513
properties:
514514
exact:
515-
maxLength: 255
516-
minLength: 1
517515
type: string
518516
type: object
519517
name:
@@ -787,11 +785,9 @@ spec:
787785
items:
788786
properties:
789787
match:
790-
description: The HeaderMatchMethod object.
788+
description: The HTTPQueryMatchMethod object.
791789
properties:
792790
exact:
793-
maxLength: 255
794-
minLength: 1
795791
type: string
796792
type: object
797793
name:

‎config/helm/appmesh-controller/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v1
22
name: appmesh-controller
33
description: App Mesh controller Helm chart for Kubernetes
4-
version: 1.4.0
5-
appVersion: 1.4.0
4+
version: 1.4.1
5+
appVersion: 1.4.1
66
home: https://github.com/aws/eks-charts
77
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
88
sources:

‎config/helm/appmesh-controller/crds/crds.yaml‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -346,11 +346,9 @@ spec:
346346
items:
347347
properties:
348348
match:
349-
description: The HeaderMatchMethod object.
349+
description: The HTTPQueryMatchMethod object.
350350
properties:
351351
exact:
352-
maxLength: 255
353-
minLength: 1
354352
type: string
355353
type: object
356354
name:
@@ -540,11 +538,9 @@ spec:
540538
items:
541539
properties:
542540
match:
543-
description: The HeaderMatchMethod object.
541+
description: The HTTPQueryMatchMethod object.
544542
properties:
545543
exact:
546-
maxLength: 255
547-
minLength: 1
548544
type: string
549545
type: object
550546
name:
@@ -2701,11 +2697,9 @@ spec:
27012697
items:
27022698
properties:
27032699
match:
2704-
description: The HeaderMatchMethod object.
2700+
description: The HTTPQueryMatchMethod object.
27052701
properties:
27062702
exact:
2707-
maxLength: 255
2708-
minLength: 1
27092703
type: string
27102704
type: object
27112705
name:
@@ -2953,11 +2947,9 @@ spec:
29532947
items:
29542948
properties:
29552949
match:
2956-
description: The HeaderMatchMethod object.
2950+
description: The HTTPQueryMatchMethod object.
29572951
properties:
29582952
exact:
2959-
maxLength: 255
2960-
minLength: 1
29612953
type: string
29622954
type: object
29632955
name:

‎config/helm/appmesh-controller/test.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ preview: false
99

1010
image:
1111
repository: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/appmesh-controller
12-
tag: v1.4.0
12+
tag: v1.4.1
1313
pullPolicy: IfNotPresent
1414

1515
sidecar:
1616
image:
1717
repository: 840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-envoy
18-
tag: v1.17.2.0-prod
18+
tag: v1.16.1.1-prod
1919
# sidecar.logLevel: Envoy log level can be info, warn, error or debug
2020
logLevel: info
2121
envoyAdminAccessPort: 9901

‎config/helm/appmesh-controller/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ preview: false
99

1010
image:
1111
repository: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/appmesh-controller
12-
tag: v1.4.0
12+
tag: v1.4.1
1313
pullPolicy: IfNotPresent
1414

1515
sidecar:
1616
image:
1717
repository: 840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-envoy
18-
tag: v1.17.2.0-prod
18+
tag: v1.16.1.1-prod
1919
# sidecar.logLevel: Envoy log level can be info, warn, error or debug
2020
logLevel: info
2121
envoyAdminAccessPort: 9901

‎pkg/inject/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func (cfg *Config) BindFlags(fs *pflag.FlagSet) {
107107
//Set to the SPIRE Agent's default UDS path for now as App Mesh only supports SPIRE as SDS provider for preview.
108108
fs.StringVar(&cfg.SdsUdsPath, flagSdsUdsPath, "/run/spire/sockets/agent.sock",
109109
"Unix Domain Socket path for SDS provider")
110-
fs.StringVar(&cfg.SidecarImage, flagSidecarImage, "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-envoy:v1.17.2.0-prod",
110+
fs.StringVar(&cfg.SidecarImage, flagSidecarImage, "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-envoy:v1.16.1.1-prod",
111111
"Envoy sidecar container image.")
112112
fs.StringVar(&cfg.SidecarCpuRequests, flagSidecarCpuRequests, "10m",
113113
"Sidecar CPU resources requests.")

0 commit comments

Comments
 (0)