Skip to content

Update to ACK runtime v0.36.0, code-generator v0.36.0 #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 7, 2024
Merged

Update to ACK runtime v0.36.0, code-generator v0.36.0 #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions apis/v1alpha1/ack-generate-metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ack_generate_info:
build_date: "2024-07-19T22:53:36Z"
build_hash: f0a0f42d507c550c2b063a192b3b43e4522bdd9c
build_date: "2024-08-06T02:39:12Z"
build_hash: 587b90dc860e91ee9a763e9e3bc4d3f1b2fbddb7
go_version: go1.22.5
version: v0.35.0
version: v0.36.0
api_directory_checksum: 1ec0ec190e4702c6e71245aba52bf8119d32641a
api_version: v1alpha1
aws_sdk_go_version: v1.49.0
Expand Down
2 changes: 1 addition & 1 deletion config/controller/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ kind: Kustomization
images:
- name: controller
newName: public.ecr.aws/aws-controllers-k8s/apigatewayv2-controller
newTag: 1.0.14
newTag: 1.0.15
4 changes: 4 additions & 0 deletions config/crd/bases/apigatewayv2.services.k8s.aws_apimappings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ spec:
properties:
name:
type: string
namespace:
type: string
type: object
type: object
domainName:
Expand All @@ -77,6 +79,8 @@ spec:
properties:
name:
type: string
namespace:
type: string
type: object
type: object
stage:
Expand Down
2 changes: 2 additions & 0 deletions config/crd/bases/apigatewayv2.services.k8s.aws_authorizers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ spec:
properties:
name:
type: string
namespace:
type: string
type: object
type: object
authorizerCredentialsARN:
Expand Down
2 changes: 2 additions & 0 deletions config/crd/bases/apigatewayv2.services.k8s.aws_deployments.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ spec:
properties:
name:
type: string
namespace:
type: string
type: object
type: object
description:
Expand Down
4 changes: 4 additions & 0 deletions config/crd/bases/apigatewayv2.services.k8s.aws_integrations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ spec:
properties:
name:
type: string
namespace:
type: string
type: object
type: object
connectionID:
Expand All @@ -75,6 +77,8 @@ spec:
properties:
name:
type: string
namespace:
type: string
type: object
type: object
connectionType:
Expand Down
6 changes: 6 additions & 0 deletions config/crd/bases/apigatewayv2.services.k8s.aws_routes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ spec:
properties:
name:
type: string
namespace:
type: string
type: object
type: object
authorizationScopes:
Expand All @@ -83,6 +85,8 @@ spec:
properties:
name:
type: string
namespace:
type: string
type: object
type: object
modelSelectionExpression:
Expand Down Expand Up @@ -122,6 +126,8 @@ spec:
properties:
name:
type: string
namespace:
type: string
type: object
type: object
required:
Expand Down
4 changes: 4 additions & 0 deletions config/crd/bases/apigatewayv2.services.k8s.aws_stages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ spec:
properties:
name:
type: string
namespace:
type: string
type: object
type: object
autoDeploy:
Expand Down Expand Up @@ -105,6 +107,8 @@ spec:
properties:
name:
type: string
namespace:
type: string
type: object
type: object
description:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22.0
toolchain go1.22.5

