Skip to content

Commit 2adbd8e

Browse files
author
Serhii Rudenko
committed
chart edt
1 parent 11ac7ca commit 2adbd8e

File tree

9 files changed

+18
-29
lines changed

9 files changed

+18
-29
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
*.exe~
44
*.dll
55
*.so
6+
7+
*.tgz
8+
69
*.dylib
710
bin/*
811
Dockerfile.cross

Makefile

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,6 @@ SHELL = /usr/bin/env bash -o pipefail
2525
.PHONY: all
2626
all: build
2727

28-
##@Docs
29-
30-
.PHONY:
31-
install_helm-docs: ## Install helm-docs
32-
wget https://github.com/norwoodj/helm-docs/releases/download/v1.14.2/helm-docs_1.14.2_Linux_x86_64.tar.gz
33-
tar -zxvf helm-docs_1.14.2_Linux_x86_64.tar.gz helm-docs
34-
sudo mv helm-docs ./bin/
35-
rm helm-docs_1.14.2_Linux_x86_64.tar.gz
36-
37-
.PHONY: helm-docs-generate
38-
helm-docs-generate: ## Generate Helm Chart Docs
39-
helm-docs -c $(CHART_PATH) -o README.md
40-
4128
##@ General
4229

4330
# The help target prints out all targets with their descriptions organized

charts/Makefile

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ GIT_STAMP ?= $(shell git describe || echo v0.1.0)
44
KUBEVAL_SCHEMA_LOCATION ?= https://raw.githubusercontent.com/redacid/k8s-json-scheme/refs/heads/main
55
KUBECONFORM_SCHEMA ?= --schema-location 'https://raw.githubusercontent.com/redacid/k8s-json-scheme/refs/heads/main/{{.NormalizedKubernetesVersion}}-standalone{{.StrictSuffix}}/{{.ResourceKind}}{{.KindSuffix}}.json'
66
CHART_PATH ?= ./aws-auth-operator
7+
CREATE_NAMESPACE ?= --create-namespace
78

89
ENV_NAME ?= TEST
910

@@ -24,6 +25,19 @@ TARGET_MAX_CHAR_NUM = 30
2425

2526
all: help
2627

28+
## Install helm-docs | Docs
29+
.PHONY: install_helm-docs
30+
install_helm-docs:
31+
wget https://github.com/norwoodj/helm-docs/releases/download/v1.14.2/helm-docs_1.14.2_Linux_x86_64.tar.gz
32+
tar -zxvf helm-docs_1.14.2_Linux_x86_64.tar.gz helm-docs
33+
sudo mv helm-docs ./bin/
34+
rm helm-docs_1.14.2_Linux_x86_64.tar.gz
35+
36+
## Generate Helm Chart Docs
37+
.PHONY: helm-docs-generate
38+
helm-docs-generate:
39+
helm-docs -c $(CHART_PATH) -o README.md
40+
2741
## Check helm | Linters
2842
helm-lint: helm-dependency-update
2943
@$(foreach var,$(ENV_NAME), echo "\n\n======= Check $(var) =======\n\n" \
@@ -45,7 +59,7 @@ helm-kubeconform: helm-dependency-update install-kubeconform-plugin
4559

4660
## Deploy TEST
4761
deploy-test: helm-dependency-update helm-package
48-
@helm upgrade -i --namespace=$(TEST_NAMESPACE) $(TEST_RELEASE_NAME) ./aws-auth-operator-$(GIT_STAMP).tgz $(TEST_VALUES)
62+
@helm upgrade -i --namespace=$(TEST_NAMESPACE) $(TEST_RELEASE_NAME) ./aws-auth-operator-$(GIT_STAMP).tgz $(TEST_VALUES) $(CREATE_NAMESPACE)
4963

5064
## Deploy TEST
5165
template-test: helm-dependency-update

charts/aws-auth-operator/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ Kubernetes operator to declaratively manage the EKS aws-auth configmap
2727
| replicaCount | int | `1` | Controller Pod replica count |
2828
| resources | object | `{}` | Resource requests and limits for the manager container |
2929
| securityContext | object | `{}` | Security context for the manager container |
30-
| selfSignedIssuer | object | `{"enabled":true}` | Enable cert-manager issuer and create self-signed certs |
3130
| tolerations | list | `[]` | Tolerations for pod assignment |
3231

3332
----------------------------------------------

charts/aws-auth-operator/templates/certificate-serving.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{{- if .Values.selfSignedIssuer.enabled -}}
21
apiVersion: cert-manager.io/v1
32
kind: Certificate
43
metadata:
@@ -14,4 +13,3 @@ spec:
1413
kind: Issuer
1514
name: {{ include "aws-auth-operator.fullname" . }}-selfsigned-issuer
1615
secretName: {{ include "aws-auth-operator.fullname" . }}-webhook-server-cert
17-
{{- end }}
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{{- if .Values.selfSignedIssuer.enabled -}}
21
apiVersion: cert-manager.io/v1
32
kind: Issuer
43
metadata:
@@ -8,4 +7,3 @@ metadata:
87
namespace: {{ .Release.Namespace }}
98
spec:
109
selfSigned: {}
11-
{{- end }}

charts/aws-auth-operator/templates/webhook-validation.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ apiVersion: admissionregistration.k8s.io/v1
22
kind: ValidatingWebhookConfiguration
33
metadata:
44
annotations:
5-
{{- if .Values.selfSignedIssuer.enabled }}
65
cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "aws-auth-operator.fullname" . }}-serving-cert
7-
{{- end }}
86
name: {{ include "aws-auth-operator.fullname" . }}-validating-webhook
97
webhooks:
108
- admissionReviewVersions:

charts/aws-auth-operator/values.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,6 @@ affinity: {}
8080
podDisruptionBudget:
8181
enabled: false
8282

83-
# -- Enable cert-manager issuer and create self-signed certs
84-
selfSignedIssuer:
85-
enabled: true
86-
8783
# -- ConfigMap for MapAccount, MapUser, MapRoles in kube-system ns, aws-auth bu default
8884
configMapName: "aws-auth"
8985
# -- This account id must allways present in cm, and disallow to delete crd MapAccount with this id

charts/values.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,6 @@ affinity: {}
7777
podDisruptionBudget:
7878
enabled: false
7979

80-
# -- Enable cert-manager issuer and create self-signed certs
81-
selfSignedIssuer:
82-
enabled: true
83-
8480
# -- ConfigMap for MapAccount, MapUser, MapRoles in kube-system ns, aws-auth bu default
8581
configMapName: "aws-auth-test"
8682
# -- This account id must allways present in cm, and disallow to delete crd MapAccount with this id

0 commit comments

Comments
 (0)