Skip to content

Commit 54942c4

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #252 from swghosh/istio-csr-rebase
CM-521: Rebase with istio-csr v0.14
2 parents ac9cc76 + 42908eb commit 54942c4

25 files changed

+592
-550
lines changed

‎Makefile

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ GOLANGCI_LINT_BIN=$(BIN_DIR)/golangci-lint
9797

9898
OPERATOR_SDK_BIN=$(BIN_DIR)/operator-sdk
9999

100+
HELM_BIN=$(BIN_DIR)/helm
101+
100102
COMMIT ?= $(shell git rev-parse HEAD)
101103
SHORTCOMMIT ?= $(shell git rev-parse --short HEAD)
102104
GOBUILD_VERSION_ARGS = -ldflags "-X $(PACKAGE)/pkg/version.SHORTCOMMIT=$(SHORTCOMMIT) -X $(PACKAGE)/pkg/version.COMMIT=$(COMMIT)"
@@ -107,7 +109,7 @@ E2E_TIMEOUT ?= 1h
107109
E2E_GINKGO_LABEL_FILTER ?= "Platform: isSubsetOf {AWS}"
108110

109111
MANIFEST_SOURCE = https://github.com/cert-manager/cert-manager/releases/download/v1.15.5/cert-manager.yaml
110-
112+
ISTIO_CSR_VERSION = "v0.14.0"
111113

112114
##@ Development
113115

@@ -141,8 +143,9 @@ test: manifests generate fmt vet ## Run tests.
141143
mkdir -p "$(ENVTEST_ASSETS_DIR)"
142144
KUBEBUILDER_ASSETS="$(shell $(SETUP_ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(ENVTEST_ASSETS_DIR) -p path)" go test ./... -coverprofile cover.out
143145

144-
update-manifests:
146+
update-manifests: $(HELM_BIN)
145147
hack/update-cert-manager-manifests.sh $(MANIFEST_SOURCE)
148+
hack/update-istio-csr-manifests.sh $(ISTIO_CSR_VERSION)
146149
.PHONY: update-manifests
147150

148151
update-scripts:
@@ -285,6 +288,10 @@ $(OPERATOR_SDK_BIN):
285288
mkdir -p $(BIN_DIR)
286289
hack/operator-sdk.sh $(OPERATOR_SDK_BIN)
287290

291+
$(HELM_BIN):
292+
mkdir -p $(BIN_DIR)
293+
hack/helm.sh $(HELM_BIN)
294+
288295
clean:
289296
go clean
290297
rm -f $(BIN)

‎bindata/istio-csr/cert-manager-istio-csr-clusterrole.yaml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
kind: ClusterRole
2+
apiVersion: rbac.authorization.k8s.io/v1
3+
metadata:
4+
labels:
5+
app.kubernetes.io/name: cert-manager-istio-csr
6+
app.kubernetes.io/instance: cert-manager-istio-csr
7+
app.kubernetes.io/version: v0.14.0
8+
app.kubernetes.io/managed-by: cert-manager-operator
9+
name: cert-manager-istio-csr
10+
rules:
11+
- apiGroups:
12+
- ""
13+
resources:
14+
- configmaps
15+
verbs:
16+
- get
17+
- list
18+
- create
19+
- update
20+
- watch
21+
- apiGroups:
22+
- ""
23+
resources:
24+
- namespaces
25+
verbs:
26+
- get
27+
- list
28+
- watch
29+
- apiGroups:
30+
- authentication.k8s.io
31+
resources:
32+
- tokenreviews
33+
verbs:
34+
- create

‎bindata/istio-csr/clusterrolebinding.yaml renamed to ‎bindata/istio-csr/cert-manager-istio-csr-clusterrolebinding.yaml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
1-
---
21
kind: ClusterRoleBinding
32
apiVersion: rbac.authorization.k8s.io/v1
43
metadata:
54
labels:
6-
app: cert-manager-istio-csr
75
app.kubernetes.io/name: cert-manager-istio-csr
86
app.kubernetes.io/instance: cert-manager-istio-csr
9-
app.kubernetes.io/version: "v0.12.0"
7+
app.kubernetes.io/version: v0.14.0
108
app.kubernetes.io/managed-by: cert-manager-operator
11-
app.kubernetes.io/part-of: cert-manager-operator
12-
generateName: cert-manager-istio-csr-
9+
name: cert-manager-istio-csr
1310
roleRef:
1411
apiGroup: rbac.authorization.k8s.io
1512
kind: ClusterRole
1613
name: cert-manager-istio-csr
1714
subjects:
18-
- kind: ServiceAccount
19-
name: cert-manager-istio-csr
20-
namespace: cert-manager
15+
- kind: ServiceAccount
16+
name: cert-manager-istio-csr
17+
namespace: cert-manager

