diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d1a598c1d..3cd7d1cdb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,8 +4,13 @@ on: pull_request: branches: - master + - e2e-release-flow types: - closed + push: + branches: + - master + - e2e-release-flow jobs: build: environment: @@ -32,6 +37,8 @@ jobs: - name: report image with: + CF_VERBOSE: true + # Runtime to use for the enrichment. CF_RUNTIME_NAME: 'test-date' CF_PLATFORM_URL: 'https://pre-prod.codefresh.io' diff --git a/canary-rollout-ingress/canary-ingress.yaml b/canary-rollout-ingress/canary-ingress.yaml deleted file mode 100644 index a83bfc388..000000000 --- a/canary-rollout-ingress/canary-ingress.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: canary-demo - annotations: - ingress.kubernetes.io/proxy-body-size: 100M - kubernetes.io/ingress.class: nginx - ingress.kubernetes.io/app-root: / -spec: - rules: - - host: canary.dev.argoproj.io - http: - paths: - - path: / - pathType: ImplementationSpecific - backend: - service: - name: canary-demo - port: - number: 80 diff --git a/canary-rollout-ingress/canary-preview-ingress.yaml b/canary-rollout-ingress/canary-preview-ingress.yaml deleted file mode 100644 index f7dc0c56f..000000000 --- a/canary-rollout-ingress/canary-preview-ingress.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: canary-demo-preview - annotations: - ingress.kubernetes.io/proxy-body-size: 100M - kubernetes.io/ingress.class: nginx - ingress.kubernetes.io/app-root: / -spec: - rules: - - host: canary-preview.dev.argoproj.io - http: - paths: - - path: / - pathType: ImplementationSpecific - backend: - service: - name: canary-demo-preview - port: - number: 80 diff --git a/canary-rollout-ingress/canary-rollout.yaml b/canary-rollout-ingress/canary-rollout.yaml index 53a4943bf..8f89e7415 100644 --- a/canary-rollout-ingress/canary-rollout.yaml +++ b/canary-rollout-ingress/canary-rollout.yaml @@ -15,9 +15,7 @@ spec: spec: containers: - name: canary-demo - #image: boblinger/rollouts-demo:purple - image: boblinger/rollouts-demo:blue - # image: boblinger/rollouts-demo:green + image: testcodefresh/rollouts-demo:green imagePullPolicy: Always ports: - name: http diff --git a/canary-rollout-ingress/kustomization.yaml b/canary-rollout-ingress/kustomization.yaml index 1c96703e3..a48b082df 100644 --- a/canary-rollout-ingress/kustomization.yaml +++ b/canary-rollout-ingress/kustomization.yaml @@ -4,6 +4,6 @@ kind: Kustomization resources: - canary-rollout.yaml - canary-service.yaml -- canary-ingress.yaml - canary-preview-service.yaml -- canary-preview-ingress.yaml \ No newline at end of file +# - canary-preview-ingress.yaml +# - canary-ingress.yaml diff --git a/service.yaml b/service.yaml index 24560d9b8..a5b73ed2e 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -blue +green