diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd4de89a063412ae8271d99e7cdb9b28c2fb9c5d..3b581ea9c5bf4176aa53fd74a058be4c54864154 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,7 +38,6 @@ package tests: # Wait for healthy - sleep 5 - kubectl get namespaces,pods,helmrelease,kustomizations,gitrepositories -A - - kubectl wait --for=condition=Ready --timeout 300s helmrelease -n bigbang certmanager - kubectl wait --for=condition=Ready --timeout 300s helmrelease -n bigbang gatekeeper - kubectl wait --for=condition=Ready --timeout 300s helmrelease -n bigbang istio-operator - kubectl wait --for=condition=Ready --timeout 300s helmrelease -n bigbang istio diff --git a/chart/templates/certmanager/cert-manager-helmrelease.yaml b/chart/templates/certmanager/cert-manager-helmrelease.yaml deleted file mode 100644 index 9607885407e25765004c790c7751db8beef33ba5..0000000000000000000000000000000000000000 --- a/chart/templates/certmanager/cert-manager-helmrelease.yaml +++ /dev/null @@ -1,47 +0,0 @@ -{{- if .Values.certmanager.enabled }} -apiVersion: helm.toolkit.fluxcd.io/v2beta1 -kind: HelmRelease -metadata: - name: certmanager - namespace: {{ .Release.Namespace }} -spec: - targetNamespace: cert-manager - chart: - spec: - chart: chart - interval: 5m - sourceRef: - kind: GitRepository - name: certmanager - namespace: {{ .Release.Namespace }} - - {{- with .Values.flux }} - interval: {{ .interval }} - test: - enable: false - install: - remediation: - retries: {{ .install.retries }} - upgrade: - remediation: - retries: {{ .upgrade.retries }} - remediateLastFailure: true - cleanupOnFail: true - rollback: - timeout: {{ .rollback.timeout }} - cleanupOnFail: {{ .rollback.cleanupOnFail }} - {{- end }} - - values: - global: - logLevel: 2 - - {{- if and (ne .Values.registryCredentials.username "") (ne .Values.registryCredentials.password "") }} - imagePullSecrets: [ name: private-registry ] - {{- end }} - - valuesFrom: - - name: values - kind: Secret - valuesKey: "certmanager.yaml" -{{- end }} \ No newline at end of file diff --git a/chart/templates/certmanager/gitrepository.yaml b/chart/templates/certmanager/gitrepository.yaml deleted file mode 100644 index 28a51eba3cca3761e65f83dd5139fae54de69a97..0000000000000000000000000000000000000000 --- a/chart/templates/certmanager/gitrepository.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{- if and (not .Values.offline) .Values.certmanager.enabled }} -apiVersion: source.toolkit.fluxcd.io/v1beta1 -kind: GitRepository -metadata: - name: certmanager - namespace: {{ .Release.Namespace }} -spec: - ignore: | - # exclude file extensions - /**/*.md - /**/*.txt - /**/*.sh - interval: {{ .Values.flux.interval }} - ref: - branch: {{ .Values.certmanager.git.branch }} - url: {{ .Values.certmanager.git.repo }} -{{- end }} diff --git a/chart/templates/certmanager/namespace.yaml b/chart/templates/certmanager/namespace.yaml deleted file mode 100644 index 2b2148a0ebc18712d6af74974800d128d3970284..0000000000000000000000000000000000000000 --- a/chart/templates/certmanager/namespace.yaml +++ /dev/null @@ -1,18 +0,0 @@ -{{- if .Values.certmanager.enabled }} -apiVersion: v1 -kind: Namespace -metadata: - name: cert-manager - ---- -{{- if and (ne .Values.registryCredentials.username "") (ne .Values.registryCredentials.password "") }} -apiVersion: v1 -kind: Secret -metadata: - name: private-registry - namespace: cert-manager -type: kubernetes.io/dockerconfigjson -data: - .dockerconfigjson: {{ template "imagePullSecret" . }} -{{- end }} -{{- end}} \ No newline at end of file diff --git a/chart/templates/clusterauditor/clusterauditor-policies-helmrelease.yaml b/chart/templates/clusterauditor/clusterauditor-policies-helmrelease.yaml index b507cf9274aca53d40fe93988d3b6f0126c10cb5..d08627c9824881b2df1ee447fd6bcffb675c7ca3 100644 --- a/chart/templates/clusterauditor/clusterauditor-policies-helmrelease.yaml +++ b/chart/templates/clusterauditor/clusterauditor-policies-helmrelease.yaml @@ -35,7 +35,7 @@ spec: - name: values kind: Secret valuesKey: "clusterauditor.yaml" - {{- if .Values.certmanager.enabled }} + {{- if .Values.gatekeeper.enabled }} dependsOn: - name: gatekeeper namespace: {{ .Release.Namespace }} diff --git a/chart/templates/gatekeeper/gatekeeper-helmrelease.yaml b/chart/templates/gatekeeper/gatekeeper-helmrelease.yaml index 4dc1665078fb68f01fc6f18eb543f152103c7da4..8ec8ff93a9bae3f0a66f02fa8a8f82b152df95ca 100644 --- a/chart/templates/gatekeeper/gatekeeper-helmrelease.yaml +++ b/chart/templates/gatekeeper/gatekeeper-helmrelease.yaml @@ -46,10 +46,4 @@ spec: {{- if and (ne .Values.registryCredentials.username "") (ne .Values.registryCredentials.password "") }} imagePullSecrets: [ private-registry ] {{- end }} - - {{- if .Values.certmanager.enabled }} - dependsOn: - - name: certmanager - namespace: {{ .Release.Namespace }} - {{- end }} {{- end }} \ No newline at end of file diff --git a/chart/templates/values.yaml b/chart/templates/values.yaml index 6aaae5c06a6470cba68c0ace725a3990c904aea7..3019814a6c3626b5cc206482da71e272f0fe2d08 100644 --- a/chart/templates/values.yaml +++ b/chart/templates/values.yaml @@ -7,8 +7,6 @@ type: generic stringData: istio.yaml: | {{ toYaml .Values.istio.values | indent 4 }} - certmanager.yaml: | -{{ toYaml .Values.certmanager.values | indent 4 }} gatekeeper.yaml: | {{ toYaml .Values.gatekeeper.values | indent 4 }} logging.yaml: | diff --git a/chart/values.yaml b/chart/values.yaml index abf02559eafe623f8a4b4a8bba2e26d024cfb4ac..bcf7fa0fde92a27ed2a6d34aeaf43bd0e46d4c4a 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -28,12 +28,6 @@ istio: repo: https://repo1.dsop.io/platform-one/big-bang/apps/core/servicemesh.git branch: chart-release values: {} -certmanager: - enabled: true - git: - repo: https://repo1.dsop.io/platform-one/big-bang/apps/sandbox/cert-manager.git - branch: release-v1.0.x - values: {} clusterAuditor: enabled: true @@ -42,8 +36,6 @@ clusterAuditor: branch: chart-release values: {} - - gatekeeper: enabled: true git: