From 39b2b51663bb4a0e3dc39936a94fff4ea9174cf0 Mon Sep 17 00:00:00 2001 From: Tenshin Higashi Date: Mon, 16 Oct 2023 22:08:29 -0400 Subject: [PATCH] temp Signed-off-by: Tenshin Higashi --- .github/actions/setup-deps/action.yml | 7 +++++- build-aux/generate.mk | 7 ++++-- charts/emissary-ingress/values.yaml.in | 1 + k8s-config/emissary-defaultns/Chart.lock | 6 +++++ k8s-config/emissary-defaultns/require.yaml | 2 +- k8s-config/emissary-defaultns/values.yaml | 3 +++ k8s-config/emissary-emissaryns/Chart.lock | 6 +++++ k8s-config/emissary-emissaryns/require.yaml | 2 +- k8s-config/emissary-emissaryns/values.yaml | 3 +++ 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 | 22 +++++++++++++++++++ .../emissary/emissary-emissaryns.yaml.in | 22 +++++++++++++++++++ 14 files changed, 94 insertions(+), 5 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 9326a198315..6d08cae3494 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/build-aux/generate.mk b/build-aux/generate.mk index 8eaa7bf9f6d..570a513adcf 100644 --- a/build-aux/generate.mk +++ b/build-aux/generate.mk @@ -213,8 +213,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 build && helm dependency update \ +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/charts/emissary-ingress/values.yaml.in b/charts/emissary-ingress/values.yaml.in index 4f5f7c2ba9d..076adb23058 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: 80 resources: {} diff --git a/k8s-config/emissary-defaultns/Chart.lock b/k8s-config/emissary-defaultns/Chart.lock new file mode 100644 index 00000000000..39430612071 --- /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/require.yaml b/k8s-config/emissary-defaultns/require.yaml index 3ba52a3c863..44960a6d1e5 100644 --- a/k8s-config/emissary-defaultns/require.yaml +++ b/k8s-config/emissary-defaultns/require.yaml @@ -35,7 +35,7 @@ resources: - { 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: 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 } diff --git a/k8s-config/emissary-defaultns/values.yaml b/k8s-config/emissary-defaultns/values.yaml index 8ba3e0d5744..c2b9962a69c 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 00000000000..39430612071 --- /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/require.yaml b/k8s-config/emissary-emissaryns/require.yaml index f0b8d97c7ae..51a70b1924a 100644 --- a/k8s-config/emissary-emissaryns/require.yaml +++ b/k8s-config/emissary-emissaryns/require.yaml @@ -35,7 +35,7 @@ resources: - { 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: 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 } diff --git a/k8s-config/emissary-emissaryns/values.yaml b/k8s-config/emissary-emissaryns/values.yaml index db88da02503..c0bc7fce38e 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 00000000000..39430612071 --- /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 00000000000..39430612071 --- /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 00000000000..39430612071 --- /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 e0c9be7b00d..d24df87b218 100644 --- a/manifests/emissary/emissary-defaultns.yaml.in +++ b/manifests/emissary/emissary-defaultns.yaml.in @@ -665,6 +665,28 @@ spec: 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:80 + command: + - wget + image: busybox + name: wget + restartPolicy: Never +--- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: diff --git a/manifests/emissary/emissary-emissaryns.yaml.in b/manifests/emissary/emissary-emissaryns.yaml.in index d84c1e192b7..e6d9acee407 100644 --- a/manifests/emissary/emissary-emissaryns.yaml.in +++ b/manifests/emissary/emissary-emissaryns.yaml.in @@ -665,6 +665,28 @@ spec: 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:80 + command: + - wget + image: busybox + name: wget + restartPolicy: Never +--- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: