temp

Signed-off-by: Tenshin Higashi <[email protected]>
emissary-ingress · Oct 17, 2023 · 39b2b51 · 39b2b51
1 parent 8bb9324
commit 39b2b51
Show file tree

Hide file tree

Showing 14 changed files with 94 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: