Skip to content

Commit d8707d7

Browse files
authored
Update ACK runtime to v0.16.3 (#17)
### Update ACK runtime to `v0.16.3` ---------- * ACK code-generator `v0.16.3` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.16.3) * ACK runtime `v0.16.3` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.16.3) ---------- NOTE: This PR increments the release version of service controller from `v0.0.5` to `v0.0.6` Once this PR is merged, release `v0.0.6` will be automatically created for `opensearchservice-controller` **Please close this PR, if you do not want the new patch release for `opensearchservice-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building opensearchservice-controller ==== Copying common custom resource definitions into opensearchservice Building Kubernetes API objects for opensearchservice Generating deepcopy code for opensearchservice Generating custom resource definitions for opensearchservice Building service controller for opensearchservice Generating RBAC manifests for opensearchservice Running gofmt against generated code for opensearchservice Updating additional GitHub repository maintenance files ==== building opensearchservice-controller release artifacts ==== Building release artifacts for opensearchservice-v0.0.6 Generating common custom resource definitions Generating custom resource definitions for opensearchservice Generating RBAC manifests for opensearchservice ``` ---------- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 1eb8fc5 commit d8707d7

File tree

9 files changed

+33
-16
lines changed

9 files changed

+33
-16
lines changed

apis/v1alpha1/ack-generate-metadata.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ack_generate_info:
2-
build_date: "2022-01-14T12:33:43Z"
3-
build_hash: 3e0ecb910d3296a0f9580891a9af846ac1bf3bac
2+
build_date: "2022-01-24T20:51:33Z"
3+
build_hash: cccec82a27ddd880095383360df1fdc8f530842f
44
go_version: go1.17.5
5-
version: v0.16.1
5+
version: v0.16.3
66
api_directory_checksum: 6f3ca5de4e5a1ac8cb5366ab502f7c73c8d5c88f
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.40.51

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/aws-controllers-k8s/opensearchservice-controller
33
go 1.17
44

55
require (
6-
github.com/aws-controllers-k8s/runtime v0.16.1
6+
github.com/aws-controllers-k8s/runtime v0.16.3
77
github.com/aws/aws-sdk-go v1.40.51
88
github.com/go-logr/logr v1.2.0
99
github.com/spf13/pflag v1.0.5

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC
6464
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
6565
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
6666
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
67-
github.com/aws-controllers-k8s/runtime v0.16.1 h1:up+vn3J8mqjaHgleOSCU7wGqj7t8RCvF+V4EhdMEtSY=
68-
github.com/aws-controllers-k8s/runtime v0.16.1/go.mod h1:DHwPczqO/nK4L1kqWlmng5GuIQuX5MSSWbTQMuL4LnM=
67+
github.com/aws-controllers-k8s/runtime v0.16.3 h1:AaufF1pkfX3M3G4WK6m9OTcI6yEzKnFsffpuWTIy5wY=
68+
github.com/aws-controllers-k8s/runtime v0.16.3/go.mod h1:DHwPczqO/nK4L1kqWlmng5GuIQuX5MSSWbTQMuL4LnM=
6969
github.com/aws/aws-sdk-go v1.37.10/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
7070
github.com/aws/aws-sdk-go v1.40.51 h1:FfxDcjWqhMGwy+raf5Zf6AH8qsHIl9YG2dvJIBx1Aw4=
7171
github.com/aws/aws-sdk-go v1.40.51/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=

helm/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: opensearchservice-chart
33
description: A Helm chart for the ACK service controller for Amazon OpenSearch Service (OpenSearch)
4-
version: v0.0.5
5-
appVersion: v0.0.5
4+
version: v0.0.6
5+
appVersion: v0.0.6
66
home: https://github.com/aws-controllers-k8s/opensearchservice-controller
77
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
88
sources:

helm/templates/NOTES.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{{ .Chart.Name }} has been installed.
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/opensearchservice-controller:v0.0.6".
3+
4+
Check its status by running:
5+
kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"
6+
7+
You are now able to create Amazon OpenSearch Service (OpenSearch) resources!
8+
9+
The controller is running in "{{ .Values.installScope }}" mode.
10+
The controller is configured to run in the region: "{{ .Values.aws.region }}"
11+
12+
Visit https://aws-controllers-k8s.github.io/community/reference/ for an API
13+
reference of all the resources that can be created using this controller.
14+
15+
For more information on the AWS Controller for Kubernetes (ACK) project, visit:
16+
https://aws-controllers-k8s.github.io/community/

helm/values.schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"type": "object"
5252
},
5353
"tolerations": {
54-
"type": "object"
54+
"type": "array"
5555
},
5656
"affinity": {
5757
"type": "object"

helm/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
image:
66
repository: public.ecr.aws/aws-controllers-k8s/opensearchservice-controller
7-
tag: v0.0.5
7+
tag: v0.0.6
88
pullPolicy: IfNotPresent
99
pullSecrets: []
1010

@@ -21,7 +21,7 @@ deployment:
2121
kubernetes.io/os: linux
2222
# Which tolerations to set?
2323
# See: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
24-
tolerations: {}
24+
tolerations: []
2525
# What affinity to set?
2626
# See: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity
2727
affinity: {}

test/e2e/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
acktest @ git+https://github.com/aws-controllers-k8s/test-infra.git@a63692d071528e458045adc76cb08f6ac558f42c
1+
acktest @ git+https://github.com/aws-controllers-k8s/test-infra.git@d1f53c9ddbc296147249ee9f2bd643f14a70121a

test/e2e/tests/test_domain.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import time
2020
from typing import Dict
2121

22+
from acktest.resources import random_suffix_name
2223
from acktest.k8s import resource as k8s
2324
import pytest
2425

@@ -30,7 +31,7 @@
3031

3132
RESOURCE_PLURAL = 'domains'
3233

33-
DELETE_WAIT_AFTER_SECONDS = 30
34+
DELETE_WAIT_AFTER_SECONDS = 60*2
3435

3536
# This is the time to wait *after* the domain returns Processing=False from the
3637
# Opensearch DescribeDomain API call and before we check to see that the CR's
@@ -63,7 +64,7 @@ def resources():
6364

6465
@pytest.fixture
6566
def es_7_9_domain(os_client, resources: BootstrapResources):
66-
resource = Domain(name="my-os-domain", data_node_count=1)
67+
resource = Domain(name=random_suffix_name("my-os-domain1", 20), data_node_count=1)
6768
mup = resources.MasterUserPasswordSecret
6869

6970
replacements = REPLACEMENT_VALUES.copy()
@@ -118,7 +119,7 @@ def es_7_9_domain(os_client, resources: BootstrapResources):
118119

119120
@pytest.fixture
120121
def es_2d3m_multi_az_no_vpc_7_9_domain(os_client, resources: BootstrapResources):
121-
resource = Domain(name="my-os-domain2",data_node_count=2,master_node_count=3,is_zone_aware=True)
122+
resource = Domain(name=random_suffix_name("my-os-domain2", 20), data_node_count=2,master_node_count=3,is_zone_aware=True)
122123
mup = resources.MasterUserPasswordSecret
123124

124125
replacements = REPLACEMENT_VALUES.copy()
@@ -165,7 +166,7 @@ def es_2d3m_multi_az_no_vpc_7_9_domain(os_client, resources: BootstrapResources)
165166
@pytest.fixture
166167
def es_2d3m_multi_az_vpc_2_subnet7_9_domain(os_client, resources: BootstrapResources):
167168
resource = Domain(
168-
name="my-os-domain3",
169+
name=random_suffix_name("my-os-domain3", 20),
169170
data_node_count=2,
170171
master_node_count=3,
171172
is_zone_aware=True,

0 commit comments

Comments
 (0)