diff --git a/.github/workflows/lre.yaml b/.github/workflows/lre.yaml index ad3d5cf2e5..2ac0799731 100644 --- a/.github/workflows/lre.yaml +++ b/.github/workflows/lre.yaml @@ -94,7 +94,11 @@ jobs: - name: Start Kubernetes cluster (Application) run: > nix develop --impure --command - bash -c "./deployment-examples/kubernetes/02_application.sh" + bash -c " + ./deployment-examples/kubernetes/01_operations.sh & + sleep 5 + nix develop --impure --command tkn pr logs -f -L + wait" - name: Get gateway IPs id: gateway-ips diff --git a/native-cli/components/embedded/capacitor.yaml b/native-cli/components/embedded/capacitor.yaml index e9de009148..b133179905 100644 --- a/native-cli/components/embedded/capacitor.yaml +++ b/native-cli/components/embedded/capacitor.yaml @@ -1,46 +1,46 @@ ---- -apiVersion: source.toolkit.fluxcd.io/v1beta2 -kind: OCIRepository -metadata: - name: capacitor - namespace: flux-system -spec: - interval: 12h - url: oci://ghcr.io/gimlet-io/capacitor-manifests - ref: - semver: ">=0.1.0" ---- -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: capacitor - namespace: flux-system -spec: - targetNamespace: flux-system - interval: 1h - retryInterval: 2m - timeout: 5m - wait: true - prune: true - path: "./" - sourceRef: - kind: OCIRepository - name: capacitor ---- -apiVersion: "cilium.io/v2" -kind: CiliumNetworkPolicy -metadata: - name: allow-ingress-to-capacitor - namespace: flux-system -spec: - endpointSelector: - matchLabels: - app.kubernetes.io/name: onechart - app.kubernetes.io/instance: capacitor - ingress: - - fromEntities: - - ingress - - toPorts: - - ports: - - port: "9000" - protocol: TCP +# --- +# apiVersion: source.toolkit.fluxcd.io/v1beta2 +# kind: OCIRepository +# metadata: +# name: capacitor +# namespace: flux-system +# spec: +# interval: 12h +# url: oci://ghcr.io/gimlet-io/capacitor-manifests +# ref: +# semver: ">=0.1.0" +# --- +# apiVersion: kustomize.toolkit.fluxcd.io/v1 +# kind: Kustomization +# metadata: +# name: capacitor +# namespace: flux-system +# spec: +# targetNamespace: flux-system +# interval: 1h +# retryInterval: 2m +# timeout: 5m +# wait: true +# prune: true +# path: "./" +# sourceRef: +# kind: OCIRepository +# name: capacitor +# --- +# apiVersion: "cilium.io/v2" +# kind: CiliumNetworkPolicy +# metadata: +# name: allow-ingress-to-capacitor +# namespace: flux-system +# spec: +# endpointSelector: +# matchLabels: +# app.kubernetes.io/name: onechart +# app.kubernetes.io/instance: capacitor +# ingress: +# - fromEntities: +# - ingress +# - toPorts: +# - ports: +# - port: "9000" +# protocol: TCP diff --git a/native-cli/components/embedded/kustomization.yaml b/native-cli/components/embedded/kustomization.yaml index ee96870803..76e19a96c0 100644 --- a/native-cli/components/embedded/kustomization.yaml +++ b/native-cli/components/embedded/kustomization.yaml @@ -8,6 +8,6 @@ resources: - nix2container-image-info.yaml - trigger.yaml - update-image-tags.yaml - - capacitor.yaml + # - capacitor.yaml # - nativelink-gateways.yaml # Gateways are handled in Pulumi via the # NativeLinkGateways resource. diff --git a/native-cli/components/embedded/nativelink-gateways.yaml b/native-cli/components/embedded/nativelink-gateways.yaml index 960289ad0a..72854d7f7f 100644 --- a/native-cli/components/embedded/nativelink-gateways.yaml +++ b/native-cli/components/embedded/nativelink-gateways.yaml @@ -57,15 +57,15 @@ spec: - name: tkn-gateway protocol: HTTP port: 80 ---- -apiVersion: gateway.networking.k8s.io/v1beta1 -kind: Gateway -metadata: - name: capacitor-gateway - namespace: flux-system -spec: - gatewayClassName: cilium - listeners: - - name: capacitor-gateway - protocol: HTTP - port: 80 +# --- +# apiVersion: gateway.networking.k8s.io/v1beta1 +# kind: Gateway +# metadata: +# name: capacitor-gateway +# namespace: flux-system +# spec: +# gatewayClassName: cilium +# listeners: +# - name: capacitor-gateway +# protocol: HTTP +# port: 80 diff --git a/native-cli/components/embedded/nativelink-routes.yaml b/native-cli/components/embedded/nativelink-routes.yaml index 192b098edc..a313b9a315 100644 --- a/native-cli/components/embedded/nativelink-routes.yaml +++ b/native-cli/components/embedded/nativelink-routes.yaml @@ -49,20 +49,20 @@ spec: backendRefs: - name: tekton-dashboard port: 9097 ---- -apiVersion: gateway.networking.k8s.io/v1 -kind: HTTPRoute -metadata: - name: capacitor-route - namespace: flux-system -spec: - parentRefs: - - sectionName: capacitor-gateway - name: capacitor-gateway - rules: - - matches: - - path: - value: / - backendRefs: - - name: capacitor - port: 9000 +# --- +# apiVersion: gateway.networking.k8s.io/v1 +# kind: HTTPRoute +# metadata: +# name: capacitor-route +# namespace: flux-system +# spec: +# parentRefs: +# - sectionName: capacitor-gateway +# name: capacitor-gateway +# rules: +# - matches: +# - path: +# value: / +# backendRefs: +# - name: capacitor +# port: 9000 diff --git a/native-cli/components/loadbalancer.go b/native-cli/components/loadbalancer.go index 61f3a421d4..7118b89a4b 100644 --- a/native-cli/components/loadbalancer.go +++ b/native-cli/components/loadbalancer.go @@ -310,7 +310,6 @@ func (component *Loadbalancer) Install( "el-gateway": false, "hubble-gateway": false, "tkn-gateway": false, - "capacitor-gateway": false, }, ), component.Gateways) if err != nil { diff --git a/native-cli/programs/local.go b/native-cli/programs/local.go index 32fff76730..5498e32ff1 100644 --- a/native-cli/programs/local.go +++ b/native-cli/programs/local.go @@ -58,15 +58,15 @@ func ProgramForLocalCluster(ctx *pulumi.Context) error { os.Exit(1) } - flux, err := components.AddComponent( - ctx, - "flux", - &components.Flux{Version: "2.3.0"}, - ) - if err != nil { - log.Println(err) - os.Exit(1) - } + // flux, err := components.AddComponent( + // ctx, + // "flux", + // &components.Flux{Version: "2.3.0"}, + // ) + // if err != nil { + // log.Println(err) + // os.Exit(1) + // } tektonPipelines, err := components.AddComponent( ctx, @@ -116,7 +116,6 @@ func ProgramForLocalCluster(ctx *pulumi.Context) error { tektonTriggers, localSources, nixStore, - flux, ), }, )) @@ -167,16 +166,16 @@ func ProgramForLocalCluster(ctx *pulumi.Context) error { }, } - capacitorGateway := components.Gateway{ - ExternalPort: 9000, //nolint:mnd - InternalPort: 9000, //nolint:mnd - Routes: []components.RouteConfig{ - { - Prefix: "/", - Cluster: "capacitor-gateway", - }, - }, - } + // capacitorGateway := components.Gateway{ + // ExternalPort: 9000, //nolint:mnd + // InternalPort: 9000, //nolint:mnd + // Routes: []components.RouteConfig{ + // { + // Prefix: "/", + // Cluster: "capacitor-gateway", + // }, + // }, + // } nativelinkGateway := components.Gateway{ ExternalPort: 8082, //nolint:mnd @@ -207,7 +206,7 @@ func ProgramForLocalCluster(ctx *pulumi.Context) error { "kind-loadbalancer", &components.Loadbalancer{ Gateways: []components.Gateway{ - capacitorGateway, + // capacitorGateway, nativelinkGateway, hubbleGateway, tknGateway,