require (
github.com/aws-controllers-k8s/runtime v0.35.0
github.com/aws-controllers-k8s/runtime v0.36.0
github.com/aws/aws-sdk-go v1.49.0
github.com/go-logr/logr v1.4.1
github.com/google/go-cmp v0.6.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github.com/aws-controllers-k8s/runtime v0.35.0 h1:kLRLFOAcaFJRv/aEiWtb0qhlxFpwvmx6shCWNc1Tuas=
github.com/aws-controllers-k8s/runtime v0.35.0/go.mod h1:gI2pWb20UGLP2SnHf1a1VzTd7iVVy+/I9VAzT0Y+Dew=
github.com/aws-controllers-k8s/runtime v0.36.0 h1:XEMVGfUwsT9QMShihuCLHlape+daJWyYtXj45s/iJiU=
github.com/aws-controllers-k8s/runtime v0.36.0/go.mod h1:gI2pWb20UGLP2SnHf1a1VzTd7iVVy+/I9VAzT0Y+Dew=
github.com/aws/aws-sdk-go v1.49.0 h1:g9BkW1fo9GqKfwg2+zCD+TW/D36Ux+vtfJ8guF4AYmY=
github.com/aws/aws-sdk-go v1.49.0/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
Expand Down
4 changes: 2 additions & 2 deletions helm/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
name: apigatewayv2-chart
description: A Helm chart for the ACK service controller for Amazon API Gateway (APIGWv2)
version: 1.0.14
appVersion: 1.0.14
version: 1.0.15
appVersion: 1.0.15
home: https://github.com/aws-controllers-k8s/apigatewayv2-controller
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
sources:
Expand Down
4 changes: 4 additions & 0 deletions helm/crds/apigatewayv2.services.k8s.aws_apimappings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ spec:
properties:
name:
type: string
namespace:
type: string
type: object
type: object
domainName:
Expand All @@ -77,6 +79,8 @@ spec:
properties:
name:
type: string
namespace:
type: string
type: object
type: object
stage:
Expand Down
2 changes: 2 additions & 0 deletions helm/crds/apigatewayv2.services.k8s.aws_authorizers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ spec:
properties:
name:
type: string
namespace:
type: string
type: object
type: object
authorizerCredentialsARN:
Expand Down
2 changes: 2 additions & 0 deletions helm/crds/apigatewayv2.services.k8s.aws_deployments.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ spec:
properties:
name:
type: string
namespace:
type: string
type: object
type: object
description:
Expand Down
4 changes: 4 additions & 0 deletions helm/crds/apigatewayv2.services.k8s.aws_integrations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ spec:
properties:
name:
type: string
namespace:
type: string
type: object
type: object
connectionID:
Expand All @@ -75,6 +77,8 @@ spec:
properties:
name:
type: string
namespace:
type: string
type: object
type: object
connectionType:
Expand Down
6 changes: 6 additions & 0 deletions helm/crds/apigatewayv2.services.k8s.aws_routes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ spec:
properties:
name:
type: string
namespace:
type: string
type: object
type: object
authorizationScopes:
Expand All @@ -83,6 +85,8 @@ spec:
properties:
name:
type: string
namespace:
type: string
type: object
type: object
modelSelectionExpression:
Expand Down Expand Up @@ -122,6 +126,8 @@ spec:
properties:
name:
type: string
namespace:
type: string
type: object
type: object
required:
Expand Down
4 changes: 4 additions & 0 deletions helm/crds/apigatewayv2.services.k8s.aws_stages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ spec:
properties:
name:
type: string
namespace:
type: string
type: object
type: object
autoDeploy:
Expand Down Expand Up @@ -105,6 +107,8 @@ spec:
properties:
name:
type: string
namespace:
type: string
type: object
type: object
description:
Expand Down
2 changes: 1 addition & 1 deletion helm/templates/NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{ .Chart.Name }} has been installed.
This chart deploys "public.ecr.aws/aws-controllers-k8s/apigatewayv2-controller:1.0.14".
This chart deploys "public.ecr.aws/aws-controllers-k8s/apigatewayv2-controller:1.0.15".

Check its status by running:
kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"
Expand Down
11 changes: 10 additions & 1 deletion helm/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,4 +297,13 @@ rules:
- get
- patch
- update
{{- end }}
{{- end }}

{{/* Convert k/v map to string like: "key1=value1,key2=value2,..." */}}
{{- define "ack-apigatewayv2-controller.feature-gates" -}}
{{- $list := list -}}
{{- range $k, $v := .Values.featureGates -}}
{{- $list = append $list (printf "%s=%s" $k ( $v | toString)) -}}
{{- end -}}
{{ join "," $list }}
{{- end -}}
8 changes: 8 additions & 0 deletions helm/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ spec:
{{- range $key, $value := .Values.reconcile.resourceMaxConcurrentSyncs }}
- --reconcile-resource-max-concurrent-syncs
- "$(RECONCILE_RESOURCE_MAX_CONCURRENT_SYNCS_{{ $key | upper }})"
{{- end }}
{{- if .Values.featureGates}}
- --feature-gates
- "$(FEATURE_GATES)"
{{- end }}
image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
Expand Down Expand Up @@ -122,6 +126,10 @@ spec:
{{- range $key, $value := .Values.reconcile.resourceMaxConcurrentSyncs }}
- name: RECONCILE_RESOURCE_MAX_CONCURRENT_SYNCS_{{ $key | upper }}
value: {{ $key }}={{ $value }}
{{- end }}
{{- if .Values.featureGates}}
- name: FEATURE_GATES
value: {{ include "ack-apigatewayv2-controller.feature-gates" . }}
{{- end }}
{{- if .Values.aws.credentials.secretName }}
- name: AWS_SHARED_CREDENTIALS_FILE
Expand Down
7 changes: 7 additions & 0 deletions helm/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,13 @@
"type": "object"
}
},
"featureGates": {
"description": "Feature gates settings",
"type": "object",
"additionalProperties": {
"type": "boolean"
}
},
"required": [
"image",
"deployment",
Expand Down
9 changes: 8 additions & 1 deletion helm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

image:
repository: public.ecr.aws/aws-controllers-k8s/apigatewayv2-controller
tag: 1.0.14
tag: 1.0.15
pullPolicy: IfNotPresent
pullSecrets: []

Expand Down Expand Up @@ -153,3 +153,10 @@ leaderElection:
# will attempt to use the namespace of the service account mounted to the Controller
# pod.
namespace: ""

# Configuration for feature gates. These are optional controller features that
# can be individually enabled ("true") or disabled ("false") by adding key/value
# pairs below.
featureGates: {}
# featureGate1: true
# featureGate2: false
15 changes: 10 additions & 5 deletions pkg/resource/api_mapping/references.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading