Skip to content

Commit 5f66aa9

Browse files
authored
Wf-ingress-annotations (#177)
* added ingress annotations to connect with wf https
1 parent a8cf3f8 commit 5f66aa9

File tree

4 files changed

+41
-31
lines changed

4 files changed

+41
-31
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION=v0.0.163
1+
VERSION=v0.0.164
22

33
OUT_DIR=dist
44
YEAR?=$(shell date +"%Y")

cmd/commands/runtime.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -975,9 +975,15 @@ func createWorkflowsIngress(ctx context.Context, cloneOpts *git.CloneOptions, rt
975975
ingress := ingressutil.CreateIngress(&ingressutil.CreateIngressOptions{
976976
Name: rt.Name + store.Get().WorkflowsIngressName,
977977
Namespace: rt.Namespace,
978+
Annotations: map[string]string{
979+
"ingress.kubernetes.io/protocol": "https",
980+
"ingress.kubernetes.io/rewrite-target": "/$2",
981+
"nginx.ingress.kubernetes.io/backend-protocol": "https",
982+
"nginx.ingress.kubernetes.io/rewrite-target": "/$2",
983+
},
978984
Paths: []ingressutil.IngressPath{
979985
{
980-
Path: fmt.Sprintf("/%s/", store.Get().WorkflowsIngressPath),
986+
Path: fmt.Sprintf("/%s(/|$)(.*)", store.Get().WorkflowsIngressPath),
981987
PathType: netv1.PathTypeImplementationSpecific,
982988
ServiceName: store.Get().ArgoWFServiceName,
983989
ServicePort: store.Get().ArgoWFServicePort,

docs/releases/release_notes.md

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
### Installed Applications:
2-
* Argo CD [v2.1.3](https://github.com/codefresh-io/argo-cd/releases/tag/v2.1.3)
3-
* Argo CD ApplicationSet Controller [v0.2.0](https://github.com/argoproj-labs/applicationset/releases/tag/v0.2.0)
4-
* Argo Events [v1.4.0](https://github.com/argoproj/argo-events/releases/tag/v1.4.0)
5-
* Argo Rollouts [v1.1.0](https://github.com/argoproj/argo-rollouts/releases/tag/v1.1.0)
6-
* Argo Workflows [v3.1.8](https://github.com/argoproj/argo-workflows/releases/tag/v3.1.8)
2+
3+
- Argo CD [v2.1.3](https://github.com/codefresh-io/argo-cd/releases/tag/v2.1.3)
4+
- Argo CD ApplicationSet Controller [v0.2.0](https://github.com/argoproj-labs/applicationset/releases/tag/v0.2.0)
5+
- Argo Events [v1.4.0](https://github.com/argoproj/argo-events/releases/tag/v1.4.0)
6+
- Argo Rollouts [v1.1.0](https://github.com/argoproj/argo-rollouts/releases/tag/v1.1.0)
7+
- Argo Workflows [v3.1.8](https://github.com/argoproj/argo-workflows/releases/tag/v3.1.8)
78

89
### Using brew:
10+
911
```bash
1012
# tap Codefresh homebrew repo
1113
brew tap codefresh-io/cli
@@ -18,9 +20,10 @@ cf version
1820
```
1921

2022
### Linux
23+
2124
```bash
2225
# download and extract the binary
23-
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.163/cf-linux-amd64.tar.gz | tar zx
26+
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.164/cf-linux-amd64.tar.gz | tar zx
2427

2528
# move the binary to your $PATH
2629
mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -30,9 +33,10 @@ cf version
3033
```
3134

3235
### Mac
36+
3337
```bash
3438
# download and extract the binary
35-
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.163/cf-darwin-amd64.tar.gz | tar zx
39+
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.164/cf-darwin-amd64.tar.gz | tar zx
3640

3741
# move the binary to your $PATH
3842
mv ./cf-darwin-amd64 /usr/local/bin/cf

manifests/runtime.yaml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
apiVersion: codefresh.io/v1alpha1
22
kind: Runtime
33
metadata:
4-
name: "{{ name }}"
5-
namespace: "{{ namespace }}"
4+
name: '{{ name }}'
5+
namespace: '{{ namespace }}'
66
spec:
7-
defVersion: 1.0.0
8-
version: 0.0.163
9-
bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
10-
components:
11-
- name: events
12-
type: kustomize
13-
url: github.com/codefresh-io/cli-v2/manifests/argo-events
14-
wait: true
15-
- name: rollouts
16-
type: kustomize
17-
url: github.com/codefresh-io/cli-v2/manifests/argo-rollouts
18-
- name: workflows
19-
type: kustomize
20-
url: github.com/codefresh-io/cli-v2/manifests/argo-workflows
21-
- name: argocd-agent
22-
type: kustomize
23-
url: github.com/codefresh-io/cli-v2/manifests/argo-agent
24-
- name: app-proxy
25-
type: kustomize
26-
url: github.com/codefresh-io/cli-v2/manifests/app-proxy
7+
defVersion: 1.0.0
8+
version: 0.0.164
9+
bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
10+
components:
11+
- name: events
12+
type: kustomize
13+
url: github.com/codefresh-io/cli-v2/manifests/argo-events
14+
wait: true
15+
- name: rollouts
16+
type: kustomize
17+
url: github.com/codefresh-io/cli-v2/manifests/argo-rollouts
18+
- name: workflows
19+
type: kustomize
20+
url: github.com/codefresh-io/cli-v2/manifests/argo-workflows
21+
- name: argocd-agent
22+
type: kustomize
23+
url: github.com/codefresh-io/cli-v2/manifests/argo-agent
24+
- name: app-proxy
25+
type: kustomize
26+
url: github.com/codefresh-io/cli-v2/manifests/app-proxy

0 commit comments

Comments
 (0)