fix gh check

pluralsh · Dec 20, 2024 · 34cd6b8 · 34cd6b8
1 parent d792d79
commit 34cd6b8
Show file tree

Hide file tree

Showing 31 changed files with 302 additions and 562 deletions.
diff --git a/test/outputs/bootstrap/apps/airbyte/mgmt/airbyte-raw-servicedeployment.yaml b/test/outputs/bootstrap/apps/airbyte/mgmt/airbyte-raw-servicedeployment.yaml
@@ -0,0 +1,20 @@
+apiVersion: deployments.plural.sh/v1alpha1
+kind: ServiceDeployment
+metadata:
+  name: airbyte-raw-{{ context.cluster }}
+  namespace: apps
+spec:
+  namespace: airbyte
+  git:
+    folder: services/apps/airbyte
+    ref: main
+  repositoryRef:
+    kind: GitRepository
+    name: infra
+    namespace: infra
+  configuration:
+    hostname: {{ context.hostname }}
+  clusterRef:
+    kind: Cluster
+    name: {{ context.cluster }}
+    namespace: infra
diff --git a/test/outputs/bootstrap/apps/airbyte/mgmt/airbyte-servicedeployment.yaml b/test/outputs/bootstrap/apps/airbyte/mgmt/airbyte-servicedeployment.yaml
@@ -0,0 +1,35 @@
+apiVersion: deployments.plural.sh/v1alpha1
+kind: ServiceDeployment
+metadata:
+  name: airbyte-{{ context.cluster }}
+  namespace: apps
+spec:
+  namespace: airbyte
+  git:
+    folder: helm/airbyte/{{ context.cluster }}
+    ref: main
+  repositoryRef:
+    kind: GitRepository
+    name: infra
+    namespace: infra
+  helm:
+    version: "1.x.x"
+    chart: airbyte
+    release: airbyte
+    ignoreHooks: false
+    url: https://airbytehq.github.io/helm-charts
+    valuesFiles:
+    - airbyte.yaml.liquid
+  imports:
+  - stackRef:
+      name: airbyte-{{ context.cluster }}
+      namespace: apps
+  configuration:
+    cluster: {{ context.cluster }}
+    hostname: {{ context.hostname }}
+    bucket: {{ context.bucket }}
+    region: {{ context.region }}
+  clusterRef:
+    kind: Cluster
+    name: {{ context.cluster }}
+    namespace: infra
diff --git a/...s/catalogs/data/airbyte/stack.yaml.liquid → ...trap/apps/airbyte/mgmt/airbyte-stack.yaml b/...s/catalogs/data/airbyte/stack.yaml.liquid → ...trap/apps/airbyte/mgmt/airbyte-stack.yaml
@@ -2,20 +2,21 @@ apiVersion: deployments.plural.sh/v1alpha1
 kind: InfrastructureStack
 metadata:
   name: airbyte-{{ context.cluster }}
+  namespace: apps
 spec:
   detach: false
   type: TERRAFORM
   approval: true
   manageState: true
   actor: [email protected]
-  configuration:
-    version: '1.8'
+  git:
+    ref: main
+    folder: terraform/apps/airbyte/{{ context.cluster }}
   repositoryRef:
     name: infra
     namespace: infra
+  configuration:
+    version: '1.8'
   clusterRef:
-    name: mgmt
+    name: {{ context.stackCluster }}
     namespace: infra
-  git:
-    ref: main
-    folder: terraform/apps/airbyte/{{ context.cloud }}
diff --git a/...ata/airbyte/servicedeployment.yaml.liquid → ...oauth-proxy-config-servicedeployment.yaml b/...ata/airbyte/servicedeployment.yaml.liquid → ...oauth-proxy-config-servicedeployment.yaml
@@ -1,27 +1,30 @@
 apiVersion: deployments.plural.sh/v1alpha1
 kind: ServiceDeployment
 metadata:
-  name: airbyte-{{ context.cluster }}
-  namespace: infra
+  name: airbyte-oauth-proxy-config-{{ context.cluster }}
+  namespace: apps
 spec:
   namespace: airbyte
   git:
-    folder: helm/airbyte
+    folder: helm/airbyte/{{ context.cluster }}
     ref: main
   repositoryRef:
     kind: GitRepository
     name: infra
     namespace: infra
   helm:
     version: "x.x.x"
