From 13105f111fe6ea96e3aaa79973e0f437763af420 Mon Sep 17 00:00:00 2001 From: Tenshin Higashi Date: Mon, 11 Sep 2023 09:51:12 -0400 Subject: [PATCH 1/9] First commit Signed-off-by: Tenshin Higashi --- Makefile | 12 + build-aux/generate.mk | 2 +- build-aux/lint.mk | 6 +- charts/emissary-ingress/Chart.lock | 6 + charts/emissary-ingress/Chart.yaml.in | 23 +- charts/emissary-ingress/ci.in/ct.sh | 7 + .../templates/ambassador-agent.yaml | 284 ------------ charts/emissary-ingress/values.yaml.in | 104 ++++- k8s-config/emissary-defaultns/require.yaml | 47 +- k8s-config/emissary-emissaryns/require.yaml | 44 +- manifests/emissary/emissary-defaultns.yaml.in | 433 +++++++++++------- .../emissary/emissary-emissaryns.yaml.in | 433 +++++++++++------- 12 files changed, 704 insertions(+), 697 deletions(-) create mode 100644 charts/emissary-ingress/Chart.lock create mode 100644 charts/emissary-ingress/ci.in/ct.sh delete mode 100644 charts/emissary-ingress/templates/ambassador-agent.yaml diff --git a/Makefile b/Makefile index 18b45ca1e3..398ba1a285 100644 --- a/Makefile +++ b/Makefile @@ -74,6 +74,17 @@ $(call module,ambassador,$(OSS_HOME)) include $(OSS_HOME)/build-aux/generate.mk include $(OSS_HOME)/build-aux/lint.mk +FORCE: +.PHONY: FORCE +.SECONDARY: + +$(OSS_HOME)/charts/emissary-ingress/charts: FORCE + if test -f ../go.mod && test "$$(cd .. && go list -m)" == github.com/emissary-ingress/emissary/v3; then \ + $(MAKE) -C .. $@; \ + else \ + cd $(@D) && helm dependency build && helm dependency update; \ + fi + .git/hooks/prepare-commit-msg: ln -s $(OSS_HOME)/tools/hooks/prepare-commit-msg $(OSS_HOME)/.git/hooks/prepare-commit-msg @@ -93,6 +104,7 @@ deploy: push preflight-cluster deploy-only: preflight-dev-kubeconfig $(tools/kubectl) build-output/yaml-$(patsubst v%,%,$(VERSION)) $(boguschart_dir) mkdir -p $(OSS_HOME)/build/helm/ && \ ($(tools/kubectl) --kubeconfig $(DEV_KUBECONFIG) create ns ambassador || true) && \ + helm dependency build && \ helm template ambassador --output-dir $(OSS_HOME)/build/helm -n ambassador $(boguschart_dir) \ --set createNamespace=true \ --set service.selector.service=ambassador \ diff --git a/build-aux/generate.mk b/build-aux/generate.mk index df48b5be1d..ac72a05025 100644 --- a/build-aux/generate.mk +++ b/build-aux/generate.mk @@ -210,7 +210,7 @@ helm.namespace.emissary-defaultns-migration = default $(OSS_HOME)/k8s-config/%/helm-expanded.yaml: \ $(OSS_HOME)/k8s-config/%/values.yaml \ $(boguschart_dir) - helm template --namespace=$(helm.namespace.$*) --values=$(@D)/values.yaml $(or $(helm.name.$*),$*) $(boguschart_dir) >$@ + helm dependency update && helm template --namespace=$(helm.namespace.$*) --values=$(@D)/values.yaml $(or $(helm.name.$*),$*) $(boguschart_dir) >$@ $(OSS_HOME)/k8s-config/%/output.yaml: \ $(OSS_HOME)/k8s-config/%/helm-expanded.yaml \ $(OSS_HOME)/k8s-config/%/require.yaml \ diff --git a/build-aux/lint.mk b/build-aux/lint.mk index 28c409dafb..20b25e80cc 100644 --- a/build-aux/lint.mk +++ b/build-aux/lint.mk @@ -54,11 +54,15 @@ format/isort: $(OSS_HOME)/venv # # Helm +HELM_TEST_IMAGE = quay.io/helmpack/chart-testing:v3.0.0-rc.1 +CHART_DIR := $(OSS_HOME)/build-output/chart-$(patsubst v%,%,$(VERSION))_$(patsubst v%,%,$(CHART_VERSION)).d +CT_EXEC = docker run --rm -v $(KIND_KUBECONFIG):/root/.kube/config -v $(CHART_DIR):/charts --network host $(HELM_TEST_IMAGE) /charts/emissary-ingress/ci.in/ct.sh lint-deps += $(tools/ct) $(chart_dir) lint-goals += lint/chart lint/chart: $(tools/ct) $(chart_dir) - cd $(chart_dir) && $(abspath $(tools/ct)) lint --config=./ct.yaml + $(CT_EXEC) install --config /charts/ct.yaml +# cd $(chart_dir) && $(abspath $(tools/ct)) lint --config=./ct.yaml .PHONY: lint/chart # diff --git a/charts/emissary-ingress/Chart.lock b/charts/emissary-ingress/Chart.lock new file mode 100644 index 0000000000..3943061207 --- /dev/null +++ b/charts/emissary-ingress/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: ambassador-agent + repository: https://s3.amazonaws.com/datawire-static-files/charts + version: 1.0.15 +digest: sha256:5b3ed48fcf6b0ee0e9638f7261dcd2a264ee72f0a5eede7d123ff2d4b3c7e958 +generated: "2023-09-28T14:30:39.695933-04:00" diff --git a/charts/emissary-ingress/Chart.yaml.in b/charts/emissary-ingress/Chart.yaml.in index b974e51986..f94cf03bf5 100644 --- a/charts/emissary-ingress/Chart.yaml.in +++ b/charts/emissary-ingress/Chart.yaml.in @@ -16,12 +16,19 @@ keywords: - emissary - emissary ingress maintainers: -- name: flydiverny - email: markus@maga.se -- name: kflynn - email: flynn@datawire.io -- name: nbkrause - email: nkrause@datawire.io -- name: lukeshu - email: lukeshu@datawire.io + - name: Alice Wasko + email: alicewasko@datawire.io + - name: Hamzah Qudsi + email: hqudsi@datawire.io + - name: Lance Austin + email: laustin@datawire.io + - name: Rick Lane + email: rlane@datawire.io + - name: Tenshin Higashi + email: thigashi@datawire.io engine: gotpl +dependencies: + - name: ambassador-agent + version: 1.0.15 + repository: https://s3.amazonaws.com/datawire-static-files/charts + condition: agent.enabled diff --git a/charts/emissary-ingress/ci.in/ct.sh b/charts/emissary-ingress/ci.in/ct.sh new file mode 100644 index 0000000000..1b256e4dc2 --- /dev/null +++ b/charts/emissary-ingress/ci.in/ct.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +set -ex + +helm repo add ambassador-agent https://s3.amazonaws.com/datawire-static-files/charts || helm repo update + +ct "$@" diff --git a/charts/emissary-ingress/templates/ambassador-agent.yaml b/charts/emissary-ingress/templates/ambassador-agent.yaml deleted file mode 100644 index 1eb4dc96c8..0000000000 --- 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", "list", "watch", "create", "delete", "patch" ] ---- -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/values.yaml.in b/charts/emissary-ingress/values.yaml.in index abe1dcaa24..4f5f7c2ba9 100644 --- a/charts/emissary-ingress/values.yaml.in +++ b/charts/emissary-ingress/values.yaml.in @@ -406,37 +406,91 @@ prometheusExporter: # +doc-gen:break # runAsUser: 8888 -# Configure the ambassador agent -agent: - # If `true`, installs the ambassador-agent Deployment, ServiceAccount and ClusterRole in the ambassador namespace, enabling the Ambassador Cloud connectivity. - enabled: true - # API token for reporting snapshots to [Ambassador Cloud](https://app.getambassador.io/cloud/); - # If empty, agent will not report snapshots - cloudConnectToken: '' - # Address of the Ambassador Cloud rpc server. - rpcAddress: https://app.getambassador.io/ - - # If `true`, Ambassador Agent will report diagnostics to Ambassador Cloud - reportDiagnostics: true - - createArgoRBAC: true +ambassador-agent: image: - # Leave blank to use image.repository and image.tag - tag: 1.0.14 - repository: docker.io/ambassador/ambassador-agent pullPolicy: IfNotPresent + # tag: - podSecurityContext: {} - # https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.26/#podsecuritycontext-v1-core - # runAsUser: 8888 + imagePullSecrets: [] + nameOverride: "" + fullnameOverride: "" - containerSecurityContext: {} - # https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.26/#securitycontext-v1-core - # allowPrivilegeEscalation: false + serviceAccount: + # Specifies whether a service account should be created + create: true + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + + podAnnotations: {} + + podSecurityContext: + {} + # fsGroup: 2000 + + securityContext: + {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + + service: + type: ClusterIP + + resources: + {} + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + + autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + + edgestack: + # agent: + # name: + # namespace: + # snapshotPort: + + rpcAddress: "" + + progressDeadline: 0 + + cloudConnectToken: "" + + logLevel: "info" + docker: + useImagePullSecret: false + imagePullSecretName: "" + + rbac: + nameOverride: "" + namespaces: [] + argo: true + + createNamespace: false - nodeSelector: {} tolerations: [] - affinity: {} + +agent: + # If `true`, installs the ambassador-agent Deployment enabling the Ambassador Cloud connectivity. + enabled: true deploymentTool: '' diff --git a/k8s-config/emissary-defaultns/require.yaml b/k8s-config/emissary-defaultns/require.yaml index 445425d58e..44960a6d1e 100644 --- a/k8s-config/emissary-defaultns/require.yaml +++ b/k8s-config/emissary-defaultns/require.yaml @@ -3,7 +3,6 @@ _anchors: resources: - { kind: Service, name: emissary-ingress-admin, namespace: *namespace } - { kind: Service, name: emissary-ingress, namespace: *namespace } - - { kind: Service, name: emissary-ingress-agent, namespace: *namespace } - { kind: ClusterRole, name: emissary-ingress } - { kind: ServiceAccount, name: emissary-ingress, namespace: *namespace } - { kind: ClusterRoleBinding, name: emissary-ingress } @@ -11,17 +10,35 @@ resources: - { kind: ClusterRole, name: emissary-ingress-watch } - { kind: Deployment, name: emissary-ingress, namespace: *namespace } - { kind: Module, name: ambassador, namespace: *namespace } - - { kind: ServiceAccount, name: emissary-ingress-agent, namespace: *namespace } - - { kind: ClusterRoleBinding, name: emissary-ingress-agent } - - { kind: ClusterRole, name: emissary-ingress-agent } - - { kind: ClusterRole, name: emissary-ingress-agent-pods } - - { kind: ClusterRole, name: emissary-ingress-agent-rollouts } - - { kind: ClusterRole, name: emissary-ingress-agent-applications } - - { kind: ClusterRole, name: emissary-ingress-agent-deployments } - - { kind: ClusterRole, name: emissary-ingress-agent-endpoints } - - { kind: ClusterRole, name: emissary-ingress-agent-configmaps } - - { kind: Role, name: emissary-ingress-agent-config, namespace: *namespace } - - { kind: RoleBinding, name: emissary-ingress-agent-config, namespace: *namespace } - - { kind: Role, name: emissary-ingress-apiext, namespace: emissary-system} - - { kind: RoleBinding, name: emissary-ingress-apiext, namespace: emissary-system} - - { kind: Deployment, name: emissary-ingress-agent, namespace: *namespace } + - { kind: Role, name: emissary-ingress-apiext, namespace: emissary-system } + - { kind: RoleBinding, name: emissary-ingress-apiext, namespace: emissary-system } + # - { kind: Service, name: emissary-ingress-agent, namespace: *namespace } + # - { kind: ServiceAccount, name: emissary-ingress-agent, namespace: *namespace } + # - { kind: ClusterRoleBinding, name: emissary-ingress-agent } + # - { kind: ClusterRole, name: emissary-ingress-agent } + # - { kind: ClusterRole, name: emissary-ingress-agent-pods } + # - { kind: ClusterRole, name: emissary-ingress-agent-rollouts } + # - { kind: ClusterRole, name: emissary-ingress-agent-applications } + # - { kind: ClusterRole, name: emissary-ingress-agent-deployments } + # - { kind: ClusterRole, name: emissary-ingress-agent-endpoints } + # - { kind: ClusterRole, name: emissary-ingress-agent-configmaps } + # - { kind: Role, name: emissary-ingress-agent-config, namespace: *namespace } + # - { kind: RoleBinding, name: emissary-ingress-agent-config, namespace: *namespace } + # - { kind: Deployment, name: emissary-ingress-agent, namespace: *namespace } + - { kind: ClusterRole, name: emissary-ingress-ambassador-agent-applications } + - { kind: ClusterRole, name: emissary-ingress-ambassador-agent-default-ns } + - { kind: ClusterRole, name: emissary-ingress-ambassador-agent-deployments } + - { kind: ClusterRole, name: emissary-ingress-ambassador-agent-endpoints } + - { kind: ClusterRole, name: emissary-ingress-ambassador-agent-ingresses } + - { kind: ClusterRole, name: emissary-ingress-ambassador-agent-pods } + - { kind: ClusterRole, name: emissary-ingress-ambassador-agent-rollouts } + - { kind: ClusterRole, name: emissary-ingress-ambassador-agent } + - { kind: ClusterRoleBinding, name: emissary-ingress-ambassador-agent } + - { kind: Deployment, name: emissary-ingress-ambassador-agent, namespace: *namespace } + - { kind: Pod, name: emissary-ingress-ambassador-agent-test-connection } + - { kind: Role, name: emissary-ingress-ambassador-agent-config, namespace: *namespace } + - { kind: Role, name: emissary-ingress-ambassador-agent-leaderelection, namespace: *namespace } + - { kind: RoleBinding, name: emissary-ingress-ambassador-agent-config, namespace: *namespace } + - { kind: RoleBinding, name: emissary-ingress-ambassador-agent-leaderelection, namespace: *namespace } + - { kind: Service, name: emissary-ingress-ambassador-agent, namespace: *namespace } + - { kind: ServiceAccount, name: emissary-ingress-ambassador-agent, namespace: *namespace } diff --git a/k8s-config/emissary-emissaryns/require.yaml b/k8s-config/emissary-emissaryns/require.yaml index 42146be22d..51a70b1924 100644 --- a/k8s-config/emissary-emissaryns/require.yaml +++ b/k8s-config/emissary-emissaryns/require.yaml @@ -3,7 +3,6 @@ _anchors: resources: - { kind: Service, name: emissary-ingress-admin, namespace: *namespace } - { kind: Service, name: emissary-ingress, namespace: *namespace } - - { kind: Service, name: emissary-ingress-agent, namespace: *namespace } - { kind: ClusterRole, name: emissary-ingress } - { kind: ServiceAccount, name: emissary-ingress, namespace: *namespace } - { kind: ClusterRoleBinding, name: emissary-ingress } @@ -11,17 +10,36 @@ resources: - { kind: ClusterRole, name: emissary-ingress-watch } - { kind: Deployment, name: emissary-ingress, namespace: *namespace } - { kind: Module, name: ambassador, namespace: *namespace } - - { kind: ServiceAccount, name: emissary-ingress-agent, namespace: *namespace } - - { kind: ClusterRoleBinding, name: emissary-ingress-agent } - - { kind: ClusterRole, name: emissary-ingress-agent } - - { kind: ClusterRole, name: emissary-ingress-agent-pods } - - { kind: ClusterRole, name: emissary-ingress-agent-rollouts } - - { kind: ClusterRole, name: emissary-ingress-agent-applications } - - { kind: ClusterRole, name: emissary-ingress-agent-deployments } - - { kind: ClusterRole, name: emissary-ingress-agent-endpoints } - - { kind: ClusterRole, name: emissary-ingress-agent-configmaps } - - { kind: Role, name: emissary-ingress-agent-config, namespace: *namespace } - - { kind: RoleBinding, name: emissary-ingress-agent-config, namespace: *namespace } - { kind: Role, name: emissary-ingress-apiext, namespace: emissary-system} - { kind: RoleBinding, name: emissary-ingress-apiext, namespace: emissary-system} - - { kind: Deployment, name: emissary-ingress-agent, namespace: *namespace } + # - { kind: Service, name: emissary-ingress-agent, namespace: *namespace } + # - { kind: ServiceAccount, name: emissary-ingress-agent, namespace: *namespace } + # - { kind: ClusterRoleBinding, name: emissary-ingress-agent } + # - { kind: ClusterRole, name: emissary-ingress-agent } + # - { kind: ClusterRole, name: emissary-ingress-agent-pods } + # - { kind: ClusterRole, name: emissary-ingress-agent-rollouts } + # - { kind: ClusterRole, name: emissary-ingress-agent-applications } + # - { kind: ClusterRole, name: emissary-ingress-agent-deployments } + # - { kind: ClusterRole, name: emissary-ingress-agent-endpoints } + # - { kind: ClusterRole, name: emissary-ingress-agent-configmaps } + # - { kind: Role, name: emissary-ingress-agent-config, namespace: *namespace } + # - { kind: RoleBinding, name: emissary-ingress-agent-config, namespace: *namespace } + # - { kind: Deployment, name: emissary-ingress-agent, namespace: *namespace } + - { kind: ClusterRole, name: emissary-ingress-ambassador-agent-applications } + - { kind: ClusterRole, name: emissary-ingress-ambassador-agent-default-ns } + - { kind: ClusterRole, name: emissary-ingress-ambassador-agent-deployments } + - { kind: ClusterRole, name: emissary-ingress-ambassador-agent-endpoints } + - { kind: ClusterRole, name: emissary-ingress-ambassador-agent-ingresses } + - { kind: ClusterRole, name: emissary-ingress-ambassador-agent-pods } + - { kind: ClusterRole, name: emissary-ingress-ambassador-agent-rollouts } + - { kind: ClusterRole, name: emissary-ingress-ambassador-agent } + - { kind: ClusterRoleBinding, name: emissary-ingress-ambassador-agent } + - { kind: Deployment, name: emissary-ingress-ambassador-agent, namespace: *namespace } + - { kind: Pod, name: emissary-ingress-ambassador-agent-test-connection } + - { kind: Role, name: emissary-ingress-ambassador-agent-config, namespace: *namespace } + - { kind: Role, name: emissary-ingress-ambassador-agent-leaderelection, namespace: *namespace } + - { kind: RoleBinding, name: emissary-ingress-ambassador-agent-config, namespace: *namespace } + - { kind: RoleBinding, name: emissary-ingress-ambassador-agent-leaderelection, namespace: *namespace } + - { kind: Service, name: emissary-ingress-ambassador-agent, namespace: *namespace } + - { kind: ServiceAccount, name: emissary-ingress-ambassador-agent, namespace: *namespace } + diff --git a/manifests/emissary/emissary-defaultns.yaml.in b/manifests/emissary/emissary-defaultns.yaml.in index cd7e87ac4b..a1da18a261 100644 --- a/manifests/emissary/emissary-defaultns.yaml.in +++ b/manifests/emissary/emissary-defaultns.yaml.in @@ -74,23 +74,6 @@ spec: profile: main type: LoadBalancer --- -apiVersion: v1 -kind: Service -metadata: - labels: - product: aes - name: emissary-ingress-agent - namespace: default -spec: - ports: - - name: http - port: 80 - protocol: TCP - targetPort: http - selector: - app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/name: emissary-ingress-agent ---- aggregationRule: clusterRoleSelectors: - matchLabels: @@ -407,113 +390,129 @@ spec: allow_non_local: true enabled: false --- -apiVersion: v1 -kind: ServiceAccount +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress-agent + app.kubernetes.io/name: emissary-ingress app.kubernetes.io/part-of: emissary-ingress product: aes - name: emissary-ingress-agent - namespace: default + rbac.getambassador.io/role-group: emissary-ingress + name: emissary-ingress-apiext + namespace: emissary-system +rules: +- apiGroups: + - apps + resources: + - deployments + verbs: + - get + - list + - watch --- apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding +kind: RoleBinding metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress-agent + app.kubernetes.io/name: emissary-ingress app.kubernetes.io/part-of: emissary-ingress product: aes - name: emissary-ingress-agent + name: emissary-ingress-apiext + namespace: emissary-system roleRef: apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: emissary-ingress-agent + kind: Role + name: emissary-ingress-apiext subjects: - kind: ServiceAccount - name: emissary-ingress-agent + name: emissary-ingress namespace: default --- -aggregationRule: - clusterRoleSelectors: - - matchLabels: - rbac.getambassador.io/role-group: emissary-ingress-agent apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress-agent - app.kubernetes.io/part-of: emissary-ingress - product: aes - name: emissary-ingress-agent -rules: [] + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent + name: emissary-ingress-ambassador-agent-applications +rules: +- apiGroups: + - argoproj.io + resources: + - applications + verbs: + - get + - list + - watch --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress-agent - app.kubernetes.io/part-of: emissary-ingress - product: aes - rbac.getambassador.io/role-group: emissary-ingress-agent - name: emissary-ingress-agent-pods + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent + name: emissary-ingress-ambassador-agent-default-ns rules: - apiGroups: - "" + resourceNames: + - default resources: - - pods + - namespaces verbs: - get - - list - - watch --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress-agent - app.kubernetes.io/part-of: emissary-ingress - product: aes - rbac.getambassador.io/role-group: emissary-ingress-agent - name: emissary-ingress-agent-rollouts + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent + name: emissary-ingress-ambassador-agent-deployments rules: - apiGroups: - - argoproj.io + - apps + - extensions resources: - - rollouts - - rollouts/status + - deployments verbs: - get - list - watch - - patch --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress-agent - app.kubernetes.io/part-of: emissary-ingress - product: aes - rbac.getambassador.io/role-group: emissary-ingress-agent - name: emissary-ingress-agent-applications + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent + name: emissary-ingress-ambassador-agent-endpoints rules: - apiGroups: - - argoproj.io + - "" resources: - - applications + - endpoints + - services verbs: - get - list @@ -524,18 +523,18 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress-agent - app.kubernetes.io/part-of: emissary-ingress - product: aes - rbac.getambassador.io/role-group: emissary-ingress-agent - name: emissary-ingress-agent-deployments + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent + name: emissary-ingress-ambassador-agent-ingresses rules: - apiGroups: - - apps + - networking.k8s.io - extensions resources: - - deployments + - ingresses verbs: - get - list @@ -546,17 +545,17 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress-agent - app.kubernetes.io/part-of: emissary-ingress - product: aes - rbac.getambassador.io/role-group: emissary-ingress-agent - name: emissary-ingress-agent-endpoints + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent + name: emissary-ingress-ambassador-agent-pods rules: - apiGroups: - "" resources: - - endpoints + - pods verbs: - get - list @@ -567,32 +566,137 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress-agent - app.kubernetes.io/part-of: emissary-ingress - product: aes - rbac.getambassador.io/role-group: emissary-ingress-agent - name: emissary-ingress-agent-configmaps + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent + name: emissary-ingress-ambassador-agent-rollouts rules: - apiGroups: - - "" + - argoproj.io resources: - - configmaps + - rollouts + - rollouts/status verbs: - get - list - watch + - patch +--- +aggregationRule: + clusterRoleSelectors: + - matchLabels: + rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + labels: + app.kubernetes.io/instance: emissary-ingress + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + name: emissary-ingress-ambassador-agent +rules: [] +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + labels: + app.kubernetes.io/instance: emissary-ingress + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + name: emissary-ingress-ambassador-agent +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: emissary-ingress-ambassador-agent +subjects: +- kind: ServiceAccount + name: emissary-ingress-ambassador-agent + namespace: default +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + app.kubernetes.io/instance: emissary-ingress + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + name: emissary-ingress-ambassador-agent + namespace: default +spec: + replicas: null + selector: + matchLabels: + app.kubernetes.io/instance: emissary-ingress + app.kubernetes.io/name: ambassador-agent + template: + metadata: + labels: + app.kubernetes.io/instance: emissary-ingress + app.kubernetes.io/name: ambassador-agent + spec: + containers: + - env: + - name: LOG_LEVEL + value: info + - name: AGENT_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: AGENT_CONFIG_RESOURCE_NAME + value: emissary-ingress-ambassador-agent-cloud-token + - name: RPC_CONNECTION_ADDRESS + value: null + image: docker.io/ambassador/ambassador-agent:1.0.15 + imagePullPolicy: IfNotPresent + name: ambassador-agent + ports: + - containerPort: 8080 + name: http + resources: {} + securityContext: {} + securityContext: {} + serviceAccountName: emissary-ingress-ambassador-agent +--- +apiVersion: v1 +kind: Pod +metadata: + annotations: + helm.sh/hook: test + labels: + app.kubernetes.io/instance: emissary-ingress + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + name: emissary-ingress-ambassador-agent-test-connection +spec: + containers: + - args: + - 'emissary-ingress-ambassador-agent:' + command: + - wget + image: busybox + name: wget + restartPolicy: Never --- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: labels: app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress-agent - app.kubernetes.io/part-of: emissary-ingress - product: aes - name: emissary-ingress-agent-config + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + name: emissary-ingress-ambassador-agent-config namespace: default rules: - apiGroups: @@ -610,120 +714,99 @@ rules: verbs: - get - list - - watch - create - delete - patch + - watch +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + labels: + app.kubernetes.io/instance: emissary-ingress + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + name: emissary-ingress-ambassador-agent-leaderelection + namespace: default +rules: +- apiGroups: + - coordination.k8s.io + resources: + - leases + verbs: + - '*' --- apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: labels: app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress-agent - app.kubernetes.io/part-of: emissary-ingress - product: aes - name: emissary-ingress-agent-config + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + name: emissary-ingress-ambassador-agent-config namespace: default roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: emissary-ingress-agent-config + name: emissary-ingress-ambassador-agent-config subjects: - kind: ServiceAccount - name: emissary-ingress-agent + name: emissary-ingress-ambassador-agent namespace: default --- apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - labels: - app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress - app.kubernetes.io/part-of: emissary-ingress - product: aes - rbac.getambassador.io/role-group: emissary-ingress - name: emissary-ingress-apiext - namespace: emissary-system -rules: -- apiGroups: - - apps - resources: - - deployments - verbs: - - get - - list - - watch ---- -apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: labels: app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress - app.kubernetes.io/part-of: emissary-ingress - product: aes - name: emissary-ingress-apiext - namespace: emissary-system + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + name: emissary-ingress-ambassador-agent-leaderelection + namespace: default roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: emissary-ingress-apiext + name: emissary-ingress-ambassador-agent-leaderelection subjects: - kind: ServiceAccount - name: emissary-ingress + name: emissary-ingress-ambassador-agent namespace: default --- -apiVersion: apps/v1 -kind: Deployment +apiVersion: v1 +kind: Service metadata: labels: app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress-agent - app.kubernetes.io/part-of: emissary-ingress - product: aes - name: emissary-ingress-agent + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + name: emissary-ingress-ambassador-agent namespace: default spec: - progressDeadlineSeconds: 600 - replicas: 1 + ports: + - name: http + port: 80 + targetPort: http selector: - matchLabels: - app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/name: emissary-ingress-agent - template: - metadata: - labels: - app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress-agent - app.kubernetes.io/part-of: emissary-ingress - product: aes - spec: - containers: - - env: - - name: AGENT_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: AGENT_CONFIG_RESOURCE_NAME - value: emissary-ingress-agent-cloud-token - - name: RPC_CONNECTION_ADDRESS - value: https://app.getambassador.io/ - - name: AES_SNAPSHOT_URL - value: http://emissary-ingress-admin.default:8005/snapshot-external - - name: AES_REPORT_DIAGNOSTICS_TO_CLOUD - value: "true" - - name: AES_DIAGNOSTICS_URL - value: http://emissary-ingress-admin.default:8877/ambassador/v0/diag/?json=true - image: docker.io/ambassador/ambassador-agent:1.0.14 - imagePullPolicy: IfNotPresent - name: agent - ports: - - containerPort: 8080 - name: http - serviceAccountName: emissary-ingress-agent + app.kubernetes.io/instance: emissary-ingress + app.kubernetes.io/name: ambassador-agent + type: ClusterIP +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + labels: + app.kubernetes.io/instance: emissary-ingress + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + name: emissary-ingress-ambassador-agent + namespace: default diff --git a/manifests/emissary/emissary-emissaryns.yaml.in b/manifests/emissary/emissary-emissaryns.yaml.in index f4159f11d1..1a069111e0 100644 --- a/manifests/emissary/emissary-emissaryns.yaml.in +++ b/manifests/emissary/emissary-emissaryns.yaml.in @@ -74,23 +74,6 @@ spec: profile: main type: LoadBalancer --- -apiVersion: v1 -kind: Service -metadata: - labels: - product: aes - name: emissary-ingress-agent - namespace: emissary -spec: - ports: - - name: http - port: 80 - protocol: TCP - targetPort: http - selector: - app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/name: emissary-ingress-agent ---- aggregationRule: clusterRoleSelectors: - matchLabels: @@ -407,113 +390,129 @@ spec: allow_non_local: true enabled: false --- -apiVersion: v1 -kind: ServiceAccount +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress-agent + app.kubernetes.io/name: emissary-ingress app.kubernetes.io/part-of: emissary-ingress product: aes - name: emissary-ingress-agent - namespace: emissary + rbac.getambassador.io/role-group: emissary-ingress + name: emissary-ingress-apiext + namespace: emissary-system +rules: +- apiGroups: + - apps + resources: + - deployments + verbs: + - get + - list + - watch --- apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding +kind: RoleBinding metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress-agent + app.kubernetes.io/name: emissary-ingress app.kubernetes.io/part-of: emissary-ingress product: aes - name: emissary-ingress-agent + name: emissary-ingress-apiext + namespace: emissary-system roleRef: apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: emissary-ingress-agent + kind: Role + name: emissary-ingress-apiext subjects: - kind: ServiceAccount - name: emissary-ingress-agent + name: emissary-ingress namespace: emissary --- -aggregationRule: - clusterRoleSelectors: - - matchLabels: - rbac.getambassador.io/role-group: emissary-ingress-agent apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress-agent - app.kubernetes.io/part-of: emissary-ingress - product: aes - name: emissary-ingress-agent -rules: [] + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent + name: emissary-ingress-ambassador-agent-applications +rules: +- apiGroups: + - argoproj.io + resources: + - applications + verbs: + - get + - list + - watch --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress-agent - app.kubernetes.io/part-of: emissary-ingress - product: aes - rbac.getambassador.io/role-group: emissary-ingress-agent - name: emissary-ingress-agent-pods + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent + name: emissary-ingress-ambassador-agent-default-ns rules: - apiGroups: - "" + resourceNames: + - default resources: - - pods + - namespaces verbs: - get - - list - - watch --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress-agent - app.kubernetes.io/part-of: emissary-ingress - product: aes - rbac.getambassador.io/role-group: emissary-ingress-agent - name: emissary-ingress-agent-rollouts + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent + name: emissary-ingress-ambassador-agent-deployments rules: - apiGroups: - - argoproj.io + - apps + - extensions resources: - - rollouts - - rollouts/status + - deployments verbs: - get - list - watch - - patch --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress-agent - app.kubernetes.io/part-of: emissary-ingress - product: aes - rbac.getambassador.io/role-group: emissary-ingress-agent - name: emissary-ingress-agent-applications + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent + name: emissary-ingress-ambassador-agent-endpoints rules: - apiGroups: - - argoproj.io + - "" resources: - - applications + - endpoints + - services verbs: - get - list @@ -524,18 +523,18 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress-agent - app.kubernetes.io/part-of: emissary-ingress - product: aes - rbac.getambassador.io/role-group: emissary-ingress-agent - name: emissary-ingress-agent-deployments + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent + name: emissary-ingress-ambassador-agent-ingresses rules: - apiGroups: - - apps + - networking.k8s.io - extensions resources: - - deployments + - ingresses verbs: - get - list @@ -546,17 +545,17 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress-agent - app.kubernetes.io/part-of: emissary-ingress - product: aes - rbac.getambassador.io/role-group: emissary-ingress-agent - name: emissary-ingress-agent-endpoints + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent + name: emissary-ingress-ambassador-agent-pods rules: - apiGroups: - "" resources: - - endpoints + - pods verbs: - get - list @@ -567,32 +566,137 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress-agent - app.kubernetes.io/part-of: emissary-ingress - product: aes - rbac.getambassador.io/role-group: emissary-ingress-agent - name: emissary-ingress-agent-configmaps + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent + name: emissary-ingress-ambassador-agent-rollouts rules: - apiGroups: - - "" + - argoproj.io resources: - - configmaps + - rollouts + - rollouts/status verbs: - get - list - watch + - patch +--- +aggregationRule: + clusterRoleSelectors: + - matchLabels: + rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + labels: + app.kubernetes.io/instance: emissary-ingress + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + name: emissary-ingress-ambassador-agent +rules: [] +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + labels: + app.kubernetes.io/instance: emissary-ingress + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + name: emissary-ingress-ambassador-agent +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: emissary-ingress-ambassador-agent +subjects: +- kind: ServiceAccount + name: emissary-ingress-ambassador-agent + namespace: emissary +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + app.kubernetes.io/instance: emissary-ingress + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + name: emissary-ingress-ambassador-agent + namespace: emissary +spec: + replicas: null + selector: + matchLabels: + app.kubernetes.io/instance: emissary-ingress + app.kubernetes.io/name: ambassador-agent + template: + metadata: + labels: + app.kubernetes.io/instance: emissary-ingress + app.kubernetes.io/name: ambassador-agent + spec: + containers: + - env: + - name: LOG_LEVEL + value: info + - name: AGENT_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: AGENT_CONFIG_RESOURCE_NAME + value: emissary-ingress-ambassador-agent-cloud-token + - name: RPC_CONNECTION_ADDRESS + value: null + image: docker.io/ambassador/ambassador-agent:1.0.15 + imagePullPolicy: IfNotPresent + name: ambassador-agent + ports: + - containerPort: 8080 + name: http + resources: {} + securityContext: {} + securityContext: {} + serviceAccountName: emissary-ingress-ambassador-agent +--- +apiVersion: v1 +kind: Pod +metadata: + annotations: + helm.sh/hook: test + labels: + app.kubernetes.io/instance: emissary-ingress + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + name: emissary-ingress-ambassador-agent-test-connection +spec: + containers: + - args: + - 'emissary-ingress-ambassador-agent:' + command: + - wget + image: busybox + name: wget + restartPolicy: Never --- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: labels: app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress-agent - app.kubernetes.io/part-of: emissary-ingress - product: aes - name: emissary-ingress-agent-config + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + name: emissary-ingress-ambassador-agent-config namespace: emissary rules: - apiGroups: @@ -610,120 +714,99 @@ rules: verbs: - get - list - - watch - create - delete - patch + - watch +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + labels: + app.kubernetes.io/instance: emissary-ingress + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + name: emissary-ingress-ambassador-agent-leaderelection + namespace: emissary +rules: +- apiGroups: + - coordination.k8s.io + resources: + - leases + verbs: + - '*' --- apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: labels: app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress-agent - app.kubernetes.io/part-of: emissary-ingress - product: aes - name: emissary-ingress-agent-config + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + name: emissary-ingress-ambassador-agent-config namespace: emissary roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: emissary-ingress-agent-config + name: emissary-ingress-ambassador-agent-config subjects: - kind: ServiceAccount - name: emissary-ingress-agent + name: emissary-ingress-ambassador-agent namespace: emissary --- apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - labels: - app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress - app.kubernetes.io/part-of: emissary-ingress - product: aes - rbac.getambassador.io/role-group: emissary-ingress - name: emissary-ingress-apiext - namespace: emissary-system -rules: -- apiGroups: - - apps - resources: - - deployments - verbs: - - get - - list - - watch ---- -apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: labels: app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress - app.kubernetes.io/part-of: emissary-ingress - product: aes - name: emissary-ingress-apiext - namespace: emissary-system + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + name: emissary-ingress-ambassador-agent-leaderelection + namespace: emissary roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: emissary-ingress-apiext + name: emissary-ingress-ambassador-agent-leaderelection subjects: - kind: ServiceAccount - name: emissary-ingress + name: emissary-ingress-ambassador-agent namespace: emissary --- -apiVersion: apps/v1 -kind: Deployment +apiVersion: v1 +kind: Service metadata: labels: app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress-agent - app.kubernetes.io/part-of: emissary-ingress - product: aes - name: emissary-ingress-agent + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + name: emissary-ingress-ambassador-agent namespace: emissary spec: - progressDeadlineSeconds: 600 - replicas: 1 + ports: + - name: http + port: 80 + targetPort: http selector: - matchLabels: - app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/name: emissary-ingress-agent - template: - metadata: - labels: - app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/managed-by: getambassador.io - app.kubernetes.io/name: emissary-ingress-agent - app.kubernetes.io/part-of: emissary-ingress - product: aes - spec: - containers: - - env: - - name: AGENT_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: AGENT_CONFIG_RESOURCE_NAME - value: emissary-ingress-agent-cloud-token - - name: RPC_CONNECTION_ADDRESS - value: https://app.getambassador.io/ - - name: AES_SNAPSHOT_URL - value: http://emissary-ingress-admin.emissary:8005/snapshot-external - - name: AES_REPORT_DIAGNOSTICS_TO_CLOUD - value: "true" - - name: AES_DIAGNOSTICS_URL - value: http://emissary-ingress-admin.emissary:8877/ambassador/v0/diag/?json=true - image: docker.io/ambassador/ambassador-agent:1.0.14 - imagePullPolicy: IfNotPresent - name: agent - ports: - - containerPort: 8080 - name: http - serviceAccountName: emissary-ingress-agent + app.kubernetes.io/instance: emissary-ingress + app.kubernetes.io/name: ambassador-agent + type: ClusterIP +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + labels: + app.kubernetes.io/instance: emissary-ingress + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/version: 1.0.15 + helm.sh/chart: ambassador-agent-1.0.15 + name: emissary-ingress-ambassador-agent + namespace: emissary From 0118f215243fdd7f88e0653d3bfa9baa313d7935 Mon Sep 17 00:00:00 2001 From: Tenshin Higashi Date: Thu, 12 Oct 2023 14:11:52 -0400 Subject: [PATCH 2/9] Updating Makefile Signed-off-by: Tenshin Higashi --- Makefile | 41 +++++++++++++++++++++++++-------- build-aux/lint.mk | 7 +----- charts/emissary-ingress/ct.yaml | 3 +++ 3 files changed, 35 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 398ba1a285..350b182e10 100644 --- a/Makefile +++ b/Makefile @@ -74,16 +74,37 @@ $(call module,ambassador,$(OSS_HOME)) include $(OSS_HOME)/build-aux/generate.mk include $(OSS_HOME)/build-aux/lint.mk -FORCE: -.PHONY: FORCE -.SECONDARY: - -$(OSS_HOME)/charts/emissary-ingress/charts: FORCE - if test -f ../go.mod && test "$$(cd .. && go list -m)" == github.com/emissary-ingress/emissary/v3; then \ - $(MAKE) -C .. $@; \ - else \ - cd $(@D) && helm dependency build && helm dependency update; \ +HELM_TEST_IMAGE = quay.io/helmpack/chart-testing:v3.0.0-rc.1 +CHART_DIR := $(OSS_HOME)/build-output/chart-$(patsubst v%,%,$(VERSION))_$(patsubst v%,%,$(CHART_VERSION)).d +CT_EXEC = docker run --rm -v $(KIND_KUBECONFIG):/root/.kube/config -v $(CHART_DIR) --network host $(HELM_TEST_IMAGE) $(CHART_DIR)/ci.in/ct.sh + +# FORCE: +# .PHONY: FORCE +# .SECONDARY: + +# $(OSS_HOME)/charts/emissary-ingress/charts: FORCE +# if test -f ../go.mod && test "$$(cd .. && go list -m)" == github.com/emissary-ingress/emissary/v3; then \ +# $(MAKE) -C .. $@; \ +# else \ +# cd $(@D) && helm dependency build && helm dependency update; \ +# fi + +chart/lint: preflight-dev-kubeconfig + $(CT_EXEC) install --config /ct.yaml +.PHONY: chart/lint + +chart/k3d-test: preflight-dev-kubeconfig + # check if k3d is installed + @if ! command -v k3d 2> /dev/null ; then \ + printf 'k3d not installed, plz do that'; \ + false; \ fi +.PHONY: chart/k3d-test + +chart/test: chart/lint chart/k3d-test ci/setup-k3d + $(CT_EXEC) install --config /ct.yaml && \ + $(MAKE) chart/delete-cluster +.PHONY: chart/test .git/hooks/prepare-commit-msg: ln -s $(OSS_HOME)/tools/hooks/prepare-commit-msg $(OSS_HOME)/.git/hooks/prepare-commit-msg @@ -101,7 +122,7 @@ deploy: push preflight-cluster $(MAKE) deploy-only .PHONY: deploy -deploy-only: preflight-dev-kubeconfig $(tools/kubectl) build-output/yaml-$(patsubst v%,%,$(VERSION)) $(boguschart_dir) +deploy-only: preflight-dev-kubeconfig chart/test $(tools/kubectl) build-output/yaml-$(patsubst v%,%,$(VERSION)) $(boguschart_dir) mkdir -p $(OSS_HOME)/build/helm/ && \ ($(tools/kubectl) --kubeconfig $(DEV_KUBECONFIG) create ns ambassador || true) && \ helm dependency build && \ diff --git a/build-aux/lint.mk b/build-aux/lint.mk index 20b25e80cc..62ca0bece7 100644 --- a/build-aux/lint.mk +++ b/build-aux/lint.mk @@ -54,15 +54,10 @@ format/isort: $(OSS_HOME)/venv # # Helm -HELM_TEST_IMAGE = quay.io/helmpack/chart-testing:v3.0.0-rc.1 -CHART_DIR := $(OSS_HOME)/build-output/chart-$(patsubst v%,%,$(VERSION))_$(patsubst v%,%,$(CHART_VERSION)).d -CT_EXEC = docker run --rm -v $(KIND_KUBECONFIG):/root/.kube/config -v $(CHART_DIR):/charts --network host $(HELM_TEST_IMAGE) /charts/emissary-ingress/ci.in/ct.sh - lint-deps += $(tools/ct) $(chart_dir) lint-goals += lint/chart lint/chart: $(tools/ct) $(chart_dir) - $(CT_EXEC) install --config /charts/ct.yaml -# cd $(chart_dir) && $(abspath $(tools/ct)) lint --config=./ct.yaml + cd $(chart_dir) && $(abspath $(tools/ct)) lint --config=./ct.yaml .PHONY: lint/chart # diff --git a/charts/emissary-ingress/ct.yaml b/charts/emissary-ingress/ct.yaml index 941cd63155..ec1fb3ebed 100644 --- a/charts/emissary-ingress/ct.yaml +++ b/charts/emissary-ingress/ct.yaml @@ -19,6 +19,9 @@ charts: - ./ chart-dirs: - ./ +chart-repos: + - datawire=https://s3.amazonaws.com/datawire-static-files/charts/ + - datawiredev=https://s3.amazonaws.com/datawire-static-files/charts-dev/ # namespace: ambassador From 68dfa083c56707f08f99180ed6f8d6a1ad0dcee7 Mon Sep 17 00:00:00 2001 From: Tenshin Higashi Date: Thu, 12 Oct 2023 14:44:59 -0400 Subject: [PATCH 3/9] Updating chart.yaml to v2 Signed-off-by: Tenshin Higashi --- build-aux/generate.mk | 2 +- charts/emissary-ingress/Chart.yaml.in | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build-aux/generate.mk b/build-aux/generate.mk index ac72a05025..df48b5be1d 100644 --- a/build-aux/generate.mk +++ b/build-aux/generate.mk @@ -210,7 +210,7 @@ helm.namespace.emissary-defaultns-migration = default $(OSS_HOME)/k8s-config/%/helm-expanded.yaml: \ $(OSS_HOME)/k8s-config/%/values.yaml \ $(boguschart_dir) - helm dependency update && helm template --namespace=$(helm.namespace.$*) --values=$(@D)/values.yaml $(or $(helm.name.$*),$*) $(boguschart_dir) >$@ + helm template --namespace=$(helm.namespace.$*) --values=$(@D)/values.yaml $(or $(helm.name.$*),$*) $(boguschart_dir) >$@ $(OSS_HOME)/k8s-config/%/output.yaml: \ $(OSS_HOME)/k8s-config/%/helm-expanded.yaml \ $(OSS_HOME)/k8s-config/%/require.yaml \ diff --git a/charts/emissary-ingress/Chart.yaml.in b/charts/emissary-ingress/Chart.yaml.in index f94cf03bf5..4ed8e7bfd6 100644 --- a/charts/emissary-ingress/Chart.yaml.in +++ b/charts/emissary-ingress/Chart.yaml.in @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: v2 appVersion: @version@ description: A Helm chart for Emissary Ingress name: emissary-ingress @@ -26,7 +26,6 @@ maintainers: email: rlane@datawire.io - name: Tenshin Higashi email: thigashi@datawire.io -engine: gotpl dependencies: - name: ambassador-agent version: 1.0.15 From b2db8eab92faa0bbc7632f2d37a1b83b22614540 Mon Sep 17 00:00:00 2001 From: Tenshin Higashi Date: Thu, 12 Oct 2023 15:51:31 -0400 Subject: [PATCH 4/9] Fixing make commands Signed-off-by: Tenshin Higashi --- .github/actions/setup-deps/action.yml | 7 ++++++- Makefile | 13 +------------ build-aux/generate.mk | 6 +++++- build-aux/lint.mk | 1 + charts/emissary-ingress/values.yaml.in | 1 + k8s-config/emissary-defaultns/Chart.lock | 6 ++++++ k8s-config/emissary-defaultns/values.yaml | 3 +++ k8s-config/emissary-emissaryns/Chart.lock | 6 ++++++ k8s-config/emissary-emissaryns/values.yaml | 3 +++ k8s-config/kat-ambassador/Chart.lock | 6 ++++++ k8s-config/kat-rbac-multinamespace/Chart.lock | 6 ++++++ k8s-config/kat-rbac-singlenamespace/Chart.lock | 6 ++++++ manifests/emissary/emissary-defaultns.yaml.in | 2 +- manifests/emissary/emissary-emissaryns.yaml.in | 2 +- 14 files changed, 52 insertions(+), 16 deletions(-) create mode 100644 k8s-config/emissary-defaultns/Chart.lock create mode 100644 k8s-config/emissary-emissaryns/Chart.lock create mode 100644 k8s-config/kat-ambassador/Chart.lock create mode 100644 k8s-config/kat-rbac-multinamespace/Chart.lock create mode 100644 k8s-config/kat-rbac-singlenamespace/Chart.lock diff --git a/.github/actions/setup-deps/action.yml b/.github/actions/setup-deps/action.yml index 9326a19831..6d08cae349 100644 --- a/.github/actions/setup-deps/action.yml +++ b/.github/actions/setup-deps/action.yml @@ -34,4 +34,9 @@ runs: - name: "Install Python requirements with pip" shell: bash run: python -m pip install awscli packaging - + # Helm Deps + - name: "Install Helm Dependencies" + shell: bash + run: | + helm repo add ambassador-agent https://s3.amazonaws.com/datawire-static-files/charts + helm repo update diff --git a/Makefile b/Makefile index 350b182e10..d370a21120 100644 --- a/Makefile +++ b/Makefile @@ -78,19 +78,8 @@ HELM_TEST_IMAGE = quay.io/helmpack/chart-testing:v3.0.0-rc.1 CHART_DIR := $(OSS_HOME)/build-output/chart-$(patsubst v%,%,$(VERSION))_$(patsubst v%,%,$(CHART_VERSION)).d CT_EXEC = docker run --rm -v $(KIND_KUBECONFIG):/root/.kube/config -v $(CHART_DIR) --network host $(HELM_TEST_IMAGE) $(CHART_DIR)/ci.in/ct.sh -# FORCE: -# .PHONY: FORCE -# .SECONDARY: - -# $(OSS_HOME)/charts/emissary-ingress/charts: FORCE -# if test -f ../go.mod && test "$$(cd .. && go list -m)" == github.com/emissary-ingress/emissary/v3; then \ -# $(MAKE) -C .. $@; \ -# else \ -# cd $(@D) && helm dependency build && helm dependency update; \ -# fi - chart/lint: preflight-dev-kubeconfig - $(CT_EXEC) install --config /ct.yaml + $(CT_EXEC) lint --config /ct.yaml .PHONY: chart/lint chart/k3d-test: preflight-dev-kubeconfig diff --git a/build-aux/generate.mk b/build-aux/generate.mk index df48b5be1d..d4fc3e03df 100644 --- a/build-aux/generate.mk +++ b/build-aux/generate.mk @@ -207,7 +207,11 @@ helm.namespace.emissary-defaultns-migration = default # IF YOU'RE LOOKING FOR *.yaml: recipes, look in main.mk. -$(OSS_HOME)/k8s-config/%/helm-expanded.yaml: \ +helm-dependency: $(boguschart_dir) + cd $(boguschart_dir) && helm dependency build +.PHONY: helm-dependency + +$(OSS_HOME)/k8s-config/%/helm-expanded.yaml: helm-dependency \ $(OSS_HOME)/k8s-config/%/values.yaml \ $(boguschart_dir) helm template --namespace=$(helm.namespace.$*) --values=$(@D)/values.yaml $(or $(helm.name.$*),$*) $(boguschart_dir) >$@ diff --git a/build-aux/lint.mk b/build-aux/lint.mk index 62ca0bece7..28c409dafb 100644 --- a/build-aux/lint.mk +++ b/build-aux/lint.mk @@ -54,6 +54,7 @@ format/isort: $(OSS_HOME)/venv # # Helm + lint-deps += $(tools/ct) $(chart_dir) lint-goals += lint/chart lint/chart: $(tools/ct) $(chart_dir) diff --git a/charts/emissary-ingress/values.yaml.in b/charts/emissary-ingress/values.yaml.in index 4f5f7c2ba9..f41ad095fa 100644 --- a/charts/emissary-ingress/values.yaml.in +++ b/charts/emissary-ingress/values.yaml.in @@ -441,6 +441,7 @@ ambassador-agent: service: type: ClusterIP + port: 8080 resources: {} diff --git a/k8s-config/emissary-defaultns/Chart.lock b/k8s-config/emissary-defaultns/Chart.lock new file mode 100644 index 0000000000..3943061207 --- /dev/null +++ b/k8s-config/emissary-defaultns/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: ambassador-agent + repository: https://s3.amazonaws.com/datawire-static-files/charts + version: 1.0.15 +digest: sha256:5b3ed48fcf6b0ee0e9638f7261dcd2a264ee72f0a5eede7d123ff2d4b3c7e958 +generated: "2023-09-28T14:30:39.695933-04:00" diff --git a/k8s-config/emissary-defaultns/values.yaml b/k8s-config/emissary-defaultns/values.yaml index 8ba3e0d574..c2b9962a69 100644 --- a/k8s-config/emissary-defaultns/values.yaml +++ b/k8s-config/emissary-defaultns/values.yaml @@ -32,3 +32,6 @@ image: waitForApiext: enabled: true createRoles: true + +agent: + enabled: true diff --git a/k8s-config/emissary-emissaryns/Chart.lock b/k8s-config/emissary-emissaryns/Chart.lock new file mode 100644 index 0000000000..3943061207 --- /dev/null +++ b/k8s-config/emissary-emissaryns/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: ambassador-agent + repository: https://s3.amazonaws.com/datawire-static-files/charts + version: 1.0.15 +digest: sha256:5b3ed48fcf6b0ee0e9638f7261dcd2a264ee72f0a5eede7d123ff2d4b3c7e958 +generated: "2023-09-28T14:30:39.695933-04:00" diff --git a/k8s-config/emissary-emissaryns/values.yaml b/k8s-config/emissary-emissaryns/values.yaml index db88da0250..c0bc7fce38 100644 --- a/k8s-config/emissary-emissaryns/values.yaml +++ b/k8s-config/emissary-emissaryns/values.yaml @@ -33,3 +33,6 @@ image: waitForApiext: enabled: true createRoles: true + +agent: + enabled: true diff --git a/k8s-config/kat-ambassador/Chart.lock b/k8s-config/kat-ambassador/Chart.lock new file mode 100644 index 0000000000..3943061207 --- /dev/null +++ b/k8s-config/kat-ambassador/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: ambassador-agent + repository: https://s3.amazonaws.com/datawire-static-files/charts + version: 1.0.15 +digest: sha256:5b3ed48fcf6b0ee0e9638f7261dcd2a264ee72f0a5eede7d123ff2d4b3c7e958 +generated: "2023-09-28T14:30:39.695933-04:00" diff --git a/k8s-config/kat-rbac-multinamespace/Chart.lock b/k8s-config/kat-rbac-multinamespace/Chart.lock new file mode 100644 index 0000000000..3943061207 --- /dev/null +++ b/k8s-config/kat-rbac-multinamespace/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: ambassador-agent + repository: https://s3.amazonaws.com/datawire-static-files/charts + version: 1.0.15 +digest: sha256:5b3ed48fcf6b0ee0e9638f7261dcd2a264ee72f0a5eede7d123ff2d4b3c7e958 +generated: "2023-09-28T14:30:39.695933-04:00" diff --git a/k8s-config/kat-rbac-singlenamespace/Chart.lock b/k8s-config/kat-rbac-singlenamespace/Chart.lock new file mode 100644 index 0000000000..3943061207 --- /dev/null +++ b/k8s-config/kat-rbac-singlenamespace/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: ambassador-agent + repository: https://s3.amazonaws.com/datawire-static-files/charts + version: 1.0.15 +digest: sha256:5b3ed48fcf6b0ee0e9638f7261dcd2a264ee72f0a5eede7d123ff2d4b3c7e958 +generated: "2023-09-28T14:30:39.695933-04:00" diff --git a/manifests/emissary/emissary-defaultns.yaml.in b/manifests/emissary/emissary-defaultns.yaml.in index a1da18a261..79f0d21a5a 100644 --- a/manifests/emissary/emissary-defaultns.yaml.in +++ b/manifests/emissary/emissary-defaultns.yaml.in @@ -680,7 +680,7 @@ metadata: spec: containers: - args: - - 'emissary-ingress-ambassador-agent:' + - emissary-ingress-ambassador-agent:8080 command: - wget image: busybox diff --git a/manifests/emissary/emissary-emissaryns.yaml.in b/manifests/emissary/emissary-emissaryns.yaml.in index 1a069111e0..336aa42521 100644 --- a/manifests/emissary/emissary-emissaryns.yaml.in +++ b/manifests/emissary/emissary-emissaryns.yaml.in @@ -680,7 +680,7 @@ metadata: spec: containers: - args: - - 'emissary-ingress-ambassador-agent:' + - emissary-ingress-ambassador-agent:8080 command: - wget image: busybox From e9f4a64aec4c2db1e717b471cf48cb495e1a6895 Mon Sep 17 00:00:00 2001 From: Tenshin Higashi Date: Thu, 19 Oct 2023 22:16:00 -0400 Subject: [PATCH 5/9] Adding agent alias Signed-off-by: Tenshin Higashi --- .github/actions/setup-deps/action.yml | 2 +- Makefile | 2 +- charts/emissary-ingress/Chart.lock | 4 +- charts/emissary-ingress/Chart.yaml.in | 3 +- charts/emissary-ingress/values.yaml.in | 86 +---------- k8s-config/emissary-defaultns/require.yaml | 47 +++--- k8s-config/emissary-defaultns/values.yaml | 2 +- k8s-config/emissary-emissaryns/require.yaml | 47 +++--- k8s-config/emissary-emissaryns/values.yaml | 2 +- k8s-config/kat-ambassador/values.yaml | 2 +- .../kat-rbac-multinamespace/values.yaml | 2 +- .../kat-rbac-singlenamespace/values.yaml | 2 +- manifests/emissary/emissary-defaultns.yaml.in | 144 +++++++++--------- .../emissary/emissary-emissaryns.yaml.in | 144 +++++++++--------- 14 files changed, 192 insertions(+), 297 deletions(-) diff --git a/.github/actions/setup-deps/action.yml b/.github/actions/setup-deps/action.yml index 6d08cae349..960def637b 100644 --- a/.github/actions/setup-deps/action.yml +++ b/.github/actions/setup-deps/action.yml @@ -38,5 +38,5 @@ runs: - name: "Install Helm Dependencies" shell: bash run: | - helm repo add ambassador-agent https://s3.amazonaws.com/datawire-static-files/charts + helm repo add agent https://s3.amazonaws.com/datawire-static-files/charts helm repo update diff --git a/Makefile b/Makefile index d370a21120..5421464752 100644 --- a/Makefile +++ b/Makefile @@ -85,7 +85,7 @@ chart/lint: preflight-dev-kubeconfig chart/k3d-test: preflight-dev-kubeconfig # check if k3d is installed @if ! command -v k3d 2> /dev/null ; then \ - printf 'k3d not installed, plz do that'; \ + printf 'k3d not installed, please do that'; \ false; \ fi .PHONY: chart/k3d-test diff --git a/charts/emissary-ingress/Chart.lock b/charts/emissary-ingress/Chart.lock index 3943061207..ffdfec0912 100644 --- a/charts/emissary-ingress/Chart.lock +++ b/charts/emissary-ingress/Chart.lock @@ -2,5 +2,5 @@ dependencies: - name: ambassador-agent repository: https://s3.amazonaws.com/datawire-static-files/charts version: 1.0.15 -digest: sha256:5b3ed48fcf6b0ee0e9638f7261dcd2a264ee72f0a5eede7d123ff2d4b3c7e958 -generated: "2023-09-28T14:30:39.695933-04:00" +digest: sha256:b9e8236b532f35352274023feee14fbd6d0084e8e5eea3051c62b2fb235bb6cd +generated: "2023-10-19T22:13:40.630546-04:00" diff --git a/charts/emissary-ingress/Chart.yaml.in b/charts/emissary-ingress/Chart.yaml.in index 4ed8e7bfd6..e28b0a12c5 100644 --- a/charts/emissary-ingress/Chart.yaml.in +++ b/charts/emissary-ingress/Chart.yaml.in @@ -30,4 +30,5 @@ dependencies: - name: ambassador-agent version: 1.0.15 repository: https://s3.amazonaws.com/datawire-static-files/charts - condition: agent.enabled + condition: ambassador-agent.enabled + alias: agent diff --git a/charts/emissary-ingress/values.yaml.in b/charts/emissary-ingress/values.yaml.in index f41ad095fa..b009341a29 100644 --- a/charts/emissary-ingress/values.yaml.in +++ b/charts/emissary-ingress/values.yaml.in @@ -407,92 +407,12 @@ prometheusExporter: # +doc-gen:break ambassador-agent: - image: - pullPolicy: IfNotPresent - # tag: - - imagePullSecrets: [] - nameOverride: "" - fullnameOverride: "" - - serviceAccount: - # Specifies whether a service account should be created - create: true - # Annotations to add to the service account - annotations: {} - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template - name: "" - - podAnnotations: {} - - podSecurityContext: - {} - # fsGroup: 2000 - - securityContext: - {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - - service: - type: ClusterIP - port: 8080 - - resources: - {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - - autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - - edgestack: - # agent: - # name: - # namespace: - # snapshotPort: - - rpcAddress: "" - - progressDeadline: 0 - - cloudConnectToken: "" - - logLevel: "info" - docker: - useImagePullSecret: false - imagePullSecretName: "" - - rbac: - nameOverride: "" - namespaces: [] - argo: true - - createNamespace: false - - tolerations: [] - -agent: # If `true`, installs the ambassador-agent Deployment enabling the Ambassador Cloud connectivity. enabled: true +# ambassador-agent Values. +# all values under agent key are passed to [the ambassador-agent chart](https://github.com/datawire/ambassador-agent/tree/master/helm/ambassador-agent) +agent: {} deploymentTool: '' diff --git a/k8s-config/emissary-defaultns/require.yaml b/k8s-config/emissary-defaultns/require.yaml index 44960a6d1e..46a6aeb023 100644 --- a/k8s-config/emissary-defaultns/require.yaml +++ b/k8s-config/emissary-defaultns/require.yaml @@ -12,33 +12,20 @@ resources: - { kind: Module, name: ambassador, namespace: *namespace } - { kind: Role, name: emissary-ingress-apiext, namespace: emissary-system } - { kind: RoleBinding, name: emissary-ingress-apiext, namespace: emissary-system } - # - { kind: Service, name: emissary-ingress-agent, namespace: *namespace } - # - { kind: ServiceAccount, name: emissary-ingress-agent, namespace: *namespace } - # - { kind: ClusterRoleBinding, name: emissary-ingress-agent } - # - { kind: ClusterRole, name: emissary-ingress-agent } - # - { kind: ClusterRole, name: emissary-ingress-agent-pods } - # - { kind: ClusterRole, name: emissary-ingress-agent-rollouts } - # - { kind: ClusterRole, name: emissary-ingress-agent-applications } - # - { kind: ClusterRole, name: emissary-ingress-agent-deployments } - # - { kind: ClusterRole, name: emissary-ingress-agent-endpoints } - # - { kind: ClusterRole, name: emissary-ingress-agent-configmaps } - # - { kind: Role, name: emissary-ingress-agent-config, namespace: *namespace } - # - { kind: RoleBinding, name: emissary-ingress-agent-config, namespace: *namespace } - # - { kind: Deployment, name: emissary-ingress-agent, namespace: *namespace } - - { kind: ClusterRole, name: emissary-ingress-ambassador-agent-applications } - - { kind: ClusterRole, name: emissary-ingress-ambassador-agent-default-ns } - - { kind: ClusterRole, name: emissary-ingress-ambassador-agent-deployments } - - { kind: ClusterRole, name: emissary-ingress-ambassador-agent-endpoints } - - { kind: ClusterRole, name: emissary-ingress-ambassador-agent-ingresses } - - { kind: ClusterRole, name: emissary-ingress-ambassador-agent-pods } - - { kind: ClusterRole, name: emissary-ingress-ambassador-agent-rollouts } - - { kind: ClusterRole, name: emissary-ingress-ambassador-agent } - - { kind: ClusterRoleBinding, name: emissary-ingress-ambassador-agent } - - { kind: Deployment, name: emissary-ingress-ambassador-agent, namespace: *namespace } - - { kind: Pod, name: emissary-ingress-ambassador-agent-test-connection } - - { kind: Role, name: emissary-ingress-ambassador-agent-config, namespace: *namespace } - - { kind: Role, name: emissary-ingress-ambassador-agent-leaderelection, namespace: *namespace } - - { kind: RoleBinding, name: emissary-ingress-ambassador-agent-config, namespace: *namespace } - - { kind: RoleBinding, name: emissary-ingress-ambassador-agent-leaderelection, namespace: *namespace } - - { kind: Service, name: emissary-ingress-ambassador-agent, namespace: *namespace } - - { kind: ServiceAccount, name: emissary-ingress-ambassador-agent, namespace: *namespace } + - { kind: ClusterRole, name: emissary-ingress-agent-applications } + - { kind: ClusterRole, name: emissary-ingress-agent-default-ns } + - { kind: ClusterRole, name: emissary-ingress-agent-deployments } + - { kind: ClusterRole, name: emissary-ingress-agent-endpoints } + - { kind: ClusterRole, name: emissary-ingress-agent-ingresses } + - { kind: ClusterRole, name: emissary-ingress-agent-pods } + - { kind: ClusterRole, name: emissary-ingress-agent-rollouts } + - { kind: ClusterRole, name: emissary-ingress-agent } + - { kind: ClusterRoleBinding, name: emissary-ingress-agent } + - { kind: Deployment, name: emissary-ingress-agent, namespace: *namespace } + - { kind: Pod, name: emissary-ingress-agent-test-connection } + - { kind: Role, name: emissary-ingress-agent-config, namespace: *namespace } + - { kind: Role, name: emissary-ingress-agent-leaderelection, namespace: *namespace } + - { kind: RoleBinding, name: emissary-ingress-agent-config, namespace: *namespace } + - { kind: RoleBinding, name: emissary-ingress-agent-leaderelection, namespace: *namespace } + - { kind: Service, name: emissary-ingress-agent, namespace: *namespace } + - { kind: ServiceAccount, name: emissary-ingress-agent, namespace: *namespace } diff --git a/k8s-config/emissary-defaultns/values.yaml b/k8s-config/emissary-defaultns/values.yaml index c2b9962a69..32ed6afe6f 100644 --- a/k8s-config/emissary-defaultns/values.yaml +++ b/k8s-config/emissary-defaultns/values.yaml @@ -33,5 +33,5 @@ waitForApiext: enabled: true createRoles: true -agent: +ambassador-agent: enabled: true diff --git a/k8s-config/emissary-emissaryns/require.yaml b/k8s-config/emissary-emissaryns/require.yaml index 51a70b1924..578506a057 100644 --- a/k8s-config/emissary-emissaryns/require.yaml +++ b/k8s-config/emissary-emissaryns/require.yaml @@ -12,34 +12,21 @@ resources: - { kind: Module, name: ambassador, namespace: *namespace } - { kind: Role, name: emissary-ingress-apiext, namespace: emissary-system} - { kind: RoleBinding, name: emissary-ingress-apiext, namespace: emissary-system} - # - { kind: Service, name: emissary-ingress-agent, namespace: *namespace } - # - { kind: ServiceAccount, name: emissary-ingress-agent, namespace: *namespace } - # - { kind: ClusterRoleBinding, name: emissary-ingress-agent } - # - { kind: ClusterRole, name: emissary-ingress-agent } - # - { kind: ClusterRole, name: emissary-ingress-agent-pods } - # - { kind: ClusterRole, name: emissary-ingress-agent-rollouts } - # - { kind: ClusterRole, name: emissary-ingress-agent-applications } - # - { kind: ClusterRole, name: emissary-ingress-agent-deployments } - # - { kind: ClusterRole, name: emissary-ingress-agent-endpoints } - # - { kind: ClusterRole, name: emissary-ingress-agent-configmaps } - # - { kind: Role, name: emissary-ingress-agent-config, namespace: *namespace } - # - { kind: RoleBinding, name: emissary-ingress-agent-config, namespace: *namespace } - # - { kind: Deployment, name: emissary-ingress-agent, namespace: *namespace } - - { kind: ClusterRole, name: emissary-ingress-ambassador-agent-applications } - - { kind: ClusterRole, name: emissary-ingress-ambassador-agent-default-ns } - - { kind: ClusterRole, name: emissary-ingress-ambassador-agent-deployments } - - { kind: ClusterRole, name: emissary-ingress-ambassador-agent-endpoints } - - { kind: ClusterRole, name: emissary-ingress-ambassador-agent-ingresses } - - { kind: ClusterRole, name: emissary-ingress-ambassador-agent-pods } - - { kind: ClusterRole, name: emissary-ingress-ambassador-agent-rollouts } - - { kind: ClusterRole, name: emissary-ingress-ambassador-agent } - - { kind: ClusterRoleBinding, name: emissary-ingress-ambassador-agent } - - { kind: Deployment, name: emissary-ingress-ambassador-agent, namespace: *namespace } - - { kind: Pod, name: emissary-ingress-ambassador-agent-test-connection } - - { kind: Role, name: emissary-ingress-ambassador-agent-config, namespace: *namespace } - - { kind: Role, name: emissary-ingress-ambassador-agent-leaderelection, namespace: *namespace } - - { kind: RoleBinding, name: emissary-ingress-ambassador-agent-config, namespace: *namespace } - - { kind: RoleBinding, name: emissary-ingress-ambassador-agent-leaderelection, namespace: *namespace } - - { kind: Service, name: emissary-ingress-ambassador-agent, namespace: *namespace } - - { kind: ServiceAccount, name: emissary-ingress-ambassador-agent, namespace: *namespace } + - { kind: ClusterRole, name: emissary-ingress-agent-applications } + - { kind: ClusterRole, name: emissary-ingress-agent-default-ns } + - { kind: ClusterRole, name: emissary-ingress-agent-deployments } + - { kind: ClusterRole, name: emissary-ingress-agent-endpoints } + - { kind: ClusterRole, name: emissary-ingress-agent-ingresses } + - { kind: ClusterRole, name: emissary-ingress-agent-pods } + - { kind: ClusterRole, name: emissary-ingress-agent-rollouts } + - { kind: ClusterRole, name: emissary-ingress-agent } + - { kind: ClusterRoleBinding, name: emissary-ingress-agent } + - { kind: Deployment, name: emissary-ingress-agent, namespace: *namespace } + - { kind: Pod, name: emissary-ingress-agent-test-connection } + - { kind: Role, name: emissary-ingress-agent-config, namespace: *namespace } + - { kind: Role, name: emissary-ingress-agent-leaderelection, namespace: *namespace } + - { kind: RoleBinding, name: emissary-ingress-agent-config, namespace: *namespace } + - { kind: RoleBinding, name: emissary-ingress-agent-leaderelection, namespace: *namespace } + - { kind: Service, name: emissary-ingress-agent, namespace: *namespace } + - { kind: ServiceAccount, name: emissary-ingress-agent, namespace: *namespace } diff --git a/k8s-config/emissary-emissaryns/values.yaml b/k8s-config/emissary-emissaryns/values.yaml index c0bc7fce38..7f5f977bdb 100644 --- a/k8s-config/emissary-emissaryns/values.yaml +++ b/k8s-config/emissary-emissaryns/values.yaml @@ -34,5 +34,5 @@ waitForApiext: enabled: true createRoles: true -agent: +ambassador-agent: enabled: true diff --git a/k8s-config/kat-ambassador/values.yaml b/k8s-config/kat-ambassador/values.yaml index 852dbef591..441f5c32e1 100644 --- a/k8s-config/kat-ambassador/values.yaml +++ b/k8s-config/kat-ambassador/values.yaml @@ -36,7 +36,7 @@ volumeMounts: resources: null module: null -agent: +ambassador-agent: enabled: false waitForApiext: diff --git a/k8s-config/kat-rbac-multinamespace/values.yaml b/k8s-config/kat-rbac-multinamespace/values.yaml index e9443660f5..ee493cbfa8 100644 --- a/k8s-config/kat-rbac-multinamespace/values.yaml +++ b/k8s-config/kat-rbac-multinamespace/values.yaml @@ -5,7 +5,7 @@ serviceAccount: extra: "«serviceAccountExtra»♯: null" module: null -agent: +ambassador-agent: enabled: false waitForApiext: diff --git a/k8s-config/kat-rbac-singlenamespace/values.yaml b/k8s-config/kat-rbac-singlenamespace/values.yaml index f7ced4cec2..5d2aecea64 100644 --- a/k8s-config/kat-rbac-singlenamespace/values.yaml +++ b/k8s-config/kat-rbac-singlenamespace/values.yaml @@ -7,7 +7,7 @@ scope: singleNamespace: true module: null -agent: +ambassador-agent: enabled: false waitForApiext: diff --git a/manifests/emissary/emissary-defaultns.yaml.in b/manifests/emissary/emissary-defaultns.yaml.in index 79f0d21a5a..30b3aaf7f0 100644 --- a/manifests/emissary/emissary-defaultns.yaml.in +++ b/manifests/emissary/emissary-defaultns.yaml.in @@ -438,11 +438,11 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent - name: emissary-ingress-ambassador-agent-applications + helm.sh/chart: agent-1.0.15 + rbac.getambassador.io/role-group: emissary-ingress-agent + name: emissary-ingress-agent-applications rules: - apiGroups: - argoproj.io @@ -459,11 +459,11 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent - name: emissary-ingress-ambassador-agent-default-ns + helm.sh/chart: agent-1.0.15 + rbac.getambassador.io/role-group: emissary-ingress-agent + name: emissary-ingress-agent-default-ns rules: - apiGroups: - "" @@ -480,11 +480,11 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent - name: emissary-ingress-ambassador-agent-deployments + helm.sh/chart: agent-1.0.15 + rbac.getambassador.io/role-group: emissary-ingress-agent + name: emissary-ingress-agent-deployments rules: - apiGroups: - apps @@ -502,11 +502,11 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent - name: emissary-ingress-ambassador-agent-endpoints + helm.sh/chart: agent-1.0.15 + rbac.getambassador.io/role-group: emissary-ingress-agent + name: emissary-ingress-agent-endpoints rules: - apiGroups: - "" @@ -524,11 +524,11 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent - name: emissary-ingress-ambassador-agent-ingresses + helm.sh/chart: agent-1.0.15 + rbac.getambassador.io/role-group: emissary-ingress-agent + name: emissary-ingress-agent-ingresses rules: - apiGroups: - networking.k8s.io @@ -546,11 +546,11 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent - name: emissary-ingress-ambassador-agent-pods + helm.sh/chart: agent-1.0.15 + rbac.getambassador.io/role-group: emissary-ingress-agent + name: emissary-ingress-agent-pods rules: - apiGroups: - "" @@ -567,11 +567,11 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent - name: emissary-ingress-ambassador-agent-rollouts + helm.sh/chart: agent-1.0.15 + rbac.getambassador.io/role-group: emissary-ingress-agent + name: emissary-ingress-agent-rollouts rules: - apiGroups: - argoproj.io @@ -587,17 +587,17 @@ rules: aggregationRule: clusterRoleSelectors: - matchLabels: - rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent + rbac.getambassador.io/role-group: emissary-ingress-agent apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - name: emissary-ingress-ambassador-agent + helm.sh/chart: agent-1.0.15 + name: emissary-ingress-agent rules: [] --- apiVersion: rbac.authorization.k8s.io/v1 @@ -606,17 +606,17 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - name: emissary-ingress-ambassador-agent + helm.sh/chart: agent-1.0.15 + name: emissary-ingress-agent roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: emissary-ingress-ambassador-agent + name: emissary-ingress-agent subjects: - kind: ServiceAccount - name: emissary-ingress-ambassador-agent + name: emissary-ingress-agent namespace: default --- apiVersion: apps/v1 @@ -625,22 +625,22 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - name: emissary-ingress-ambassador-agent + helm.sh/chart: agent-1.0.15 + name: emissary-ingress-agent namespace: default spec: replicas: null selector: matchLabels: app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent template: metadata: labels: app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent spec: containers: - env: @@ -651,19 +651,19 @@ spec: fieldRef: fieldPath: metadata.namespace - name: AGENT_CONFIG_RESOURCE_NAME - value: emissary-ingress-ambassador-agent-cloud-token + value: emissary-ingress-agent-cloud-token - name: RPC_CONNECTION_ADDRESS value: null image: docker.io/ambassador/ambassador-agent:1.0.15 imagePullPolicy: IfNotPresent - name: ambassador-agent + name: agent ports: - containerPort: 8080 name: http resources: {} securityContext: {} securityContext: {} - serviceAccountName: emissary-ingress-ambassador-agent + serviceAccountName: emissary-ingress-agent --- apiVersion: v1 kind: Pod @@ -673,14 +673,14 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - name: emissary-ingress-ambassador-agent-test-connection + helm.sh/chart: agent-1.0.15 + name: emissary-ingress-agent-test-connection spec: containers: - args: - - emissary-ingress-ambassador-agent:8080 + - 'emissary-ingress-agent:' command: - wget image: busybox @@ -693,10 +693,10 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - name: emissary-ingress-ambassador-agent-config + helm.sh/chart: agent-1.0.15 + name: emissary-ingress-agent-config namespace: default rules: - apiGroups: @@ -725,10 +725,10 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - name: emissary-ingress-ambassador-agent-leaderelection + helm.sh/chart: agent-1.0.15 + name: emissary-ingress-agent-leaderelection namespace: default rules: - apiGroups: @@ -744,18 +744,18 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - name: emissary-ingress-ambassador-agent-config + helm.sh/chart: agent-1.0.15 + name: emissary-ingress-agent-config namespace: default roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: emissary-ingress-ambassador-agent-config + name: emissary-ingress-agent-config subjects: - kind: ServiceAccount - name: emissary-ingress-ambassador-agent + name: emissary-ingress-agent namespace: default --- apiVersion: rbac.authorization.k8s.io/v1 @@ -764,18 +764,18 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - name: emissary-ingress-ambassador-agent-leaderelection + helm.sh/chart: agent-1.0.15 + name: emissary-ingress-agent-leaderelection namespace: default roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: emissary-ingress-ambassador-agent-leaderelection + name: emissary-ingress-agent-leaderelection subjects: - kind: ServiceAccount - name: emissary-ingress-ambassador-agent + name: emissary-ingress-agent namespace: default --- apiVersion: v1 @@ -784,10 +784,10 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - name: emissary-ingress-ambassador-agent + helm.sh/chart: agent-1.0.15 + name: emissary-ingress-agent namespace: default spec: ports: @@ -796,7 +796,7 @@ spec: targetPort: http selector: app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent type: ClusterIP --- apiVersion: v1 @@ -805,8 +805,8 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - name: emissary-ingress-ambassador-agent + helm.sh/chart: agent-1.0.15 + name: emissary-ingress-agent namespace: default diff --git a/manifests/emissary/emissary-emissaryns.yaml.in b/manifests/emissary/emissary-emissaryns.yaml.in index 336aa42521..584a82b253 100644 --- a/manifests/emissary/emissary-emissaryns.yaml.in +++ b/manifests/emissary/emissary-emissaryns.yaml.in @@ -438,11 +438,11 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent - name: emissary-ingress-ambassador-agent-applications + helm.sh/chart: agent-1.0.15 + rbac.getambassador.io/role-group: emissary-ingress-agent + name: emissary-ingress-agent-applications rules: - apiGroups: - argoproj.io @@ -459,11 +459,11 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent - name: emissary-ingress-ambassador-agent-default-ns + helm.sh/chart: agent-1.0.15 + rbac.getambassador.io/role-group: emissary-ingress-agent + name: emissary-ingress-agent-default-ns rules: - apiGroups: - "" @@ -480,11 +480,11 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent - name: emissary-ingress-ambassador-agent-deployments + helm.sh/chart: agent-1.0.15 + rbac.getambassador.io/role-group: emissary-ingress-agent + name: emissary-ingress-agent-deployments rules: - apiGroups: - apps @@ -502,11 +502,11 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent - name: emissary-ingress-ambassador-agent-endpoints + helm.sh/chart: agent-1.0.15 + rbac.getambassador.io/role-group: emissary-ingress-agent + name: emissary-ingress-agent-endpoints rules: - apiGroups: - "" @@ -524,11 +524,11 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent - name: emissary-ingress-ambassador-agent-ingresses + helm.sh/chart: agent-1.0.15 + rbac.getambassador.io/role-group: emissary-ingress-agent + name: emissary-ingress-agent-ingresses rules: - apiGroups: - networking.k8s.io @@ -546,11 +546,11 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent - name: emissary-ingress-ambassador-agent-pods + helm.sh/chart: agent-1.0.15 + rbac.getambassador.io/role-group: emissary-ingress-agent + name: emissary-ingress-agent-pods rules: - apiGroups: - "" @@ -567,11 +567,11 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent - name: emissary-ingress-ambassador-agent-rollouts + helm.sh/chart: agent-1.0.15 + rbac.getambassador.io/role-group: emissary-ingress-agent + name: emissary-ingress-agent-rollouts rules: - apiGroups: - argoproj.io @@ -587,17 +587,17 @@ rules: aggregationRule: clusterRoleSelectors: - matchLabels: - rbac.getambassador.io/role-group: emissary-ingress-ambassador-agent + rbac.getambassador.io/role-group: emissary-ingress-agent apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - name: emissary-ingress-ambassador-agent + helm.sh/chart: agent-1.0.15 + name: emissary-ingress-agent rules: [] --- apiVersion: rbac.authorization.k8s.io/v1 @@ -606,17 +606,17 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - name: emissary-ingress-ambassador-agent + helm.sh/chart: agent-1.0.15 + name: emissary-ingress-agent roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: emissary-ingress-ambassador-agent + name: emissary-ingress-agent subjects: - kind: ServiceAccount - name: emissary-ingress-ambassador-agent + name: emissary-ingress-agent namespace: emissary --- apiVersion: apps/v1 @@ -625,22 +625,22 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - name: emissary-ingress-ambassador-agent + helm.sh/chart: agent-1.0.15 + name: emissary-ingress-agent namespace: emissary spec: replicas: null selector: matchLabels: app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent template: metadata: labels: app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent spec: containers: - env: @@ -651,19 +651,19 @@ spec: fieldRef: fieldPath: metadata.namespace - name: AGENT_CONFIG_RESOURCE_NAME - value: emissary-ingress-ambassador-agent-cloud-token + value: emissary-ingress-agent-cloud-token - name: RPC_CONNECTION_ADDRESS value: null image: docker.io/ambassador/ambassador-agent:1.0.15 imagePullPolicy: IfNotPresent - name: ambassador-agent + name: agent ports: - containerPort: 8080 name: http resources: {} securityContext: {} securityContext: {} - serviceAccountName: emissary-ingress-ambassador-agent + serviceAccountName: emissary-ingress-agent --- apiVersion: v1 kind: Pod @@ -673,14 +673,14 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - name: emissary-ingress-ambassador-agent-test-connection + helm.sh/chart: agent-1.0.15 + name: emissary-ingress-agent-test-connection spec: containers: - args: - - emissary-ingress-ambassador-agent:8080 + - 'emissary-ingress-agent:' command: - wget image: busybox @@ -693,10 +693,10 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - name: emissary-ingress-ambassador-agent-config + helm.sh/chart: agent-1.0.15 + name: emissary-ingress-agent-config namespace: emissary rules: - apiGroups: @@ -725,10 +725,10 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - name: emissary-ingress-ambassador-agent-leaderelection + helm.sh/chart: agent-1.0.15 + name: emissary-ingress-agent-leaderelection namespace: emissary rules: - apiGroups: @@ -744,18 +744,18 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - name: emissary-ingress-ambassador-agent-config + helm.sh/chart: agent-1.0.15 + name: emissary-ingress-agent-config namespace: emissary roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: emissary-ingress-ambassador-agent-config + name: emissary-ingress-agent-config subjects: - kind: ServiceAccount - name: emissary-ingress-ambassador-agent + name: emissary-ingress-agent namespace: emissary --- apiVersion: rbac.authorization.k8s.io/v1 @@ -764,18 +764,18 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - name: emissary-ingress-ambassador-agent-leaderelection + helm.sh/chart: agent-1.0.15 + name: emissary-ingress-agent-leaderelection namespace: emissary roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: emissary-ingress-ambassador-agent-leaderelection + name: emissary-ingress-agent-leaderelection subjects: - kind: ServiceAccount - name: emissary-ingress-ambassador-agent + name: emissary-ingress-agent namespace: emissary --- apiVersion: v1 @@ -784,10 +784,10 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - name: emissary-ingress-ambassador-agent + helm.sh/chart: agent-1.0.15 + name: emissary-ingress-agent namespace: emissary spec: ports: @@ -796,7 +796,7 @@ spec: targetPort: http selector: app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent type: ClusterIP --- apiVersion: v1 @@ -805,8 +805,8 @@ metadata: labels: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ambassador-agent + app.kubernetes.io/name: agent app.kubernetes.io/version: 1.0.15 - helm.sh/chart: ambassador-agent-1.0.15 - name: emissary-ingress-ambassador-agent + helm.sh/chart: agent-1.0.15 + name: emissary-ingress-agent namespace: emissary From 2e301c36b86ce4fd47dc2269b73a814150e09226 Mon Sep 17 00:00:00 2001 From: Tenshin Higashi Date: Fri, 20 Oct 2023 13:18:48 -0400 Subject: [PATCH 6/9] Updating Agent Signed-off-by: Tenshin Higashi --- charts/emissary-ingress/Chart.lock | 6 +- charts/emissary-ingress/Chart.yaml.in | 2 +- k8s-config/emissary-defaultns/Chart.lock | 6 -- k8s-config/emissary-defaultns/require.yaml | 1 - k8s-config/emissary-defaultns/values.yaml | 1 + k8s-config/emissary-emissaryns/Chart.lock | 6 -- k8s-config/emissary-emissaryns/require.yaml | 1 - k8s-config/kat-ambassador/Chart.lock | 6 -- k8s-config/kat-rbac-multinamespace/Chart.lock | 6 -- .../kat-rbac-singlenamespace/Chart.lock | 6 -- manifests/emissary/emissary-defaultns.yaml.in | 88 +++++++------------ .../emissary/emissary-emissaryns.yaml.in | 88 +++++++------------ 12 files changed, 71 insertions(+), 146 deletions(-) delete mode 100644 k8s-config/emissary-defaultns/Chart.lock delete mode 100644 k8s-config/emissary-emissaryns/Chart.lock delete mode 100644 k8s-config/kat-ambassador/Chart.lock delete mode 100644 k8s-config/kat-rbac-multinamespace/Chart.lock delete mode 100644 k8s-config/kat-rbac-singlenamespace/Chart.lock diff --git a/charts/emissary-ingress/Chart.lock b/charts/emissary-ingress/Chart.lock index ffdfec0912..a4768277c7 100644 --- a/charts/emissary-ingress/Chart.lock +++ b/charts/emissary-ingress/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: ambassador-agent repository: https://s3.amazonaws.com/datawire-static-files/charts - version: 1.0.15 -digest: sha256:b9e8236b532f35352274023feee14fbd6d0084e8e5eea3051c62b2fb235bb6cd -generated: "2023-10-19T22:13:40.630546-04:00" + version: 1.0.16 +digest: sha256:8dc1df2b1095dba61a39d2c9a1c0f908b396dec7d6e4589164b8ff6336afa65d +generated: "2023-10-23T14:45:54.877233-04:00" diff --git a/charts/emissary-ingress/Chart.yaml.in b/charts/emissary-ingress/Chart.yaml.in index e28b0a12c5..cc9d8adca8 100644 --- a/charts/emissary-ingress/Chart.yaml.in +++ b/charts/emissary-ingress/Chart.yaml.in @@ -28,7 +28,7 @@ maintainers: email: thigashi@datawire.io dependencies: - name: ambassador-agent - version: 1.0.15 + version: 1.0.16 repository: https://s3.amazonaws.com/datawire-static-files/charts condition: ambassador-agent.enabled alias: agent diff --git a/k8s-config/emissary-defaultns/Chart.lock b/k8s-config/emissary-defaultns/Chart.lock deleted file mode 100644 index 3943061207..0000000000 --- a/k8s-config/emissary-defaultns/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: ambassador-agent - repository: https://s3.amazonaws.com/datawire-static-files/charts - version: 1.0.15 -digest: sha256:5b3ed48fcf6b0ee0e9638f7261dcd2a264ee72f0a5eede7d123ff2d4b3c7e958 -generated: "2023-09-28T14:30:39.695933-04:00" diff --git a/k8s-config/emissary-defaultns/require.yaml b/k8s-config/emissary-defaultns/require.yaml index 46a6aeb023..06f1817bf1 100644 --- a/k8s-config/emissary-defaultns/require.yaml +++ b/k8s-config/emissary-defaultns/require.yaml @@ -22,7 +22,6 @@ resources: - { kind: ClusterRole, name: emissary-ingress-agent } - { kind: ClusterRoleBinding, name: emissary-ingress-agent } - { kind: Deployment, name: emissary-ingress-agent, namespace: *namespace } - - { kind: Pod, name: emissary-ingress-agent-test-connection } - { kind: Role, name: emissary-ingress-agent-config, namespace: *namespace } - { kind: Role, name: emissary-ingress-agent-leaderelection, namespace: *namespace } - { kind: RoleBinding, name: emissary-ingress-agent-config, namespace: *namespace } diff --git a/k8s-config/emissary-defaultns/values.yaml b/k8s-config/emissary-defaultns/values.yaml index 32ed6afe6f..20925e0f0b 100644 --- a/k8s-config/emissary-defaultns/values.yaml +++ b/k8s-config/emissary-defaultns/values.yaml @@ -35,3 +35,4 @@ waitForApiext: ambassador-agent: enabled: true + diff --git a/k8s-config/emissary-emissaryns/Chart.lock b/k8s-config/emissary-emissaryns/Chart.lock deleted file mode 100644 index 3943061207..0000000000 --- a/k8s-config/emissary-emissaryns/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: ambassador-agent - repository: https://s3.amazonaws.com/datawire-static-files/charts - version: 1.0.15 -digest: sha256:5b3ed48fcf6b0ee0e9638f7261dcd2a264ee72f0a5eede7d123ff2d4b3c7e958 -generated: "2023-09-28T14:30:39.695933-04:00" diff --git a/k8s-config/emissary-emissaryns/require.yaml b/k8s-config/emissary-emissaryns/require.yaml index 578506a057..33ee997a80 100644 --- a/k8s-config/emissary-emissaryns/require.yaml +++ b/k8s-config/emissary-emissaryns/require.yaml @@ -22,7 +22,6 @@ resources: - { kind: ClusterRole, name: emissary-ingress-agent } - { kind: ClusterRoleBinding, name: emissary-ingress-agent } - { kind: Deployment, name: emissary-ingress-agent, namespace: *namespace } - - { kind: Pod, name: emissary-ingress-agent-test-connection } - { kind: Role, name: emissary-ingress-agent-config, namespace: *namespace } - { kind: Role, name: emissary-ingress-agent-leaderelection, namespace: *namespace } - { kind: RoleBinding, name: emissary-ingress-agent-config, namespace: *namespace } diff --git a/k8s-config/kat-ambassador/Chart.lock b/k8s-config/kat-ambassador/Chart.lock deleted file mode 100644 index 3943061207..0000000000 --- a/k8s-config/kat-ambassador/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: ambassador-agent - repository: https://s3.amazonaws.com/datawire-static-files/charts - version: 1.0.15 -digest: sha256:5b3ed48fcf6b0ee0e9638f7261dcd2a264ee72f0a5eede7d123ff2d4b3c7e958 -generated: "2023-09-28T14:30:39.695933-04:00" diff --git a/k8s-config/kat-rbac-multinamespace/Chart.lock b/k8s-config/kat-rbac-multinamespace/Chart.lock deleted file mode 100644 index 3943061207..0000000000 --- a/k8s-config/kat-rbac-multinamespace/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: ambassador-agent - repository: https://s3.amazonaws.com/datawire-static-files/charts - version: 1.0.15 -digest: sha256:5b3ed48fcf6b0ee0e9638f7261dcd2a264ee72f0a5eede7d123ff2d4b3c7e958 -generated: "2023-09-28T14:30:39.695933-04:00" diff --git a/k8s-config/kat-rbac-singlenamespace/Chart.lock b/k8s-config/kat-rbac-singlenamespace/Chart.lock deleted file mode 100644 index 3943061207..0000000000 --- a/k8s-config/kat-rbac-singlenamespace/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: ambassador-agent - repository: https://s3.amazonaws.com/datawire-static-files/charts - version: 1.0.15 -digest: sha256:5b3ed48fcf6b0ee0e9638f7261dcd2a264ee72f0a5eede7d123ff2d4b3c7e958 -generated: "2023-09-28T14:30:39.695933-04:00" diff --git a/manifests/emissary/emissary-defaultns.yaml.in b/manifests/emissary/emissary-defaultns.yaml.in index 30b3aaf7f0..37e2a5140c 100644 --- a/manifests/emissary/emissary-defaultns.yaml.in +++ b/manifests/emissary/emissary-defaultns.yaml.in @@ -439,8 +439,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 rbac.getambassador.io/role-group: emissary-ingress-agent name: emissary-ingress-agent-applications rules: @@ -460,8 +460,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 rbac.getambassador.io/role-group: emissary-ingress-agent name: emissary-ingress-agent-default-ns rules: @@ -481,8 +481,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 rbac.getambassador.io/role-group: emissary-ingress-agent name: emissary-ingress-agent-deployments rules: @@ -503,8 +503,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 rbac.getambassador.io/role-group: emissary-ingress-agent name: emissary-ingress-agent-endpoints rules: @@ -525,8 +525,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 rbac.getambassador.io/role-group: emissary-ingress-agent name: emissary-ingress-agent-ingresses rules: @@ -547,8 +547,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 rbac.getambassador.io/role-group: emissary-ingress-agent name: emissary-ingress-agent-pods rules: @@ -568,8 +568,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 rbac.getambassador.io/role-group: emissary-ingress-agent name: emissary-ingress-agent-rollouts rules: @@ -595,8 +595,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 name: emissary-ingress-agent rules: [] --- @@ -607,8 +607,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 name: emissary-ingress-agent roleRef: apiGroup: rbac.authorization.k8s.io @@ -626,8 +626,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 name: emissary-ingress-agent namespace: default spec: @@ -654,7 +654,7 @@ spec: value: emissary-ingress-agent-cloud-token - name: RPC_CONNECTION_ADDRESS value: null - image: docker.io/ambassador/ambassador-agent:1.0.15 + image: docker.io/ambassador/ambassador-agent:1.0.16 imagePullPolicy: IfNotPresent name: agent ports: @@ -665,28 +665,6 @@ spec: securityContext: {} serviceAccountName: emissary-ingress-agent --- -apiVersion: v1 -kind: Pod -metadata: - annotations: - helm.sh/hook: test - labels: - app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 - name: emissary-ingress-agent-test-connection -spec: - containers: - - args: - - 'emissary-ingress-agent:' - command: - - wget - image: busybox - name: wget - restartPolicy: Never ---- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -694,8 +672,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 name: emissary-ingress-agent-config namespace: default rules: @@ -726,8 +704,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 name: emissary-ingress-agent-leaderelection namespace: default rules: @@ -745,8 +723,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 name: emissary-ingress-agent-config namespace: default roleRef: @@ -765,8 +743,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 name: emissary-ingress-agent-leaderelection namespace: default roleRef: @@ -785,8 +763,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 name: emissary-ingress-agent namespace: default spec: @@ -806,7 +784,7 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 name: emissary-ingress-agent namespace: default diff --git a/manifests/emissary/emissary-emissaryns.yaml.in b/manifests/emissary/emissary-emissaryns.yaml.in index 584a82b253..085df05a55 100644 --- a/manifests/emissary/emissary-emissaryns.yaml.in +++ b/manifests/emissary/emissary-emissaryns.yaml.in @@ -439,8 +439,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 rbac.getambassador.io/role-group: emissary-ingress-agent name: emissary-ingress-agent-applications rules: @@ -460,8 +460,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 rbac.getambassador.io/role-group: emissary-ingress-agent name: emissary-ingress-agent-default-ns rules: @@ -481,8 +481,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 rbac.getambassador.io/role-group: emissary-ingress-agent name: emissary-ingress-agent-deployments rules: @@ -503,8 +503,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 rbac.getambassador.io/role-group: emissary-ingress-agent name: emissary-ingress-agent-endpoints rules: @@ -525,8 +525,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 rbac.getambassador.io/role-group: emissary-ingress-agent name: emissary-ingress-agent-ingresses rules: @@ -547,8 +547,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 rbac.getambassador.io/role-group: emissary-ingress-agent name: emissary-ingress-agent-pods rules: @@ -568,8 +568,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 rbac.getambassador.io/role-group: emissary-ingress-agent name: emissary-ingress-agent-rollouts rules: @@ -595,8 +595,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 name: emissary-ingress-agent rules: [] --- @@ -607,8 +607,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 name: emissary-ingress-agent roleRef: apiGroup: rbac.authorization.k8s.io @@ -626,8 +626,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 name: emissary-ingress-agent namespace: emissary spec: @@ -654,7 +654,7 @@ spec: value: emissary-ingress-agent-cloud-token - name: RPC_CONNECTION_ADDRESS value: null - image: docker.io/ambassador/ambassador-agent:1.0.15 + image: docker.io/ambassador/ambassador-agent:1.0.16 imagePullPolicy: IfNotPresent name: agent ports: @@ -665,28 +665,6 @@ spec: securityContext: {} serviceAccountName: emissary-ingress-agent --- -apiVersion: v1 -kind: Pod -metadata: - annotations: - helm.sh/hook: test - labels: - app.kubernetes.io/instance: emissary-ingress - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 - name: emissary-ingress-agent-test-connection -spec: - containers: - - args: - - 'emissary-ingress-agent:' - command: - - wget - image: busybox - name: wget - restartPolicy: Never ---- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -694,8 +672,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 name: emissary-ingress-agent-config namespace: emissary rules: @@ -726,8 +704,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 name: emissary-ingress-agent-leaderelection namespace: emissary rules: @@ -745,8 +723,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 name: emissary-ingress-agent-config namespace: emissary roleRef: @@ -765,8 +743,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 name: emissary-ingress-agent-leaderelection namespace: emissary roleRef: @@ -785,8 +763,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 name: emissary-ingress-agent namespace: emissary spec: @@ -806,7 +784,7 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.15 - helm.sh/chart: agent-1.0.15 + app.kubernetes.io/version: 1.0.16 + helm.sh/chart: agent-1.0.16 name: emissary-ingress-agent namespace: emissary From 57863fe7165a023751ad1efe6c802b0eafa1e366 Mon Sep 17 00:00:00 2001 From: Tenshin Higashi Date: Wed, 25 Oct 2023 12:10:43 -0400 Subject: [PATCH 7/9] Minor changes for apro Signed-off-by: Tenshin Higashi --- build-aux/main.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/build-aux/main.mk b/build-aux/main.mk index aa27fe4fcf..cc04f9a0f7 100644 --- a/build-aux/main.mk +++ b/build-aux/main.mk @@ -130,6 +130,7 @@ endif } $(tools/chart-doc-gen) -d $$@/README.md build-output/chart-%.tgz: build-output/chart-%.d + cd $< && helm dependency build helm package --destination=$< $< mv $ Date: Tue, 31 Oct 2023 15:10:58 -0400 Subject: [PATCH 8/9] Addressing feedback Signed-off-by: Tenshin Higashi --- charts/emissary-ingress/Chart.lock | 4 ++-- charts/emissary-ingress/Chart.yaml.in | 2 +- charts/emissary-ingress/values.yaml.in | 9 ++++----- k8s-config/emissary-defaultns/values.yaml | 2 +- k8s-config/emissary-emissaryns/values.yaml | 2 +- k8s-config/kat-ambassador/values.yaml | 2 +- k8s-config/kat-rbac-multinamespace/values.yaml | 2 +- k8s-config/kat-rbac-singlenamespace/values.yaml | 2 +- manifests/emissary/emissary-defaultns.yaml.in | 2 +- manifests/emissary/emissary-emissaryns.yaml.in | 2 +- 10 files changed, 14 insertions(+), 15 deletions(-) diff --git a/charts/emissary-ingress/Chart.lock b/charts/emissary-ingress/Chart.lock index a4768277c7..dc3c07f03e 100644 --- a/charts/emissary-ingress/Chart.lock +++ b/charts/emissary-ingress/Chart.lock @@ -2,5 +2,5 @@ dependencies: - name: ambassador-agent repository: https://s3.amazonaws.com/datawire-static-files/charts version: 1.0.16 -digest: sha256:8dc1df2b1095dba61a39d2c9a1c0f908b396dec7d6e4589164b8ff6336afa65d -generated: "2023-10-23T14:45:54.877233-04:00" +digest: sha256:7b123f62267cfea698be6025f4a29518df8396f189701e4b9cc836ca254173ff +generated: "2023-10-31T15:03:28.875453-04:00" diff --git a/charts/emissary-ingress/Chart.yaml.in b/charts/emissary-ingress/Chart.yaml.in index cc9d8adca8..cb11cca333 100644 --- a/charts/emissary-ingress/Chart.yaml.in +++ b/charts/emissary-ingress/Chart.yaml.in @@ -30,5 +30,5 @@ dependencies: - name: ambassador-agent version: 1.0.16 repository: https://s3.amazonaws.com/datawire-static-files/charts - condition: ambassador-agent.enabled + condition: agent.enabled alias: agent diff --git a/charts/emissary-ingress/values.yaml.in b/charts/emissary-ingress/values.yaml.in index b009341a29..d81f13e4ac 100644 --- a/charts/emissary-ingress/values.yaml.in +++ b/charts/emissary-ingress/values.yaml.in @@ -405,14 +405,13 @@ prometheusExporter: # +doc-gen:break # securityContext: # runAsUser: 8888 - -ambassador-agent: +# ambassador-agent Values. +# all values under agent key are passed to [the ambassador-agent chart](https://github.com/datawire/ambassador-agent/tree/master/helm/ambassador-agent) +agent: # If `true`, installs the ambassador-agent Deployment enabling the Ambassador Cloud connectivity. enabled: true -# ambassador-agent Values. -# all values under agent key are passed to [the ambassador-agent chart](https://github.com/datawire/ambassador-agent/tree/master/helm/ambassador-agent) -agent: {} + rpcAddress: "https://app.getambassador.io/" deploymentTool: '' diff --git a/k8s-config/emissary-defaultns/values.yaml b/k8s-config/emissary-defaultns/values.yaml index 20925e0f0b..8c65d585fc 100644 --- a/k8s-config/emissary-defaultns/values.yaml +++ b/k8s-config/emissary-defaultns/values.yaml @@ -33,6 +33,6 @@ waitForApiext: enabled: true createRoles: true -ambassador-agent: +agent: enabled: true diff --git a/k8s-config/emissary-emissaryns/values.yaml b/k8s-config/emissary-emissaryns/values.yaml index 7f5f977bdb..c0bc7fce38 100644 --- a/k8s-config/emissary-emissaryns/values.yaml +++ b/k8s-config/emissary-emissaryns/values.yaml @@ -34,5 +34,5 @@ waitForApiext: enabled: true createRoles: true -ambassador-agent: +agent: enabled: true diff --git a/k8s-config/kat-ambassador/values.yaml b/k8s-config/kat-ambassador/values.yaml index 441f5c32e1..852dbef591 100644 --- a/k8s-config/kat-ambassador/values.yaml +++ b/k8s-config/kat-ambassador/values.yaml @@ -36,7 +36,7 @@ volumeMounts: resources: null module: null -ambassador-agent: +agent: enabled: false waitForApiext: diff --git a/k8s-config/kat-rbac-multinamespace/values.yaml b/k8s-config/kat-rbac-multinamespace/values.yaml index ee493cbfa8..e9443660f5 100644 --- a/k8s-config/kat-rbac-multinamespace/values.yaml +++ b/k8s-config/kat-rbac-multinamespace/values.yaml @@ -5,7 +5,7 @@ serviceAccount: extra: "«serviceAccountExtra»♯: null" module: null -ambassador-agent: +agent: enabled: false waitForApiext: diff --git a/k8s-config/kat-rbac-singlenamespace/values.yaml b/k8s-config/kat-rbac-singlenamespace/values.yaml index 5d2aecea64..f7ced4cec2 100644 --- a/k8s-config/kat-rbac-singlenamespace/values.yaml +++ b/k8s-config/kat-rbac-singlenamespace/values.yaml @@ -7,7 +7,7 @@ scope: singleNamespace: true module: null -ambassador-agent: +agent: enabled: false waitForApiext: diff --git a/manifests/emissary/emissary-defaultns.yaml.in b/manifests/emissary/emissary-defaultns.yaml.in index 37e2a5140c..62ce3582de 100644 --- a/manifests/emissary/emissary-defaultns.yaml.in +++ b/manifests/emissary/emissary-defaultns.yaml.in @@ -653,7 +653,7 @@ spec: - name: AGENT_CONFIG_RESOURCE_NAME value: emissary-ingress-agent-cloud-token - name: RPC_CONNECTION_ADDRESS - value: null + value: https://app.getambassador.io/ image: docker.io/ambassador/ambassador-agent:1.0.16 imagePullPolicy: IfNotPresent name: agent diff --git a/manifests/emissary/emissary-emissaryns.yaml.in b/manifests/emissary/emissary-emissaryns.yaml.in index 085df05a55..3802160014 100644 --- a/manifests/emissary/emissary-emissaryns.yaml.in +++ b/manifests/emissary/emissary-emissaryns.yaml.in @@ -653,7 +653,7 @@ spec: - name: AGENT_CONFIG_RESOURCE_NAME value: emissary-ingress-agent-cloud-token - name: RPC_CONNECTION_ADDRESS - value: null + value: https://app.getambassador.io/ image: docker.io/ambassador/ambassador-agent:1.0.16 imagePullPolicy: IfNotPresent name: agent From 3eb2032f76fbebfeb33ac36cf0d35c62b4a4155b Mon Sep 17 00:00:00 2001 From: Tenshin Higashi Date: Fri, 3 Nov 2023 11:15:51 -0400 Subject: [PATCH 9/9] Updating Agent version Signed-off-by: Tenshin Higashi --- charts/emissary-ingress/Chart.lock | 6 +- charts/emissary-ingress/Chart.yaml.in | 2 +- manifests/emissary/emissary-defaultns.yaml.in | 66 +++++++++---------- .../emissary/emissary-emissaryns.yaml.in | 66 +++++++++---------- 4 files changed, 70 insertions(+), 70 deletions(-) diff --git a/charts/emissary-ingress/Chart.lock b/charts/emissary-ingress/Chart.lock index dc3c07f03e..1489418366 100644 --- a/charts/emissary-ingress/Chart.lock +++ b/charts/emissary-ingress/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: ambassador-agent repository: https://s3.amazonaws.com/datawire-static-files/charts - version: 1.0.16 -digest: sha256:7b123f62267cfea698be6025f4a29518df8396f189701e4b9cc836ca254173ff -generated: "2023-10-31T15:03:28.875453-04:00" + version: 1.0.18 +digest: sha256:e3e849f13219638d9f10874165c6026bea1598cb487b77cc309cb60d82fed00b +generated: "2023-11-03T12:55:18.614119-04:00" diff --git a/charts/emissary-ingress/Chart.yaml.in b/charts/emissary-ingress/Chart.yaml.in index cb11cca333..7f661a7f9b 100644 --- a/charts/emissary-ingress/Chart.yaml.in +++ b/charts/emissary-ingress/Chart.yaml.in @@ -28,7 +28,7 @@ maintainers: email: thigashi@datawire.io dependencies: - name: ambassador-agent - version: 1.0.16 + version: 1.0.18 repository: https://s3.amazonaws.com/datawire-static-files/charts condition: agent.enabled alias: agent diff --git a/manifests/emissary/emissary-defaultns.yaml.in b/manifests/emissary/emissary-defaultns.yaml.in index 62ce3582de..bfd91d5051 100644 --- a/manifests/emissary/emissary-defaultns.yaml.in +++ b/manifests/emissary/emissary-defaultns.yaml.in @@ -439,8 +439,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 rbac.getambassador.io/role-group: emissary-ingress-agent name: emissary-ingress-agent-applications rules: @@ -460,8 +460,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 rbac.getambassador.io/role-group: emissary-ingress-agent name: emissary-ingress-agent-default-ns rules: @@ -481,8 +481,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 rbac.getambassador.io/role-group: emissary-ingress-agent name: emissary-ingress-agent-deployments rules: @@ -503,8 +503,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 rbac.getambassador.io/role-group: emissary-ingress-agent name: emissary-ingress-agent-endpoints rules: @@ -525,8 +525,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 rbac.getambassador.io/role-group: emissary-ingress-agent name: emissary-ingress-agent-ingresses rules: @@ -547,8 +547,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 rbac.getambassador.io/role-group: emissary-ingress-agent name: emissary-ingress-agent-pods rules: @@ -568,8 +568,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 rbac.getambassador.io/role-group: emissary-ingress-agent name: emissary-ingress-agent-rollouts rules: @@ -595,8 +595,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 name: emissary-ingress-agent rules: [] --- @@ -607,8 +607,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 name: emissary-ingress-agent roleRef: apiGroup: rbac.authorization.k8s.io @@ -626,8 +626,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 name: emissary-ingress-agent namespace: default spec: @@ -654,7 +654,7 @@ spec: value: emissary-ingress-agent-cloud-token - name: RPC_CONNECTION_ADDRESS value: https://app.getambassador.io/ - image: docker.io/ambassador/ambassador-agent:1.0.16 + image: docker.io/ambassador/ambassador-agent:1.0.18 imagePullPolicy: IfNotPresent name: agent ports: @@ -672,8 +672,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 name: emissary-ingress-agent-config namespace: default rules: @@ -704,8 +704,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 name: emissary-ingress-agent-leaderelection namespace: default rules: @@ -723,8 +723,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 name: emissary-ingress-agent-config namespace: default roleRef: @@ -743,8 +743,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 name: emissary-ingress-agent-leaderelection namespace: default roleRef: @@ -763,8 +763,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 name: emissary-ingress-agent namespace: default spec: @@ -784,7 +784,7 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 name: emissary-ingress-agent namespace: default diff --git a/manifests/emissary/emissary-emissaryns.yaml.in b/manifests/emissary/emissary-emissaryns.yaml.in index 3802160014..2baef4f715 100644 --- a/manifests/emissary/emissary-emissaryns.yaml.in +++ b/manifests/emissary/emissary-emissaryns.yaml.in @@ -439,8 +439,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 rbac.getambassador.io/role-group: emissary-ingress-agent name: emissary-ingress-agent-applications rules: @@ -460,8 +460,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 rbac.getambassador.io/role-group: emissary-ingress-agent name: emissary-ingress-agent-default-ns rules: @@ -481,8 +481,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 rbac.getambassador.io/role-group: emissary-ingress-agent name: emissary-ingress-agent-deployments rules: @@ -503,8 +503,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 rbac.getambassador.io/role-group: emissary-ingress-agent name: emissary-ingress-agent-endpoints rules: @@ -525,8 +525,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 rbac.getambassador.io/role-group: emissary-ingress-agent name: emissary-ingress-agent-ingresses rules: @@ -547,8 +547,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 rbac.getambassador.io/role-group: emissary-ingress-agent name: emissary-ingress-agent-pods rules: @@ -568,8 +568,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 rbac.getambassador.io/role-group: emissary-ingress-agent name: emissary-ingress-agent-rollouts rules: @@ -595,8 +595,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 name: emissary-ingress-agent rules: [] --- @@ -607,8 +607,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 name: emissary-ingress-agent roleRef: apiGroup: rbac.authorization.k8s.io @@ -626,8 +626,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 name: emissary-ingress-agent namespace: emissary spec: @@ -654,7 +654,7 @@ spec: value: emissary-ingress-agent-cloud-token - name: RPC_CONNECTION_ADDRESS value: https://app.getambassador.io/ - image: docker.io/ambassador/ambassador-agent:1.0.16 + image: docker.io/ambassador/ambassador-agent:1.0.18 imagePullPolicy: IfNotPresent name: agent ports: @@ -672,8 +672,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 name: emissary-ingress-agent-config namespace: emissary rules: @@ -704,8 +704,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 name: emissary-ingress-agent-leaderelection namespace: emissary rules: @@ -723,8 +723,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 name: emissary-ingress-agent-config namespace: emissary roleRef: @@ -743,8 +743,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 name: emissary-ingress-agent-leaderelection namespace: emissary roleRef: @@ -763,8 +763,8 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 name: emissary-ingress-agent namespace: emissary spec: @@ -784,7 +784,7 @@ metadata: app.kubernetes.io/instance: emissary-ingress app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: agent - app.kubernetes.io/version: 1.0.16 - helm.sh/chart: agent-1.0.16 + app.kubernetes.io/version: 1.0.18 + helm.sh/chart: agent-1.0.18 name: emissary-ingress-agent namespace: emissary