Skip to content

Commit 0872689

Browse files
authored
bring controller up to modern runtime and deps (#49)
This controller has been languishing for quite some time with old ACK runtime and various dependencies (that dependabot keeps complaining about). This commit brings the controller up to the most modern runtime and set of upstream dependencies. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent c0416fe commit 0872689

23 files changed

+453
-236
lines changed
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
ack_generate_info:
2-
build_date: "2022-09-12T19:43:28Z"
3-
build_hash: 2944c8772f216656d84ee02d392eaca501274c1e
4-
go_version: go1.17.5
5-
version: v0.20.1
6-
api_directory_checksum: eef0a2635234f98159a89e22a8a3a2ee25e05f49
2+
build_date: "2023-04-25T07:47:37Z"
3+
build_hash: e69321ed2d9567bf2d439af970b7466086f0b4fa
4+
go_version: go1.20.1
5+
version: v0.25.0-6-ge69321e
6+
api_directory_checksum: 28c2b055605a0b94ed3e3f60d6b3292e7be51e80
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.93
99
generator_config_info:
10-
file_checksum: bd3133286f996b9a993aee42d06c278d88c24b2e
10+
file_checksum: 2b468d246521fe86c4c3a8f914e3b096b0e6977e
1111
original_file_name: generator.yaml
1212
last_modification:
1313
reason: API generation

apis/v1alpha1/domain.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/v1alpha1/generator.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
model_name: opensearch
1+
sdk_names:
2+
model_name: opensearch
23
ignore:
34
resource_names:
45
- Package

apis/v1alpha1/types.go

Lines changed: 10 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/controller/deployment.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
apiVersion: v1
22
kind: Namespace
33
metadata:
4-
labels:
5-
control-plane: controller
64
name: ack-system
75
---
86
apiVersion: apps/v1
@@ -11,16 +9,17 @@ metadata:
119
name: ack-opensearchservice-controller
1210
namespace: ack-system
1311
labels:
14-
control-plane: controller
12+
app.kubernetes.io/name: ack-opensearchservice-controller
13+
app.kubernetes.io/part-of: ack-system
1514
spec:
1615
selector:
1716
matchLabels:
18-
control-plane: controller
17+
app.kubernetes.io/name: ack-opensearchservice-controller
1918
replicas: 1
2019
template:
2120
metadata:
2221
labels:
23-
control-plane: controller
22+
app.kubernetes.io/name: ack-opensearchservice-controller
2423
spec:
2524
containers:
2625
- command:

config/controller/service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
namespace: ack-system
66
spec:
77
selector:
8-
control-plane: controller
8+
app.kubernetes.io/name: ack-opensearchservice-controller
99
ports:
1010
- name: metricsport
1111
port: 8080

config/crd/bases/opensearchservice.services.k8s.aws_domains.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ spec:
7474
description: Key is the key within the secret
7575
type: string
7676
name:
77-
description: Name is unique within a namespace to reference
77+
description: name is unique within a namespace to reference
7878
a secret resource.
7979
type: string
8080
namespace:
81-
description: Namespace defines the space within which
81+
description: namespace defines the space within which
8282
the secret name must be unique.
8383
type: string
8484
required:

config/crd/kustomization.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
3-
bases:
4-
- common
53
resources:
4+
- common
65
- bases/opensearchservice.services.k8s.aws_domains.yaml

config/default/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#commonLabels:
1313
# someName: someValue
1414

15-
bases:
15+
resources:
1616
- ../crd
1717
- ../rbac
1818
- ../controller

generator.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
model_name: opensearch
1+
sdk_names:
2+
model_name: opensearch
23
ignore:
34
resource_names:
45
- Package

0 commit comments

Comments
 (0)