From 85f37b563cb0f8b3c7a03c959b73161863dea0a4 Mon Sep 17 00:00:00 2001 From: Kyrie Chen Date: Tue, 7 Feb 2023 11:54:26 -0800 Subject: [PATCH] Ignore ClusterName for copySnapshot API --- apis/v1alpha1/ack-generate-metadata.yaml | 8 ++++---- apis/v1alpha1/generator.yaml | 1 + config/controller/deployment.yaml | 9 ++++----- config/controller/service.yaml | 2 +- generator.yaml | 1 + helm/templates/deployment.yaml | 1 - helm/templates/metrics-service.yaml | 1 - 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index 6c1d34d..760dbf3 100755 --- a/apis/v1alpha1/ack-generate-metadata.yaml +++ b/apis/v1alpha1/ack-generate-metadata.yaml @@ -1,13 +1,13 @@ ack_generate_info: - build_date: "2023-02-03T00:39:12Z" - build_hash: c6651c200ba136e5c7f50ad8be751fae060a38e6 + build_date: "2023-02-07T22:28:52Z" + build_hash: b55ae8752ece381c383ffe5b388ed2147c6b30d8 go_version: go1.19 - version: v0.22.0-1-gc6651c2 + version: v0.23.1 api_directory_checksum: ee32acc4d4a0ba7e2823dd20fdbe2c4ef1d9e0f4 api_version: v1alpha1 aws_sdk_go_version: v1.44.93 generator_config_info: - file_checksum: d7ad13c5bc8d9e9e2171c92dc3ac51c2b5e3b769 + file_checksum: 19e41b58c6c4d1971db53e6c1694da632d71d053 original_file_name: generator.yaml last_modification: reason: API generation diff --git a/apis/v1alpha1/generator.yaml b/apis/v1alpha1/generator.yaml index f129327..dd6af11 100644 --- a/apis/v1alpha1/generator.yaml +++ b/apis/v1alpha1/generator.yaml @@ -209,6 +209,7 @@ resources: path: SourceSnapshotName ClusterName: is_primary_key: false + is_required: false from: operation: CreateSnapshot path: ClusterName diff --git a/config/controller/deployment.yaml b/config/controller/deployment.yaml index a230ad6..4b0c945 100644 --- a/config/controller/deployment.yaml +++ b/config/controller/deployment.yaml @@ -1,8 +1,6 @@ apiVersion: v1 kind: Namespace metadata: - labels: - control-plane: controller name: ack-system --- apiVersion: apps/v1 @@ -11,16 +9,17 @@ metadata: name: ack-memorydb-controller namespace: ack-system labels: - control-plane: controller + app.kubernetes.io/name: ack-memorydb-controller + app.kubernetes.io/part-of: ack-system spec: selector: matchLabels: - control-plane: controller + app.kubernetes.io/name: ack-memorydb-controller replicas: 1 template: metadata: labels: - control-plane: controller + app.kubernetes.io/name: ack-memorydb-controller spec: containers: - command: diff --git a/config/controller/service.yaml b/config/controller/service.yaml index 7012739..434ec13 100644 --- a/config/controller/service.yaml +++ b/config/controller/service.yaml @@ -5,7 +5,7 @@ metadata: namespace: ack-system spec: selector: - control-plane: controller + app.kubernetes.io/name: ack-memorydb-controller ports: - name: metricsport port: 8080 diff --git a/generator.yaml b/generator.yaml index f129327..dd6af11 100644 --- a/generator.yaml +++ b/generator.yaml @@ -209,6 +209,7 @@ resources: path: SourceSnapshotName ClusterName: is_primary_key: false + is_required: false from: operation: CreateSnapshot path: ClusterName diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml index 0e47818..80c0922 100644 --- a/helm/templates/deployment.yaml +++ b/helm/templates/deployment.yaml @@ -10,7 +10,6 @@ metadata: app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} k8s-app: {{ include "app.name" . }} helm.sh/chart: {{ include "chart.name-version" . }} - control-plane: controller spec: replicas: 1 selector: diff --git a/helm/templates/metrics-service.yaml b/helm/templates/metrics-service.yaml index a010fa6..638858a 100644 --- a/helm/templates/metrics-service.yaml +++ b/helm/templates/metrics-service.yaml @@ -11,7 +11,6 @@ metadata: app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} k8s-app: {{ include "app.name" . }} helm.sh/chart: {{ include "chart.name-version" . }} - control-plane: controller spec: selector: app.kubernetes.io/name: {{ include "app.name" . }}