-    chart: airbyte
-    url: https://app.plural.sh/cm/airbyte
+    chart: oidc-config
+    url: https://pluralsh.github.io/module-library
     valuesFiles:
-    - {{ context.cluster }}.yaml.liquid
+    - oauth-proxy-config.yaml.liquid
   imports:
   - stackRef:
       name: airbyte-{{ context.cluster }}
-      namespace: infra
+      namespace: apps
+  configuration:
+    cluster: {{ context.cluster }}
+    hostname: {{ context.hostname }}
   clusterRef:
     kind: Cluster
     name: {{ context.cluster }}

diff --git a/test/outputs/bootstrap/apps/airbyte/mgmt/servicedeployment.yaml b/test/outputs/bootstrap/apps/airbyte/mgmt/servicedeployment.yaml
diff --git a/test/outputs/catalogs/data/airbyte/README.md b/test/outputs/catalogs/data/airbyte/README.md
diff --git a/test/outputs/catalogs/data/airbyte/airbyte-raw-servicedeployment.yaml b/test/outputs/catalogs/data/airbyte/airbyte-raw-servicedeployment.yaml
@@ -0,0 +1,20 @@
+apiVersion: deployments.plural.sh/v1alpha1
+kind: ServiceDeployment
+metadata:
+  name: airbyte-raw-{{ context.cluster }}
+  namespace: apps
+spec:
+  namespace: airbyte
+  git:
+    folder: services/apps/airbyte
+    ref: main
+  repositoryRef:
+    kind: GitRepository
+    name: infra
+    namespace: infra
+  configuration:
+    hostname: {{ context.hostname }}
+  clusterRef:
+    kind: Cluster
+    name: {{ context.cluster }}
+    namespace: infra
diff --git a/test/outputs/catalogs/data/airbyte/airbyte-servicedeployment.yaml b/test/outputs/catalogs/data/airbyte/airbyte-servicedeployment.yaml
@@ -0,0 +1,35 @@
+apiVersion: deployments.plural.sh/v1alpha1
+kind: ServiceDeployment
+metadata:
+  name: airbyte-{{ context.cluster }}
+  namespace: apps
+spec:
+  namespace: airbyte
+  git:
+    folder: helm/airbyte/{{ context.cluster }}
+    ref: main
+  repositoryRef:
+    kind: GitRepository
+    name: infra
+    namespace: infra
+  helm:
+    version: "1.x.x"
+    chart: airbyte
+    release: airbyte
+    ignoreHooks: false
+    url: https://airbytehq.github.io/helm-charts
+    valuesFiles:
+    - airbyte.yaml.liquid
+  imports:
+  - stackRef:
+      name: airbyte-{{ context.cluster }}
+      namespace: apps
+  configuration:
+    cluster: {{ context.cluster }}
+    hostname: {{ context.hostname }}
+    bucket: {{ context.bucket }}
+    region: {{ context.region }}
+  clusterRef:
+    kind: Cluster
+    name: {{ context.cluster }}
+    namespace: infra
diff --git a/...ts/bootstrap/apps/airbyte/mgmt/stack.yaml → .../catalogs/data/airbyte/airbyte-stack.yaml b/...ts/bootstrap/apps/airbyte/mgmt/stack.yaml → .../catalogs/data/airbyte/airbyte-stack.yaml
@@ -1,21 +1,22 @@
 apiVersion: deployments.plural.sh/v1alpha1
 kind: InfrastructureStack
 metadata:
-  name: airbyte-mgmt
+  name: airbyte-{{ context.cluster }}
+  namespace: apps
 spec:
   detach: false
   type: TERRAFORM
   approval: true
   manageState: true
   actor: [email protected]
-  configuration:
-    version: '1.8'
+  git:
+    ref: main
+    folder: terraform/apps/airbyte/{{ context.cluster }}
   repositoryRef:
     name: infra
     namespace: infra
+  configuration:
+    version: '1.8'
   clusterRef:
-    name: mgmt
+    name: {{ context.stackCluster }}
     namespace: infra
-  git:
-    ref: main
-    folder: terraform/apps/airbyte/aws