Skip to content

Commit 6530c91

Browse files
authored
Fix code generation (#2181)
1 parent 7452337 commit 6530c91

File tree

37 files changed

+1001
-155
lines changed

37 files changed

+1001
-155
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ getdeps:
2828
go install github.com/golangci/golangci-lint/cmd/[email protected] && \
2929
echo "Installing govulncheck" && \
3030
go install golang.org/x/vuln/cmd/govulncheck@latest &&\
31-
echo "installng gopls" && \
31+
echo "installing gopls" && \
3232
go install golang.org/x/tools/gopls@latest
3333

3434
verify: getdeps govet lint

config/manifests/kustomization.yaml

+36-35
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,42 @@
11
namespace: minio-operator
22

33
resources:
4-
- bases/minio-operator.clusterserviceversion.yaml
5-
- bases/minio-operator-rhmp.clusterserviceversion.yaml
6-
- ../../resources/
7-
- ../../samples/
4+
- bases/minio-operator.clusterserviceversion.yaml
5+
- bases/minio-operator-rhmp.clusterserviceversion.yaml
6+
- ../../resources/
7+
- ../../samples/
88

9-
patchesStrategicMerge:
10-
- overlay/minio-operator-deployment.yaml
11-
- overlay/console-deployment.yaml
12-
- overlay/console_v1_service.yaml
13-
- overlay/sts_v1_service.yaml
149

1510
patches:
16-
- target:
17-
group: apps
18-
version: v1
19-
kind: Deployment
20-
name: console
21-
namespace: minio-operator
22-
patch: |-
23-
- op: remove
24-
path: /spec/template/spec/containers/0/securityContext/runAsGroup
25-
- op: remove
26-
path: /spec/template/spec/containers/0/securityContext/runAsUser
27-
- op: remove
28-
path: /spec/template/spec/containers/0/securityContext/runAsNonRoot
29-
- target:
30-
group: apps
31-
version: v1
32-
kind: Deployment
33-
name: minio-operator
34-
namespace: minio-operator
35-
patch: |-
36-
- op: remove
37-
path: /spec/template/spec/containers/0/securityContext/runAsGroup
38-
- op: remove
39-
path: /spec/template/spec/containers/0/securityContext/runAsUser
40-
- op: remove
41-
path: /spec/template/spec/containers/0/securityContext/runAsNonRoot
11+
- patch: |-
12+
- op: remove
13+
path: /spec/template/spec/containers/0/securityContext/runAsGroup
14+
- op: remove
15+
path: /spec/template/spec/containers/0/securityContext/runAsUser
16+
- op: remove
17+
path: /spec/template/spec/containers/0/securityContext/runAsNonRoot
18+
target:
19+
group: apps
20+
kind: Deployment
21+
name: console
22+
namespace: minio-operator
23+
version: v1
24+
- patch: |-
25+
- op: remove
26+
path: /spec/template/spec/containers/0/securityContext/runAsGroup
27+
- op: remove
28+
path: /spec/template/spec/containers/0/securityContext/runAsUser
29+
- op: remove
30+
path: /spec/template/spec/containers/0/securityContext/runAsNonRoot
31+
target:
32+
group: apps
33+
kind: Deployment
34+
name: minio-operator
35+
namespace: minio-operator
36+
version: v1
37+
- path: overlay/minio-operator-deployment.yaml
38+
- path: overlay/console-deployment.yaml
39+
- path: overlay/console_v1_service.yaml
40+
- path: overlay/sts_v1_service.yaml
41+
apiVersion: kustomize.config.k8s.io/v1beta1
42+
kind: Kustomization

docs/job_crd.adoc

+24
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,30 @@ Commands List of MinioClient commands
199199
|*`mcImage`* __string__
200200
|mc job image
201201

202+
|*`imagePullPolicy`* __link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#pullpolicy-v1-core[$$PullPolicy$$]__
203+
|*Optional* +
204+
205+
206+
The pull policy for the MinIO Docker image. Specify one of the following: +
207+
208+
209+
* `Always` +
210+
211+
212+
* `Never` +
213+
214+
215+
* `IfNotPresent` (Default) +
216+
217+
218+
Refer Kubernetes documentation for details https://kubernetes.io/docs/concepts/containers/images#updating-images
219+
220+
|*`imagePullSecret`* __link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#localobjectreference-v1-core[$$LocalObjectReference$$] array__
221+
|*Optional* +
222+
223+
224+
Specify the secret key to use for pulling images from a private Docker repository. +
225+
202226
|*`securityContext`* __link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#podsecuritycontext-v1-core[$$PodSecurityContext$$]__
203227
|*Optional* +
204228

docs/tenant-creation.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ namespace: minio-tenant
3434
resources:
3535
- github.com/minio/operator/examples/kustomization/base
3636

37-
patchesStrategicMerge:
38-
- tenant.yaml
37+
patches:
38+
- path: tenant.yaml
3939
```
4040
4141
and an overlay `tenant.yaml` like:

examples/kustomization/base/kustomization.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: Kustomization
44
namespace: minio-tenant
55

66
resources:
7-
- namespace.yaml
8-
- tenant-config.yaml
9-
- storage-user.yaml
10-
- tenant.yaml
7+
- namespace.yaml
8+
- tenant-config.yaml
9+
- storage-user.yaml
10+
- tenant.yaml

examples/kustomization/cert-manager/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33

44
resources:
5-
- selfsigned-root-clusterissuer.yaml
5+
- selfsigned-root-clusterissuer.yaml

examples/kustomization/operator-certmanager/kustomization.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33

44
resources:
5-
- ../cert-manager
6-
- ../../../resources
7-
- operator-ca-tls-secret.yaml
8-
- sts-tls-certificate.yaml
9-
- console-tls-certificate.yaml
10-
- minio-operator-ca-issuer.yaml
5+
- ../cert-manager
6+
- ../../../resources
7+
- operator-ca-tls-secret.yaml
8+
- sts-tls-certificate.yaml
9+
- console-tls-certificate.yaml
10+
- minio-operator-ca-issuer.yaml
1111

1212
patches:
13-
- path: operator-deployment.yaml
13+
- path: operator-deployment.yaml

examples/kustomization/operator-external-idp-oid/kustomization.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33

44
resources:
5-
- ../../../resources
6-
- console-tls-secret.yaml
5+
- ../../../resources
6+
- console-tls-secret.yaml
77

8-
patchesStrategicMerge:
9-
- console-deployment.yaml
8+
patches:
9+
- path: console-deployment.yaml

examples/kustomization/sts-example/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33

44
resources:
5-
- sts-app
5+
- sts-app

examples/kustomization/tenant-PodSecurityPolicies/kustomization.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ kind: Kustomization
44
namespace: tenant-psp
55

66
resources:
7-
- auditlog-sa.yaml
8-
- prometheus-sa.yaml
9-
- minio-sa.yaml
10-
- ../base
7+
- auditlog-sa.yaml
8+
- prometheus-sa.yaml
9+
- minio-sa.yaml
10+
- ../base
1111

12-
patchesStrategicMerge:
13-
- tenant.yaml
12+
patches:
13+
- path: tenant.yaml

examples/kustomization/tenant-certmanager-kes/kustomization.yaml

+6-7
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ kind: Kustomization
44
namespace: tenant-certmanager-kes
55

66
resources:
7-
- ../cert-manager
8-
- myminio-kes-certificate.yaml
9-
- vault.yaml
10-
- ../tenant-kes-encryption
11-
12-
patchesStrategicMerge:
13-
- tenant.yaml
7+
- ../cert-manager
8+
- myminio-kes-certificate.yaml
9+
- vault.yaml
10+
- ../tenant-kes-encryption
1411

12+
patches:
13+
- path: tenant.yaml

examples/kustomization/tenant-certmanager/kustomization.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ kind: Kustomization
33
namespace: tenant-certmanager
44

55
resources:
6-
- tenant-certmanager-issuer.yaml
7-
- tenant-certmanager-ca-certificate.yaml
8-
- tenant-certmanager-myminio-certificate.yaml
9-
- ../base
6+
- tenant-certmanager-issuer.yaml
7+
- tenant-certmanager-ca-certificate.yaml
8+
- tenant-certmanager-myminio-certificate.yaml
9+
- ../base
1010

1111
patches:
12-
- path: tenant.yaml
12+
- path: tenant.yaml

examples/kustomization/tenant-external-idp-ldap/kustomization.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ kind: Kustomization
44
namespace: tenant-external-idp-ldap
55

66
resources:
7-
- ../base
8-
- openldap.yaml
7+
- ../base
8+
- openldap.yaml
99

10-
patchesStrategicMerge:
11-
- tenant.yaml
12-
- storage-user.yaml
10+
patches:
11+
- path: tenant.yaml
12+
- path: storage-user.yaml

examples/kustomization/tenant-external-idp-oidc/kustomization.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: Kustomization
44
namespace: tenant-external-idp-oidc
55

66
resources:
7-
- ../base
7+
- ../base
88

9-
patchesStrategicMerge:
10-
- tenant.yaml
9+
patches:
10+
- path: tenant.yaml

examples/kustomization/tenant-kes-encryption-gcp/kustomization.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ kind: Kustomization
44
namespace: tenant-kms-encrypted
55

66
resources:
7-
- ../base
8-
- kes-configuration-secret.yaml
9-
- gcp-default-creds-secret.yaml
10-
- kes-service-account.yaml
7+
- ../base
8+
- kes-configuration-secret.yaml
9+
- gcp-default-creds-secret.yaml
10+
- kes-service-account.yaml
1111

12-
patchesStrategicMerge:
13-
- tenant.yaml
12+
patches:
13+
- path: tenant.yaml

examples/kustomization/tenant-kes-encryption/kustomization.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ kind: Kustomization
44
namespace: tenant-kms-encrypted
55

66
resources:
7-
- ../base
8-
- kes-configuration-secret.yaml
7+
- ../base
8+
- kes-configuration-secret.yaml
99

10-
patchesStrategicMerge:
11-
- tenant.yaml
10+
patches:
11+
- path: tenant.yaml

examples/kustomization/tenant-letsencrypt/kustomization.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ kind: Kustomization
44
namespace: tenant-letsencrypt
55

66
resources:
7-
- ingress.yaml
8-
- ../base
7+
- ingress.yaml
8+
- ../base
99

10-
patchesStrategicMerge:
11-
- tenant.yaml
10+
patches:
11+
- path: tenant.yaml

examples/kustomization/tenant-lite/kustomization.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: Kustomization
44
namespace: tenant-lite
55

66
resources:
7-
- ../base
7+
- ../base
88

9-
patchesStrategicMerge:
10-
- tenant.yaml
9+
patches:
10+
- path: tenant.yaml

examples/kustomization/tenant-nodeport/kustomization.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ kind: Kustomization
44
namespace: tenant-nodeport
55

66
resources:
7-
- ../base
8-
- nodeport-service.yaml
7+
- ../base
8+
- nodeport-service.yaml

examples/kustomization/tenant-openshift/kustomization.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ kind: Kustomization
44
namespace: minio-tenant
55

66
resources:
7-
- ../base
7+
- ../base
88
patches:
9-
- path: tenant.yaml
9+
- path: tenant.yaml

examples/kustomization/tenant-tiny/kustomization.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: Kustomization
44
namespace: tenant-tiny
55

66
resources:
7-
- ../base
7+
- ../base
88

9-
patchesStrategicMerge:
10-
- tenant.yaml
9+
patches:
10+
- path: tenant.yaml

0 commit comments

Comments
 (0)