From dc849da693aabd6e7ea185de1922eddf1a140b4a Mon Sep 17 00:00:00 2001 From: kkb0318 Date: Sat, 1 Jun 2024 21:10:52 +0900 Subject: [PATCH] fix chart values --- charts/irsa-manager/README.md | 4 ++-- charts/irsa-manager/values.yaml | 30 +++++++++++++++--------------- config/manager/kustomization.yaml | 8 +------- config/manager/manager.yaml | 2 +- 4 files changed, 19 insertions(+), 25 deletions(-) diff --git a/charts/irsa-manager/README.md b/charts/irsa-manager/README.md index f96ae14..a244aa3 100644 --- a/charts/irsa-manager/README.md +++ b/charts/irsa-manager/README.md @@ -48,8 +48,8 @@ kubectl create secret generic aws-secret -n irsa-manager-system \ | controllerManager.manager.args[2] | string | `"--leader-elect"` | | | controllerManager.manager.containerSecurityContext.allowPrivilegeEscalation | bool | `false` | | | controllerManager.manager.containerSecurityContext.capabilities.drop[0] | string | `"ALL"` | | -| controllerManager.manager.image.repository | string | `"controller"` | | -| controllerManager.manager.image.tag | string | `"latest"` | | +| controllerManager.manager.image.repository | string | `"ghcr.io/kkb0318/irsa-manager"` | | +| controllerManager.manager.image.tag | string | `"APP_VERSION"` | | | controllerManager.manager.resources.limits.cpu | string | `"500m"` | | | controllerManager.manager.resources.limits.memory | string | `"128Mi"` | | | controllerManager.manager.resources.requests.cpu | string | `"10m"` | | diff --git a/charts/irsa-manager/values.yaml b/charts/irsa-manager/values.yaml index 05cdd74..deb46ad 100644 --- a/charts/irsa-manager/values.yaml +++ b/charts/irsa-manager/values.yaml @@ -1,15 +1,15 @@ controllerManager: kubeRbacProxy: args: - - --secure-listen-address=0.0.0.0:8443 - - --upstream=http://127.0.0.1:8080/ - - --logtostderr=true - - --v=0 + - --secure-listen-address=0.0.0.0:8443 + - --upstream=http://127.0.0.1:8080/ + - --logtostderr=true + - --v=0 containerSecurityContext: allowPrivilegeEscalation: false capabilities: drop: - - ALL + - ALL image: repository: gcr.io/kubebuilder/kube-rbac-proxy tag: v0.15.0 @@ -22,17 +22,17 @@ controllerManager: memory: 64Mi manager: args: - - --health-probe-bind-address=:8081 - - --metrics-bind-address=127.0.0.1:8080 - - --leader-elect + - --health-probe-bind-address=:8081 + - --metrics-bind-address=127.0.0.1:8080 + - --leader-elect containerSecurityContext: allowPrivilegeEscalation: false capabilities: drop: - - ALL + - ALL image: - repository: controller - tag: latest + repository: ghcr.io/kkb0318/irsa-manager + tag: APP_VERSION resources: limits: cpu: 500m @@ -46,8 +46,8 @@ controllerManager: kubernetesClusterDomain: cluster.local metricsService: ports: - - name: https - port: 8443 - protocol: TCP - targetPort: https + - name: https + port: 8443 + protocol: TCP + targetPort: https type: ClusterIP diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 4b9bfd7..7394a6d 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -1,8 +1,2 @@ resources: -- manager.yaml -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -images: -- name: controller - newName: ghcr.io/kkb0318/irsa-manager - newTag: latest + - manager.yaml diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 3e1f293..ed6b04c 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -70,7 +70,7 @@ spec: - /manager args: - --leader-elect - image: controller:latest + image: ghcr.io/kkb0318/irsa-manager:APP_VERSION env: - name: AWS_ACCESS_KEY_ID valueFrom: