Skip to content

Commit c4391c8

Browse files
devopstalesdevopstales
committed
fix permission-manager versions
1 parent f3de430 commit c4391c8

8 files changed

Lines changed: 244 additions & 16 deletions

File tree

‎charts/1-crd.yaml‎

Lines changed: 213 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,213 @@
1+
apiVersion: apiextensions.k8s.io/v1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: vulnerabilityreports.trivy-operator.devopstales.io
5+
labels:
6+
app.kubernetes.io/managed-by: trivy-operator
7+
spec:
8+
group: trivy-operator.devopstales.io
9+
versions:
10+
- name: v1
11+
served: true
12+
storage: true
13+
schema:
14+
openAPIV3Schema:
15+
description: |
16+
VulnerabilityReport summarizes vulnerabilities in application dependencies and operating system packages
17+
built into container images.
18+
type: object
19+
required:
20+
- apiVersion
21+
- kind
22+
- metadata
23+
- report
24+
properties:
25+
apiVersion:
26+
type: string
27+
kind:
28+
type: string
29+
metadata:
30+
type: object
31+
report:
32+
description: |
33+
Report is the actual vulnerability report data.
34+
type: object
35+
required:
36+
- updateTimestamp
37+
- artifact
38+
- summary
39+
- vulnerabilities
40+
properties:
41+
updateTimestamp:
42+
description: |
43+
UpdateTimestamp is a timestamp representing the server time in UTC when this report was updated.
44+
type: string
45+
format: date-time
46+
registry:
47+
description: |
48+
Registry is the registry the Artifact was pulled from.
49+
type: object
50+
properties:
51+
server:
52+
description: |
53+
Server the FQDN of registry server.
54+
type: string
55+
artifact:
56+
description: |
57+
Artifact represents a standalone, executable package of software that includes everything needed to
58+
run an application.
59+
type: object
60+
properties:
61+
repository:
62+
description: |
63+
Repository is the name of the repository in the Artifact registry.
64+
type: string
65+
tag:
66+
description: |
67+
Tag is a mutable, human-readable string used to identify an Artifact.
68+
type: string
69+
summary:
70+
description: |
71+
Summary is a summary of Vulnerability counts grouped by Severity.
72+
type: object
73+
required:
74+
- criticalCount
75+
- highCount
76+
- mediumCount
77+
- lowCount
78+
- unknownCount
79+
- status
80+
properties:
81+
criticalCount:
82+
description: |
83+
CriticalCount is the number of vulnerabilities with Critical Severity.
84+
type: integer
85+
minimum: 0
86+
highCount:
87+
description: |
88+
HighCount is the number of vulnerabilities with High Severity.
89+
type: integer
90+
minimum: 0
91+
mediumCount:
92+
description: |
93+
MediumCount is the number of vulnerabilities with Medium Severity.
94+
type: integer
95+
minimum: 0
96+
lowCount:
97+
description: |
98+
LowCount is the number of vulnerabilities with Low Severity.
99+
type: integer
100+
minimum: 0
101+
unknownCount:
102+
description: |
103+
UnknownCount is the number of vulnerabilities with unknown severity.
104+
type: integer
105+
minimum: 0
106+
status:
107+
description: |
108+
The status of the image scann
109+
type: string
110+
enum:
111+
- OK
112+
- ERROR
113+
vulnerabilities:
114+
description: |
115+
Vulnerabilities is a list of operating system (OS) or application software Vulnerability items found in the Artifact.
116+
type: array
117+
items:
118+
type: object
119+
required:
120+
- vulnerabilityID
121+
- resource
122+
- installedVersion
123+
- severity
124+
- title
125+
properties:
126+
vulnerabilityID:
127+
description: |
128+
VulnerabilityID the vulnerability identifier.
129+
type: string
130+
resource:
131+
description: |
132+
Resource is a vulnerable package, application, or library.
133+
type: string
134+
installedVersion:
135+
description: |
136+
InstalledVersion indicates the installed version of the Resource.
137+
type: string
138+
score:
139+
type: number
140+
severity:
141+
type: string
142+
enum:
143+
- CRITICAL
144+
- HIGH
145+
- MEDIUM
146+
- LOW
147+
- UNKNOWN
148+
- NONE
149+
- ERROR
150+
title:
151+
type: string
152+
description:
153+
type: string
154+
primaryLink:
155+
type: string
156+
links:
157+
type: array
158+
items:
159+
type: string
160+
additionalPrinterColumns:
161+
- jsonPath: .report.artifact.repository
162+
type: string
163+
name: Repository
164+
description: The name of image repository
165+
- jsonPath: .report.artifact.tag
166+
type: string
167+
name: Tag
168+
description: The name of image tag
169+
- jsonPath: .metadata.creationTimestamp
170+
type: date
171+
name: Age
172+
description: The age of the report
173+
- jsonPath: .report.summary.criticalCount
174+
type: integer
175+
name: Critical
176+
description: The number of critical vulnerabilities
177+
priority: 1
178+
- jsonPath: .report.summary.highCount
179+
type: integer
180+
name: High
181+
description: The number of high vulnerabilities
182+
priority: 1
183+
- jsonPath: .report.summary.mediumCount
184+
type: integer
185+
name: Medium
186+
description: The number of medium vulnerabilities
187+
priority: 1
188+
- jsonPath: .report.summary.lowCount
189+
type: integer
190+
name: Low
191+
description: The number of low vulnerabilities
192+
priority: 1
193+
- jsonPath: .report.summary.unknownCount
194+
type: integer
195+
name: Unknown
196+
description: The number of unknown vulnerabilities
197+
priority: 1
198+
- jsonPath: .report.summary.status
199+
type: string
200+
name: STATUS
201+
description: The status of the image scann
202+
priority: 0
203+
scope: Namespaced
204+
names:
205+
singular: vulnerabilityreport
206+
plural: vulnerabilityreports
207+
kind: VulnerabilityReport
208+
listKind: VulnerabilityReportList
209+
categories:
210+
- all
211+
shortNames:
212+
- vuln
213+
- vulns

