-
Notifications
You must be signed in to change notification settings - Fork 8
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Ingress nginx fixes #154
Merged
Merged
Ingress nginx fixes #154
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
09e7c7e
ingress-nginx: move images to kustomization
daurnimator e7ce181
ingress-nginx: move webhook to own folder
daurnimator cd7c23a
ingress-nginx: use configMapGenerator
daurnimator 504c6f8
ingress-nginx: move controller to subfolder
daurnimator 5cc43e1
ingress-nginx: clean up labels
daurnimator File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
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,6 @@ | ||
| apiVersion: networking.k8s.io/v1 | ||
| kind: IngressClass | ||
| metadata: | ||
| name: nginx | ||
| spec: | ||
| controller: k8s.io/ingress-nginx |
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,11 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| commonLabels: | ||
| app.kubernetes.io/component: controller | ||
| resources: | ||
| - rbac.yaml | ||
| - resources.yaml | ||
| - webhook.yaml | ||
| images: | ||
| - name: k8s.gcr.io/ingress-nginx/controller | ||
| newTag: v1.2.0@sha256:d8196e3bc1e72547c5dec66d6556c0ff92a23f6d0919b206be170bc90d5f9185 |
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,169 @@ | ||
| apiVersion: v1 | ||
| automountServiceAccountToken: true | ||
| kind: ServiceAccount | ||
| metadata: | ||
| name: ingress-nginx | ||
| --- | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: Role | ||
| metadata: | ||
| name: ingress-nginx | ||
| rules: | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - namespaces | ||
| verbs: | ||
| - get | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - configmaps | ||
| - pods | ||
| - secrets | ||
| - endpoints | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - services | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch | ||
| - apiGroups: | ||
| - networking.k8s.io | ||
| resources: | ||
| - ingresses | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch | ||
| - apiGroups: | ||
| - networking.k8s.io | ||
| resources: | ||
| - ingresses/status | ||
| verbs: | ||
| - update | ||
| - apiGroups: | ||
| - networking.k8s.io | ||
| resources: | ||
| - ingressclasses | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch | ||
| - apiGroups: | ||
| - "" | ||
| resourceNames: | ||
| - ingress-controller-leader | ||
| resources: | ||
| - configmaps | ||
| verbs: | ||
| - get | ||
| - update | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - configmaps | ||
| verbs: | ||
| - create | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - events | ||
| verbs: | ||
| - create | ||
| - patch | ||
| --- | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: ClusterRole | ||
| metadata: | ||
| name: ingress-nginx | ||
| rules: | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - configmaps | ||
| - endpoints | ||
| - nodes | ||
| - pods | ||
| - secrets | ||
| - namespaces | ||
| verbs: | ||
| - list | ||
| - watch | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - nodes | ||
| verbs: | ||
| - get | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - services | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch | ||
| - apiGroups: | ||
| - networking.k8s.io | ||
| resources: | ||
| - ingresses | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - events | ||
| verbs: | ||
| - create | ||
| - patch | ||
| - apiGroups: | ||
| - networking.k8s.io | ||
| resources: | ||
| - ingresses/status | ||
| verbs: | ||
| - update | ||
| - apiGroups: | ||
| - networking.k8s.io | ||
| resources: | ||
| - ingressclasses | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch | ||
| --- | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: RoleBinding | ||
| metadata: | ||
| name: ingress-nginx | ||
| roleRef: | ||
| apiGroup: rbac.authorization.k8s.io | ||
| kind: Role | ||
| name: ingress-nginx | ||
| subjects: | ||
| - kind: ServiceAccount | ||
| name: ingress-nginx | ||
| # NOTE: Can be overwritten by Kustomization | ||
| namespace: default | ||
| --- | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: ClusterRoleBinding | ||
| metadata: | ||
| name: ingress-nginx | ||
| roleRef: | ||
| apiGroup: rbac.authorization.k8s.io | ||
| kind: ClusterRole | ||
| name: ingress-nginx | ||
| subjects: | ||
| - kind: ServiceAccount | ||
| name: ingress-nginx | ||
| # NOTE: Can be overwritten by Kustomization | ||
| namespace: default | ||
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
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,11 @@ | ||
| apiVersion: v1 | ||
| kind: Service | ||
| metadata: | ||
| name: ingress-nginx-controller-admission | ||
| spec: | ||
| ports: | ||
| - appProtocol: https | ||
| name: https-webhook | ||
| port: 443 | ||
| targetPort: webhook | ||
| type: ClusterIP |
This file was deleted.
Oops, something went wrong.
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 |
|---|---|---|
| @@ -1,10 +1,24 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| namespace: ingress-nginx | ||
| commonLabels: | ||
| app.kubernetes.io/name: ingress-nginx | ||
| resources: | ||
| - rbac.yaml | ||
| - configmap.yaml | ||
| - tcp-services-cm.yaml | ||
| - resources.yaml | ||
| - webhook.yaml | ||
| - ingressclass.yaml | ||
| - controller/ | ||
| - webhook/ | ||
| configMapGenerator: | ||
| - name: ingress-nginx-controller | ||
| options: | ||
| disableNameSuffixHash: true | ||
| literals: | ||
| # NOTE: This configuration is specific to DigitalOcean and should not be | ||
| # included if used on other cloud providers. | ||
| # See: resources.yaml Service{name="ingress-nginx-controller"} | ||
| - use-proxy-protocol=true | ||
| - name: tcp-services | ||
| options: | ||
| disableNameSuffixHash: true | ||
| literals: | ||
| # Note that quotes here are a workaround as mentioned in https://github.com/kubernetes-sigs/kustomize/issues/3446#issuecomment-1199631047 | ||
| - | | ||
| "22"=hashbangctl/hashbangctl:2222 |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this giving
ingress-nginxaccess to all secrets in all namespaces? O_oThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And I guess the
sopssecrets too, troughconfigmaps?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
shrug this is what we already had, I just reorganised it