‎bindata/istio-csr/cert-manager-istio-csr-deployment.yaml

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: cert-manager-istio-csr
5+
namespace: cert-manager
6+
labels:
7+
app.kubernetes.io/name: cert-manager-istio-csr
8+
app.kubernetes.io/instance: cert-manager-istio-csr
9+
app.kubernetes.io/version: v0.14.0
10+
app.kubernetes.io/managed-by: cert-manager-operator
11+
spec:
12+
replicas: 1
13+
selector:
14+
matchLabels:
15+
app: cert-manager-istio-csr
16+
template:
17+
metadata:
18+
labels:
19+
app: cert-manager-istio-csr
20+
app.kubernetes.io/name: cert-manager-istio-csr
21+
app.kubernetes.io/instance: cert-manager-istio-csr
22+
app.kubernetes.io/version: v0.14.0
23+
spec:
24+
serviceAccountName: cert-manager-istio-csr
25+
nodeSelector:
26+
kubernetes.io/os: linux
27+
containers:
28+
- name: cert-manager-istio-csr
29+
image: quay.io/jetstack/cert-manager-istio-csr:v0.14.0
30+
imagePullPolicy: IfNotPresent
31+
ports:
32+
- containerPort: 6443
33+
- containerPort: 9402
34+
readinessProbe:
35+
httpGet:
36+
port: 6060
37+
path: /readyz
38+
initialDelaySeconds: 3
39+
periodSeconds: 7
40+
args:
41+
- --log-level=1
42+
- --log-format=text
43+
- --metrics-port=9402
44+
- --readiness-probe-port=6060
45+
- --readiness-probe-path=/readyz
46+
- --certificate-namespace=istio-system
47+
- --issuer-enabled=true
48+
- --issuer-name=istio-ca
49+
- --issuer-kind=Issuer
50+
- --issuer-group=cert-manager.io
51+
- --preserve-certificate-requests=false
52+
- --root-ca-file=
53+
- --serving-certificate-dns-names=cert-manager-istio-csr.cert-manager.svc
54+
- --serving-certificate-duration=1h
55+
- --trust-domain=cluster.local
56+
- --cluster-id=Kubernetes
57+
- --max-client-certificate-duration=1h
58+
- --serving-address=0.0.0.0:6443
59+
- --serving-certificate-key-size=2048
60+
- --serving-signature-algorithm=RSA
61+
- --enable-client-cert-authenticator=false
62+
- --leader-election-namespace=istio-system
63+
- --disable-kubernetes-client-rate-limiter=false
64+
- --runtime-issuance-config-map-name=
65+
- --runtime-issuance-config-map-namespace=cert-manager
66+
- --istiod-cert-enabled=false
67+
- --istiod-cert-name=istiod-dynamic
68+
- --istiod-cert-namespace=istio-system
69+
- --istiod-cert-duration=1h
70+
- --istiod-cert-renew-before=30m
71+
- --istiod-cert-key-algorithm=RSA
72+
- --istiod-cert-key-size=2048
73+
- --istiod-cert-additional-dns-names=
74+
- --istiod-cert-istio-revisions=default
75+
resources: {}
76+
securityContext:
77+
allowPrivilegeEscalation: false
78+
capabilities:
79+
drop:
80+
- ALL
81+
readOnlyRootFilesystem: true
82+
runAsNonRoot: true

‎bindata/istio-csr/cert-manager-istio-csr-leases-role.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
kind: Role
2+
apiVersion: rbac.authorization.k8s.io/v1
3+
metadata:
4+
labels:
5+
app.kubernetes.io/name: cert-manager-istio-csr
6+
app.kubernetes.io/instance: cert-manager-istio-csr
7+
app.kubernetes.io/version: v0.14.0
8+
app.kubernetes.io/managed-by: cert-manager-operator
9+
name: cert-manager-istio-csr-leases
10+
namespace: istio-system
11+
rules:
12+
- apiGroups:
13+
- coordination.k8s.io
14+
resources:
15+
- leases
16+
verbs:
17+
- get
18+
- create
19+
- update
20+
- watch
21+
- list
22+
- apiGroups:
23+
- ""
24+
resources:
25+
- events
26+
verbs:
27+
- create