‎charts/kube-openid-connect/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 1.0
18+
version: "1.1.0"
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to
2222
# follow Semantic Versioning. They should reflect the version the application is using.
2323
# It is recommended to use it with quotes.
24-
appVersion: "1.16.0"
24+
appVersion: "1.0.0"

‎charts/kube-openid-connect/templates/NOTES.txt‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,12 @@ systemctl restart kubelet
2222
brew tap devopstales/devopstales
2323
brew install kubectl-login
2424

25-
# Krew (macOS, Linux, Windows and ARM)
26-
kubectl krew install openid-connect
25+
# Main Krew with differente name (macOS, Linux, Windows and ARM)
26+
kubectl krew install dtlogin
27+
28+
# My krew repo (macOS, Linux, Windows and ARM)
29+
kubectl krew index add devopstales https://github.com/devopstales/krew
30+
kubectl krew install devopstales/login
2731

2832
# Chocolatey (Windows)
2933
choco install kubectl-login
@@ -34,5 +38,7 @@ https://github.com/devopstales/kube-openid-connect/releases
3438
4. Use the plugin to login:
3539

3640
$ kubectl login {{ .Values.server.oidcRedirectUrlHttpScema }}://{{ .Values.server.oidcRedirectUrlHost }}
41+
# OR I sou installed from main Krew
42+
kubectl dtlogin {{ .Values.server.oidcRedirectUrlHttpScema }}://{{ .Values.server.oidcRedirectUrlHost }}
3743
Configfile created with config for productioncluster to ~/.kube/config
3844
Happy Kubernetes interaction!

‎charts/permission-manager/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ apiVersion: v2
22
name: permission-manager
33
description: Web UI for ServiceAccount RBAC manager
44
type: application
5-
version: 1.7.1-2
5+
version: 1.8.0
66
appVersion: 1.7.1-rc1

‎charts/trivy-operator/crds/0-crd.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
name: namespace-scanners.trivy-operator.devopstales.io
5+
labels:
6+
app.kubernetes.io/managed-by: trivy-operator
57
spec:
68
conversion:
79
strategy: None
@@ -48,5 +50,3 @@ spec:
4850
type: object
4951
served: true
5052
storage: true
51-
subresources:
52-
status: {}

‎charts/trivy-operator/templates/2-pvc.yaml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ spec:
1414
storageClassName: ""
1515
{{- else }}
1616
storageClassName: "{{ .Values.persistence.storageClass }}"
17+
{{- end }}
1718
{{- end }}
1819
accessModes:
1920
- {{ .Values.persistence.accessMode | quote }}
20-
resources:
21-
requests:
22-
storage: {{ .Values.persistence.size }}
23-
{{- end }}
21+
resources:
22+
requests:
23+
storage: {{ .Values.persistence.size | quote }}
24+
{{- end }}

‎charts/trivy-operator/templates/3-deployment.yaml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,15 @@ spec:
4040
fieldPath: metadata.namespace
4141
- name: LOG_LEVEL
4242
value: "{{ .Values.log_level }}"
43+
{{- if .Values.admissionController.enabled }}
44+
- name: ADMISSION_CONTROLLER
45+
value: "{{ .Values.admissionController.token }}"
46+
{{- end }}
4347
{{- if .Values.githubToken.enabled }}
4448
- name: GITHUB_TOKEN
4549
value: "{{ .Values.githubToken.token }}"
4650
{{- end }}
47-
{{- if .Values.storage.enabled }}
51+
{{- if .Values.persistence.enabled }}
4852
volumeMounts:
4953
- name: cache
5054
mountPath: "/home/trivy-operator/trivy-cache"
@@ -56,7 +60,7 @@ spec:
5660
- name: https
5761
containerPort: 8443
5862
protocol: TCP
59-
{{- if .Values.storage.enabled }}
63+
{{- if .Values.persistence.enabled }}
6064
volumes:
6165
- name: cache
6266
persistentVolumeClaim:

‎charts/trivy-operator/values.yaml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ serviceMonitor:
2626

2727
persistence:
2828
enabled: true
29+
accessMode: "ReadWriteOnce"
30+
size: "1Gi"
31+
annotations: {}
2932
## database data Persistent Volume Storage Class
3033
## If defined, storageClassName: <storageClass>
3134
## If set to "-", storageClassName: "", which disables dynamic provisioning
@@ -34,15 +37,15 @@ persistence:
3437
## GKE, AWS & OpenStack)
3538
##
3639
# storageClass: "-"
37-
accessMode: ReadWriteOnce
38-
size: 1Gi
39-
annotations: {}
4040

4141
namespaceScanner:
4242
crontab: "*/5 * * * *"
4343
namespaceSelector: "trivy-scan"
4444
clusterWide: false
4545

46+
admissionController:
47+
enabled: false
48+
4649
registryAuth:
4750
enabled: false
4851
registry:
@@ -53,3 +56,4 @@ registryAuth:
5356
githubToken:
5457
enabled: false
5558
token: ""
59+

0 commit comments

Comments
 (0)