Skip to content

Commit 73abaa4

Browse files
authored
Merge pull request #308 from citrix/bare-metal-yaml-changes
modified the folder structure in bare metal as per suggestion
2 parents 3a3feaf + d750851 commit 73abaa4

3 files changed

Lines changed: 72 additions & 80 deletions

File tree

deployment/baremetal/yaml-cpx-crediential-changes/cpx-cic-latest.yaml

Lines changed: 0 additions & 78 deletions
This file was deleted.

deployment/baremetal/yaml-cpx-crediential-changes/cpx-cic-previous.yaml

Lines changed: 71 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,73 @@
1+
kind: ClusterRole
2+
apiVersion: rbac.authorization.k8s.io/v1beta1
3+
metadata:
4+
name: cpx-ingress-k8s-role
5+
rules:
6+
- apiGroups: [""]
7+
resources: ["endpoints", "ingresses", "pods", "secrets", "nodes", "routes", "namespaces", "configmaps"]
8+
verbs: ["get", "list", "watch"]
9+
# services/status is needed to update the loadbalancer IP in service status for integrating
10+
# service of type LoadBalancer with external-dns
11+
- apiGroups: [""]
12+
resources: ["services/status"]
13+
verbs: ["patch"]
14+
- apiGroups: [""]
15+
resources: ["services"]
16+
verbs: ["get", "list", "watch", "patch"]
17+
- apiGroups: [""]
18+
resources: ["events"]
19+
verbs: ["create"]
20+
- apiGroups: ["extensions", "networking.k8s.io"]
21+
resources: ["ingresses"]
22+
verbs: ["get", "list", "watch"]
23+
- apiGroups: ["extensions", "networking.k8s.io"]
24+
resources: ["ingresses/status"]
25+
verbs: ["patch"]
26+
- apiGroups: ["apiextensions.k8s.io"]
27+
resources: ["customresourcedefinitions"]
28+
verbs: ["get", "list", "watch"]
29+
- apiGroups: ["apps"]
30+
resources: ["deployments"]
31+
verbs: ["get", "list", "watch"]
32+
- apiGroups: ["citrix.com"]
33+
resources: ["rewritepolicies", "continuousdeployments", "authpolicies", "ratelimits", "listeners", "httproutes", "wafs"]
34+
verbs: ["get", "list", "watch"]
35+
- apiGroups: ["citrix.com"]
36+
resources: ["rewritepolicies/status", "continuousdeployments/status", "ratelimits/status", "authpolicies/status", "listeners/status", "httproutes/status", "wafs/status"]
37+
verbs: ["get", "list", "patch"]
38+
- apiGroups: ["citrix.com"]
39+
resources: ["vips"]
40+
verbs: ["get", "list", "watch", "create", "delete"]
41+
- apiGroups: ["route.openshift.io"]
42+
resources: ["routes"]
43+
verbs: ["get", "list", "watch"]
44+
45+
---
46+
47+
kind: ClusterRoleBinding
48+
apiVersion: rbac.authorization.k8s.io/v1beta1
49+
metadata:
50+
name: cpx-ingress-k8s-role
51+
roleRef:
52+
apiGroup: rbac.authorization.k8s.io
53+
kind: ClusterRole
54+
name: cpx-ingress-k8s-role
55+
subjects:
56+
- kind: ServiceAccount
57+
name: cpx-ingress-k8s-role
58+
namespace: default
59+
apiVersion: rbac.authorization.k8s.io/v1
60+
61+
---
62+
63+
apiVersion: v1
64+
kind: ServiceAccount
65+
metadata:
66+
name: cpx-ingress-k8s-role
67+
namespace: default
68+
69+
---
70+
171
apiVersion: apps/v1
272
kind: Deployment
373
metadata:
@@ -17,7 +87,7 @@ spec:
1787
app: cpx-ingress
1888
annotations: null
1989
spec:
20-
serviceAccountName: citrix
90+
serviceAccountName: cpx-ingress-k8s-role
2191
containers:
2292
- name: cpx
2393
image: quay.io/citrix/citrix-k8s-cpx-ingress:13.0-58.30

docs/deploy/deploy-cic-yaml.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ Depending on whether you are using the latest Citrix ADC CPX version or an older
125125

126126
- For Citrix ADC CPX 13.0.64.35 and later versions, use the following YAML:
127127

128-
[cpx-ingress-latest.yaml](https://github.com/citrix/citrix-k8s-ingress-controller/blob/master/deployment/baremetal/yaml-cpx-crediential-changes/cpx-cic-latest.yaml)
128+
[citrix-k8s-cpx-ingress.yml](https://github.com/citrix/citrix-k8s-ingress-controller/blob/master/deployment/baremetal/citrix-k8s-cpx-ingress.yml)
129129

130130
As provided in the YAML, the following is a snippet of the volume mount configuration required in the YAML file both for the Citrix ingress controller and Citrix ADC CPX:
131131

0 commit comments

Comments
 (0)