Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixing config issue emissary helm chart #2265

Merged
merged 1 commit into from
Jun 27, 2023
+296 −4
Merged

Fixing config issue emissary helm chart #2265

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
300 changes: 296 additions & 4 deletions projects/emissary-ingress/emissary/patches/0001-patching_helm_charts_packages.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 6de85e380155655a35b5850fa6683aa75e01fcf2 Mon Sep 17 00:00:00 2001
From 1d07dfb1dbdfc9df153c84e185758df4c03b7d49 Mon Sep 17 00:00:00 2001
From: jonahjon <jonahjones094@gmail.com>
Date: Mon, 22 May 2023 17:28:40 -0500
Date: Tue, 27 Jun 2023 11:18:23 -0500
Subject: [PATCH] patching_helm_charts_packages

Signed-off-by: jonahjon <jonahjones094@gmail.com>
Expand Down Expand Up @@ -38,6 +38,7 @@ Signed-off-by: jonahjon <jonahjones094@gmail.com>
charts/emissary-ingress/templates/NOTES.txt | 14 +-
.../emissary-ingress/templates/_helpers.tpl | 17 +-
.../templates/admin-service.yaml | 2 +-
.../templates/ambassador-agent.yaml | 284 -
charts/emissary-ingress/templates/config.yaml | 2 +-
.../templates/deployment-canary.yaml | 4 +-
.../templates/deployment.yaml | 6 +-
Expand All @@ -55,7 +56,7 @@ Signed-off-by: jonahjon <jonahjones094@gmail.com>
.../templates/serviceaccount.yaml | 2 +-
.../templates/servicemonitor.yaml | 4 +-
.../{values.yaml.in => values.yaml} | 51 +-
50 files changed, 5573 insertions(+), 440 deletions(-)
51 files changed, 5573 insertions(+), 724 deletions(-)
create mode 100644 charts/crds/.helmignore
create mode 100644 charts/crds/Chart.yaml
create mode 100644 charts/crds/README.md
Expand Down Expand Up @@ -83,6 +84,7 @@ Signed-off-by: jonahjon <jonahjones094@gmail.com>
delete mode 100644 charts/emissary-ingress/ci.in/tests/manifests/helm2-values.yaml
delete mode 100644 charts/emissary-ingress/ci.in/tests/manifests/tls.yaml
delete mode 100644 charts/emissary-ingress/readme.tpl
delete mode 100644 charts/emissary-ingress/templates/ambassador-agent.yaml
rename charts/emissary-ingress/{values.yaml.in => values.yaml} (89%)