‎bindata/istio-csr/rolebinding_leases.yaml renamed to ‎bindata/istio-csr/cert-manager-istio-csr-leases-rolebinding.yaml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
1-
---
21
kind: RoleBinding
32
apiVersion: rbac.authorization.k8s.io/v1
43
metadata:
54
name: cert-manager-istio-csr-leases
6-
namespace: cert-manager
5+
namespace: istio-system
76
labels:
8-
app: cert-manager-istio-csr
97
app.kubernetes.io/name: cert-manager-istio-csr
108
app.kubernetes.io/instance: cert-manager-istio-csr
11-
app.kubernetes.io/version: "v0.12.0"
9+
app.kubernetes.io/version: v0.14.0
1210
app.kubernetes.io/managed-by: cert-manager-operator
13-
app.kubernetes.io/part-of: cert-manager-operator
1411
roleRef:
1512
apiGroup: rbac.authorization.k8s.io
1613
kind: Role
1714
name: cert-manager-istio-csr-leases
1815
subjects:
19-
- kind: ServiceAccount
20-
name: cert-manager-istio-csr
21-
namespace: cert-manager
16+
- kind: ServiceAccount
17+
name: cert-manager-istio-csr
18+
namespace: cert-manager

‎bindata/istio-csr/cert-manager-istio-csr-role.yaml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
kind: Role
2+
apiVersion: rbac.authorization.k8s.io/v1
3+
metadata:
4+
labels:
5+
app.kubernetes.io/name: cert-manager-istio-csr
6+
app.kubernetes.io/instance: cert-manager-istio-csr
7+
app.kubernetes.io/version: v0.14.0
8+
app.kubernetes.io/managed-by: cert-manager-operator
9+
name: cert-manager-istio-csr
10+
namespace: istio-system
11+
rules:
12+
- apiGroups:
13+
- cert-manager.io
14+
resources:
15+
- certificaterequests
16+
verbs:
17+
- get
18+
- list
19+
- create
20+
- update
21+
- delete
22+
- watch
23+
- apiGroups:
24+
- ""
25+
resources:
26+
- events
27+
verbs:
28+
- create

‎bindata/istio-csr/rolebinding.yaml renamed to ‎bindata/istio-csr/cert-manager-istio-csr-rolebinding.yaml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
1-
---
21
kind: RoleBinding
32
apiVersion: rbac.authorization.k8s.io/v1
43
metadata:
54
name: cert-manager-istio-csr
6-
namespace: cert-manager
5+
namespace: istio-system
76
labels:
8-
app: cert-manager-istio-csr
97
app.kubernetes.io/name: cert-manager-istio-csr
108
app.kubernetes.io/instance: cert-manager-istio-csr
11-
app.kubernetes.io/version: "v0.12.0"
9+
app.kubernetes.io/version: v0.14.0
1210
app.kubernetes.io/managed-by: cert-manager-operator
13-
app.kubernetes.io/part-of: cert-manager-operator
1411
roleRef:
1512
apiGroup: rbac.authorization.k8s.io
1613
kind: Role
1714
name: cert-manager-istio-csr
1815
subjects:
19-
- kind: ServiceAccount
20-
name: cert-manager-istio-csr
21-
namespace: cert-manager
16+
- kind: ServiceAccount
17+
name: cert-manager-istio-csr
18+
namespace: cert-manager

‎bindata/istio-csr/service.yaml renamed to ‎bindata/istio-csr/cert-manager-istio-csr-service.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
---
21
apiVersion: v1
32
kind: Service
43
metadata:
@@ -8,9 +7,8 @@ metadata:
87
app: cert-manager-istio-csr
98
app.kubernetes.io/name: cert-manager-istio-csr
109
app.kubernetes.io/instance: cert-manager-istio-csr
11-
app.kubernetes.io/version: "v0.12.0"
10+
app.kubernetes.io/version: v0.14.0
1211
app.kubernetes.io/managed-by: cert-manager-operator
13-
app.kubernetes.io/part-of: cert-manager-operator
1412
spec:
1513
type: ClusterIP
1614
ports:

‎bindata/istio-csr/serviceaccount.yaml renamed to ‎bindata/istio-csr/cert-manager-istio-csr-serviceaccount.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
---
21
apiVersion: v1
32
kind: ServiceAccount
43
metadata:
54
labels:
6-
app: cert-manager-istio-csr
75
app.kubernetes.io/name: cert-manager-istio-csr
86
app.kubernetes.io/instance: cert-manager-istio-csr
9-
app.kubernetes.io/version: "v0.12.0"
7+
app.kubernetes.io/version: v0.14.0
108
app.kubernetes.io/managed-by: cert-manager-operator
11-
app.kubernetes.io/part-of: cert-manager-operator
129
name: cert-manager-istio-csr
1310
namespace: cert-manager

0 commit comments

Comments
 (0)