This repository has been archived by the owner on Mar 24, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 70
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #811 from laverya/allow-vendor-kustomize-overlays
Allow vendor-supplied kustomize overlays
- Loading branch information
Showing
25 changed files
with
896 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| { | ||
| "v1": { | ||
| "config": {}, | ||
| "releaseName": "ship", | ||
| "upstream": "__upstream__", | ||
| "contentSHA": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" | ||
| } | ||
| } |
54 changes: 54 additions & 0 deletions
54
...on/init/kustomize-overlay/expected/base/common/ClusterRole-nginx-ingress-clusterrole.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| apiVersion: rbac.authorization.k8s.io/v1beta1 | ||
| kind: ClusterRole | ||
| metadata: | ||
| labels: | ||
| app.kubernetes.io/name: ingress-nginx | ||
| app.kubernetes.io/part-of: ingress-nginx | ||
| name: nginx-ingress-clusterrole | ||
| rules: | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - configmaps | ||
| - endpoints | ||
| - nodes | ||
| - pods | ||
| - secrets | ||
| verbs: | ||
| - list | ||
| - watch | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - nodes | ||
| verbs: | ||
| - get | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - services | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch | ||
| - apiGroups: | ||
| - extensions | ||
| resources: | ||
| - ingresses | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - events | ||
| verbs: | ||
| - create | ||
| - patch | ||
| - apiGroups: | ||
| - extensions | ||
| resources: | ||
| - ingresses/status | ||
| verbs: | ||
| - update |
15 changes: 15 additions & 0 deletions
15
...erlay/expected/base/common/ClusterRoleBinding-nginx-ingress-clusterrole-nisa-binding.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| apiVersion: rbac.authorization.k8s.io/v1beta1 | ||
| kind: ClusterRoleBinding | ||
| metadata: | ||
| labels: | ||
| app.kubernetes.io/name: ingress-nginx | ||
| app.kubernetes.io/part-of: ingress-nginx | ||
| name: nginx-ingress-clusterrole-nisa-binding | ||
| roleRef: | ||
| apiGroup: rbac.authorization.k8s.io | ||
| kind: ClusterRole | ||
| name: nginx-ingress-clusterrole | ||
| subjects: | ||
| - kind: ServiceAccount | ||
| name: nginx-ingress-serviceaccount | ||
| namespace: ingress-nginx |
10 changes: 10 additions & 0 deletions
10
...t/kustomize-overlay/expected/base/common/ConfigMap-nginx-configuration-ingress-nginx.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| apiVersion: v1 | ||
| data: | ||
| use-proxy-protocol: "true" | ||
| kind: ConfigMap | ||
| metadata: | ||
| labels: | ||
| app.kubernetes.io/name: ingress-nginx | ||
| app.kubernetes.io/part-of: ingress-nginx | ||
| name: nginx-configuration | ||
| namespace: ingress-nginx |
8 changes: 8 additions & 0 deletions
8
...ion/init/kustomize-overlay/expected/base/common/ConfigMap-tcp-services-ingress-nginx.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| apiVersion: v1 | ||
| kind: ConfigMap | ||
| metadata: | ||
| labels: | ||
| app.kubernetes.io/name: ingress-nginx | ||
| app.kubernetes.io/part-of: ingress-nginx | ||
| name: tcp-services | ||
| namespace: ingress-nginx |
8 changes: 8 additions & 0 deletions
8
...ion/init/kustomize-overlay/expected/base/common/ConfigMap-udp-services-ingress-nginx.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| apiVersion: v1 | ||
| kind: ConfigMap | ||
| metadata: | ||
| labels: | ||
| app.kubernetes.io/name: ingress-nginx | ||
| app.kubernetes.io/part-of: ingress-nginx | ||
| name: udp-services | ||
| namespace: ingress-nginx |
75 changes: 75 additions & 0 deletions
75
...omize-overlay/expected/base/common/Deployment-nginx-ingress-controller-ingress-nginx.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| metadata: | ||
| labels: | ||
| app.kubernetes.io/name: ingress-nginx | ||
| app.kubernetes.io/part-of: ingress-nginx | ||
| name: nginx-ingress-controller | ||
| namespace: ingress-nginx | ||
| spec: | ||
| replicas: 1 | ||
| selector: | ||
| matchLabels: | ||
| app.kubernetes.io/name: ingress-nginx | ||
| app.kubernetes.io/part-of: ingress-nginx | ||
| template: | ||
| metadata: | ||
| annotations: | ||
| prometheus.io/port: "10254" | ||
| prometheus.io/scrape: "true" | ||
| labels: | ||
| app.kubernetes.io/name: ingress-nginx | ||
| app.kubernetes.io/part-of: ingress-nginx | ||
| spec: | ||
| containers: | ||
| - args: | ||
| - /nginx-ingress-controller | ||
| - --configmap=$(POD_NAMESPACE)/nginx-configuration | ||
| - --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services | ||
| - --udp-services-configmap=$(POD_NAMESPACE)/udp-services | ||
| - --publish-service=$(POD_NAMESPACE)/ingress-nginx | ||
| - --annotations-prefix=nginx.ingress.kubernetes.io | ||
| env: | ||
| - name: POD_NAME | ||
| valueFrom: | ||
| fieldRef: | ||
| fieldPath: metadata.name | ||
| - name: POD_NAMESPACE | ||
| valueFrom: | ||
| fieldRef: | ||
| fieldPath: metadata.namespace | ||
| image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.22.0 | ||
| livenessProbe: | ||
| failureThreshold: 3 | ||
| httpGet: | ||
| path: /healthz | ||
| port: 10254 | ||
| scheme: HTTP | ||
| initialDelaySeconds: 10 | ||
| periodSeconds: 10 | ||
| successThreshold: 1 | ||
| timeoutSeconds: 1 | ||
| name: nginx-ingress-controller | ||
| ports: | ||
| - containerPort: 80 | ||
| name: http | ||
| - containerPort: 443 | ||
| name: https | ||
| readinessProbe: | ||
| failureThreshold: 3 | ||
| httpGet: | ||
| path: /healthz | ||
| port: 10254 | ||
| scheme: HTTP | ||
| periodSeconds: 10 | ||
| successThreshold: 1 | ||
| timeoutSeconds: 1 | ||
| securityContext: | ||
| allowPrivilegeEscalation: true | ||
| capabilities: | ||
| add: | ||
| - NET_BIND_SERVICE | ||
| drop: | ||
| - ALL | ||
| runAsUser: 33 | ||
| serviceAccountName: nginx-ingress-serviceaccount |
7 changes: 7 additions & 0 deletions
7
integration/init/kustomize-overlay/expected/base/common/Namespace-ingress-nginx.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| apiVersion: v1 | ||
| kind: Namespace | ||
| metadata: | ||
| labels: | ||
| app.kubernetes.io/name: ingress-nginx | ||
| app.kubernetes.io/part-of: ingress-nginx | ||
| name: ingress-nginx |
39 changes: 39 additions & 0 deletions
39
...on/init/kustomize-overlay/expected/base/common/Role-nginx-ingress-role-ingress-nginx.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| apiVersion: rbac.authorization.k8s.io/v1beta1 | ||
| kind: Role | ||
| metadata: | ||
| labels: | ||
| app.kubernetes.io/name: ingress-nginx | ||
| app.kubernetes.io/part-of: ingress-nginx | ||
| name: nginx-ingress-role | ||
| namespace: ingress-nginx | ||
| rules: | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - configmaps | ||
| - pods | ||
| - secrets | ||
| - namespaces | ||
| verbs: | ||
| - get | ||
| - apiGroups: | ||
| - "" | ||
| resourceNames: | ||
| - ingress-controller-leader-nginx | ||
| resources: | ||
| - configmaps | ||
| verbs: | ||
| - get | ||
| - update | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - configmaps | ||
| verbs: | ||
| - create | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - endpoints | ||
| verbs: | ||
| - get |
16 changes: 16 additions & 0 deletions
16
...erlay/expected/base/common/RoleBinding-nginx-ingress-role-nisa-binding-ingress-nginx.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| apiVersion: rbac.authorization.k8s.io/v1beta1 | ||
| kind: RoleBinding | ||
| metadata: | ||
| labels: | ||
| app.kubernetes.io/name: ingress-nginx | ||
| app.kubernetes.io/part-of: ingress-nginx | ||
| name: nginx-ingress-role-nisa-binding | ||
| namespace: ingress-nginx | ||
| roleRef: | ||
| apiGroup: rbac.authorization.k8s.io | ||
| kind: Role | ||
| name: nginx-ingress-role | ||
| subjects: | ||
| - kind: ServiceAccount | ||
| name: nginx-ingress-serviceaccount | ||
| namespace: ingress-nginx |
8 changes: 8 additions & 0 deletions
8
...erlay/expected/base/common/ServiceAccount-nginx-ingress-serviceaccount-ingress-nginx.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| apiVersion: v1 | ||
| kind: ServiceAccount | ||
| metadata: | ||
| labels: | ||
| app.kubernetes.io/name: ingress-nginx | ||
| app.kubernetes.io/part-of: ingress-nginx | ||
| name: nginx-ingress-serviceaccount | ||
| namespace: ingress-nginx |
14 changes: 14 additions & 0 deletions
14
integration/init/kustomize-overlay/expected/base/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| kind: "" | ||
| apiversion: "" | ||
| resources: | ||
| - common/ClusterRole-nginx-ingress-clusterrole.yaml | ||
| - common/ClusterRoleBinding-nginx-ingress-clusterrole-nisa-binding.yaml | ||
| - common/ConfigMap-nginx-configuration-ingress-nginx.yaml | ||
| - common/ConfigMap-tcp-services-ingress-nginx.yaml | ||
| - common/ConfigMap-udp-services-ingress-nginx.yaml | ||
| - common/Deployment-nginx-ingress-controller-ingress-nginx.yaml | ||
| - common/Namespace-ingress-nginx.yaml | ||
| - common/Role-nginx-ingress-role-ingress-nginx.yaml | ||
| - common/RoleBinding-nginx-ingress-role-nisa-binding-ingress-nginx.yaml | ||
| - common/ServiceAccount-nginx-ingress-serviceaccount-ingress-nginx.yaml | ||
| - service-l4.yaml |
23 changes: 23 additions & 0 deletions
23
integration/init/kustomize-overlay/expected/base/service-l4.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| apiVersion: v1 | ||
| kind: Service | ||
| metadata: | ||
| annotations: | ||
| service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "60" | ||
| service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: '*' | ||
| labels: | ||
| app.kubernetes.io/name: ingress-nginx | ||
| app.kubernetes.io/part-of: ingress-nginx | ||
| name: ingress-nginx | ||
| namespace: ingress-nginx | ||
| spec: | ||
| ports: | ||
| - name: http | ||
| port: 80 | ||
| targetPort: http | ||
| - name: https | ||
| port: 443 | ||
| targetPort: https | ||
| selector: | ||
| app.kubernetes.io/name: ingress-nginx | ||
| app.kubernetes.io/part-of: ingress-nginx | ||
| type: LoadBalancer |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| a workaround for the fact that ship always creates the installer directory |
Oops, something went wrong.