diff --git a/Makefile b/Makefile
Expand Down Expand Up @@ -6241,6 +6243,296 @@ index 77f628459..6b32df2e8 100644
labels:
app.kubernetes.io/name: {{ include "ambassador.name" . }}
{{- include "ambassador.labels" . | nindent 4 }}
diff --git a/charts/emissary-ingress/templates/ambassador-agent.yaml b/charts/emissary-ingress/templates/ambassador-agent.yaml
deleted file mode 100644
index 15e1ad4c1..000000000
--- a/charts/emissary-ingress/templates/ambassador-agent.yaml
+++ /dev/null
@@ -1,284 +0,0 @@
-{{- if .Values.agent.enabled }}
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
- name: {{ include "ambassador.fullname" . }}-agent
- namespace: {{ include "ambassador.namespace" . }}
- labels:
- app.kubernetes.io/name: {{ include "ambassador.name" . }}-agent
- {{- include "ambassador.labels" . | nindent 4 }}
- product: aes
-{{- if .Values.docker.useImagePullSecret }}
-imagePullSecrets:
-- name: {{ .Values.docker.imagePullSecretName }}
-{{- end }}
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
- name: {{ include "ambassador.fullname" . }}-agent-config
- namespace: {{ include "ambassador.namespace" . }}
- labels:
- app.kubernetes.io/name: {{ include "ambassador.name" . }}-agent
- {{- include "ambassador.labels" . | nindent 4 }}
- product: aes
-roleRef:
- apiGroup: rbac.authorization.k8s.io
- kind: Role
- name: {{ include "ambassador.fullname" . }}-agent-config
-subjects:
-- kind: ServiceAccount
- name: {{ include "ambassador.fullname" . }}-agent
- namespace: {{ include "ambassador.namespace" . }}
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
- name: {{ include "ambassador.fullname" . }}-agent-config
- namespace: {{ include "ambassador.namespace" . }}
- labels:
- app.kubernetes.io/name: {{ include "ambassador.name" . }}-agent
- {{- include "ambassador.labels" . | nindent 4 }}
- product: aes
-rules:
-- apiGroups: [""]
- resources: [ "configmaps" ]
- verbs: [ "get", "list", "watch" ]
-- apiGroups: [""]
- resources: [ "secrets"]
- verbs: [ "get", "create", "delete", "patch", "watch"]
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
- name: {{ include "ambassador.fullname" . }}-agent
- labels:
- app.kubernetes.io/name: {{ include "ambassador.name" . }}-agent
- {{- include "ambassador.labels" . | nindent 4 }}
- product: aes
-roleRef:
- apiGroup: rbac.authorization.k8s.io
- kind: ClusterRole
- name: {{ include "ambassador.fullname" . }}-agent
-subjects:
-- kind: ServiceAccount
- name: {{ include "ambassador.fullname" . }}-agent
- namespace: {{ include "ambassador.namespace" . }}
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
- name: {{ include "ambassador.fullname" . }}-agent
- labels:
- app.kubernetes.io/name: {{ include "ambassador.name" . }}-agent
- {{- include "ambassador.labels" . | nindent 4 }}
- product: aes
-aggregationRule:
- clusterRoleSelectors:
- - matchLabels:
- rbac.getambassador.io/role-group: {{ include "ambassador.rbacName" . }}-agent
-rules: []
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
- name: {{ include "ambassador.fullname" . }}-agent-pods
- labels:
- rbac.getambassador.io/role-group: {{ include "ambassador.rbacName" . }}-agent
- app.kubernetes.io/name: {{ include "ambassador.name" . }}-agent
- {{- include "ambassador.labels" . | nindent 4 }}
- product: aes
-rules:
-- apiGroups: [""]
- resources: [ "pods"]
- verbs: [ "get", "list", "watch" ]
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
- name: {{ include "ambassador.fullname" . }}-agent-deployments
- labels:
- rbac.getambassador.io/role-group: {{ include "ambassador.rbacName" . }}-agent
- app.kubernetes.io/name: {{ include "ambassador.name" . }}-agent
- {{- include "ambassador.labels" . | nindent 4 }}
- product: aes
-rules:
-- apiGroups: ["apps", "extensions"]
- resources: [ "deployments" ]
- verbs: [ "get", "list", "watch" ]
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
- name: {{ include "ambassador.fullname" . }}-agent-endpoints
- labels:
- rbac.getambassador.io/role-group: {{ include "ambassador.rbacName" . }}-agent
- app.kubernetes.io/name: {{ include "ambassador.name" . }}-agent
- {{- include "ambassador.labels" . | nindent 4 }}
- product: aes
-rules:
-- apiGroups: [""]
- resources: [ "endpoints" ]
- verbs: [ "get", "list", "watch" ]
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
- name: {{ include "ambassador.fullname" . }}-agent-configmaps
- labels:
- rbac.getambassador.io/role-group: {{ include "ambassador.rbacName" . }}-agent
- app.kubernetes.io/name: {{ include "ambassador.name" . }}-agent
- {{- include "ambassador.labels" . | nindent 4 }}
- product: aes
-rules:
-- apiGroups: [""]
- resources: [ "configmaps" ]
- verbs: [ "get", "list", "watch" ]
----
-{{- if .Values.agent.createArgoRBAC }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
- name: {{ include "ambassador.fullname" . }}-agent-rollouts
- labels:
- rbac.getambassador.io/role-group: {{ include "ambassador.rbacName" . }}-agent
- app.kubernetes.io/name: {{ include "ambassador.name" . }}-agent
- {{- include "ambassador.labels" . | nindent 4 }}
- product: aes
-rules:
-- apiGroups: ["argoproj.io"]
- resources: [ "rollouts", "rollouts/status" ]
- verbs: [ "get", "list", "watch", "patch" ]
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
- name: {{ include "ambassador.fullname" . }}-agent-applications
- labels:
- rbac.getambassador.io/role-group: {{ include "ambassador.rbacName" . }}-agent
- app.kubernetes.io/name: {{ include "ambassador.name" . }}-agent
- {{- include "ambassador.labels" . | nindent 4 }}
- product: aes
-rules:
-- apiGroups: ["argoproj.io"]
- resources: [ "applications" ]
- verbs: [ "get", "list", "watch" ]
-{{- end }}
-{{ if ne .Values.agent.cloudConnectToken "" }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ include "ambassador.fullname" . }}-agent-cloud-token
- namespace: {{ include "ambassador.namespace" . }}
- labels:
- app.kubernetes.io/name: {{ include "ambassador.name" . }}-agent-cloud-token
- {{- include "ambassador.labels" . | nindent 4 }}
- product: aes
-data:
- CLOUD_CONNECT_TOKEN: {{ .Values.agent.cloudConnectToken }}
-{{ end }}
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: {{ include "ambassador.fullname" . }}-agent
- namespace: {{ include "ambassador.namespace" . }}
- labels:
- app.kubernetes.io/name: {{ include "ambassador.fullname" . }}-agent
- {{- include "ambassador.labels" . | nindent 4 }}
- product: aes
-spec:
- replicas: 1
- selector:
- matchLabels:
- app.kubernetes.io/name: {{ include "ambassador.fullname" . }}-agent
- app.kubernetes.io/instance: {{ .Release.Name }}
- template:
- metadata:
- labels:
- app.kubernetes.io/name: {{ include "ambassador.fullname" . }}-agent
- {{- include "ambassador.labels" . | nindent 8 }}
- product: aes
- spec:
- {{- with .Values.agent.podSecurityContext }}
- securityContext:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- serviceAccountName: {{ include "ambassador.fullname" . }}-agent
- containers:
- - name: agent
- image: "{{ .Values.agent.image.repository }}:{{ .Values.agent.image.tag }}"
- imagePullPolicy: {{ .Values.agent.image.pullPolicy }}
- ports:
- - containerPort: 8080
- name: http
- {{- with .Values.agent.containerSecurityContext }}
- securityContext:
- {{- toYaml . | nindent 12 }}
- {{- end }}
- env:
- - name: AGENT_NAMESPACE
- valueFrom:
- fieldRef:
- fieldPath: metadata.namespace
- - name: AGENT_CONFIG_RESOURCE_NAME
- value: {{ include "ambassador.fullname" . }}-agent-cloud-token
- - name: RPC_CONNECTION_ADDRESS
- value: {{ .Values.agent.rpcAddress }}
- - name: AES_SNAPSHOT_URL
- value: "http://{{ include "ambassador.fullname" . }}-admin.{{ include "ambassador.namespace" . }}:{{ .Values.adminService.snapshotPort }}/snapshot-external"
- - name: AES_REPORT_DIAGNOSTICS_TO_CLOUD
- value: {{ .Values.agent.reportDiagnostics | quote }}
- - name: AES_DIAGNOSTICS_URL
- value: "http://{{ include "ambassador.fullname" . }}-admin.{{ include "ambassador.namespace" . }}:{{ .Values.adminService.port }}/ambassador/v0/diag/?json=true"
-
- {{- with .Values.agent.nodeSelector }}
- nodeSelector:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- {{- with .Values.agent.affinity }}
- affinity:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- {{- with .Values.agent.tolerations }}
- tolerations:
- {{- toYaml . | nindent 8 }}
- {{- end }}
-
- {{ if .Values.progressDeadlines }}
- {{ if hasKey .Values.progressDeadlines "agent" }}
- progressDeadlineSeconds: {{ .Values.progressDeadlines.agent }}
- {{- end }}
- {{- end }}
----
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ include "ambassador.fullname" . }}-agent
- namespace: {{ include "ambassador.namespace" . }}
- labels:
- {{- if ne .Values.deploymentTool "getambassador.io" }}
- app.kubernetes.io/name: {{ include "ambassador.name" . }}-agent
- app.kubernetes.io/part-of: {{ .Release.Name }}
- helm.sh/chart: {{ include "ambassador.chart" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- {{- if .Values.deploymentTool }}
- app.kubernetes.io/managed-by: {{ .Values.deploymentTool }}
- {{- else }}
- app.kubernetes.io/managed-by: {{ .Release.Service }}
- {{- end }}
- {{- end }}
- product: aes
-spec:
- ports:
- - port: 80
- targetPort: http
- protocol: TCP
- name: http
- selector:
- app.kubernetes.io/name: {{ include "ambassador.fullname" . }}-agent
- app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
diff --git a/charts/emissary-ingress/templates/config.yaml b/charts/emissary-ingress/templates/config.yaml
index cd6184dde..4ba1c911a 100644
--- a/charts/emissary-ingress/templates/config.yaml
Expand Down Expand Up @@ -6636,5 +6928,5 @@ index 3b7ed1b6b..94e66a04b 100644

# configure docker to pull from private registry
--
2.34.1
2.40.1