-
Notifications
You must be signed in to change notification settings - Fork 638
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
Add AWXMeshIngress custom resource (require ansible/awx#14640 to function) #1578
Merged
Merged
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
334e5df
Scaffold AWXMeshIngress
TheRealHaoLiu 30b6479
Able to deploy mesh ingress node
TheRealHaoLiu 760d68b
Update awxmeshingress sample
TheRealHaoLiu d82a69d
Removing sample awxmeshingress to fix CI
TheRealHaoLiu 95d148d
Provision instance and add receptor address
fosterseth d22b3dd
Use deployment instead of statefulset
fosterseth 34304a0
Update add_receptor_address command
fosterseth 176529d
Add owner ref on AWXMeshIngress to AWX
TheRealHaoLiu 0b316a3
Fix bug where external_ipaddress is required
TheRealHaoLiu e7b01ed
Fix receptor port when going through route
TheRealHaoLiu 414099a
Add finalizer to deprovision ingress instance
TheRealHaoLiu 5025267
Create placeholder sample for awxmeshingress to allow bundle build
TheRealHaoLiu 7488718
Add ingress and ingressroutetcp for awxmeshingress (#1646)
kurokobo 2fef7b6
Add a simple awxmeshingress demo
TheRealHaoLiu 5240f81
Default ingress_type to route when on OpenShift
TheRealHaoLiu e57b18e
Update awx-manage commands for mesh ingress
TheRealHaoLiu 49680e9
Disable CI test for AWXMeshIngress
TheRealHaoLiu f533585
Update awxmeshingress sample
TheRealHaoLiu 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 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,7 @@ | ||
--- | ||
apiVersion: awx.ansible.com/v1beta1 | ||
kind: AWXMeshIngress | ||
metadata: | ||
name: awx-demo | ||
spec: | ||
deployment_name: awx-demo |
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,81 @@ | ||
--- | ||
apiVersion: apiextensions.k8s.io/v1 | ||
kind: CustomResourceDefinition | ||
metadata: | ||
name: awxmeshingresses.awx.ansible.com | ||
spec: | ||
group: awx.ansible.com | ||
names: | ||
kind: AWXMeshIngress | ||
listKind: AWXMeshIngressList | ||
plural: awxmeshingresses | ||
singular: awxmeshingress | ||
scope: Namespaced | ||
versions: | ||
- name: v1alpha1 | ||
schema: | ||
openAPIV3Schema: | ||
description: AWXMeshIngress is the Schema for the awxmeshingresses API | ||
properties: | ||
apiVersion: | ||
description: 'APIVersion defines the versioned schema of this representation | ||
of an object. Servers should convert recognized schemas to the latest | ||
internal value, and may reject unrecognized values. | ||
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' | ||
type: string | ||
kind: | ||
description: 'Kind is a string value representing the REST resource this | ||
object represents. Servers may infer this from the endpoint the client | ||
submits requests to. Cannot be updated. In CamelCase. | ||
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' | ||
type: string | ||
metadata: | ||
type: object | ||
spec: | ||
description: Spec defines the desired state of AWXMeshIngress | ||
type: object | ||
x-kubernetes-preserve-unknown-fields: true | ||
required: | ||
- deployment_name | ||
properties: | ||
deployment_name: | ||
description: Name of the AWX deployment to create the Mesh Ingress for. | ||
type: string | ||
external_hostname: | ||
description: External hostname to use for the Mesh Ingress. | ||
type: string | ||
external_ipaddress: | ||
description: External IP address to use for the Mesh Ingress. | ||
type: string | ||
ingress_type: | ||
description: The ingress type to use to reach the deployed instance | ||
type: string | ||
enum: | ||
- none | ||
- Ingress | ||
- ingress | ||
- IngressRouteTCP | ||
- ingressroutetcp | ||
- Route | ||
- route | ||
ingress_api_version: | ||
description: The Ingress API version to use | ||
type: string | ||
ingress_annotations: | ||
description: Annotations to add to the Ingress Controller | ||
type: string | ||
ingress_class_name: | ||
description: The name of ingress class to use instead of the cluster default. | ||
type: string | ||
ingress_controller: | ||
description: Special configuration for specific Ingress Controllers | ||
type: string | ||
status: | ||
description: Status defines the observed state of AWXMeshIngress | ||
type: object | ||
x-kubernetes-preserve-unknown-fields: true | ||
type: object | ||
served: true | ||
storage: true | ||
subresources: | ||
status: {} |
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
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,31 @@ | ||
# permissions for end users to edit awxmeshingresses. | ||
apiVersion: rbac.authorization.k8s.io/v1 | ||
kind: ClusterRole | ||
metadata: | ||
labels: | ||
app.kubernetes.io/name: clusterrole | ||
app.kubernetes.io/instance: awxmeshingress-editor-role | ||
app.kubernetes.io/component: rbac | ||
app.kubernetes.io/created-by: awx-operator | ||
app.kubernetes.io/part-of: awx-operator | ||
app.kubernetes.io/managed-by: kustomize | ||
name: awxmeshingress-editor-role | ||
rules: | ||
- apiGroups: | ||
- awx.ansible.com | ||
resources: | ||
- awxmeshingresses | ||
verbs: | ||
- create | ||
- delete | ||
- get | ||
- list | ||
- patch | ||
- update | ||
- watch | ||
- apiGroups: | ||
- awx.ansible.com | ||
resources: | ||
- awxmeshingresses/status | ||
verbs: | ||
- get |
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,27 @@ | ||
# permissions for end users to view awxmeshingresses. | ||
apiVersion: rbac.authorization.k8s.io/v1 | ||
kind: ClusterRole | ||
metadata: | ||
labels: | ||
app.kubernetes.io/name: clusterrole | ||
app.kubernetes.io/instance: awxmeshingress-viewer-role | ||
app.kubernetes.io/component: rbac | ||
app.kubernetes.io/created-by: awx-operator | ||
app.kubernetes.io/part-of: awx-operator | ||
app.kubernetes.io/managed-by: kustomize | ||
name: awxmeshingress-viewer-role | ||
rules: | ||
- apiGroups: | ||
- awx.ansible.com | ||
resources: | ||
- awxmeshingresses | ||
verbs: | ||
- get | ||
- list | ||
- watch | ||
- apiGroups: | ||
- awx.ansible.com | ||
resources: | ||
- awxmeshingresses/status | ||
verbs: | ||
- get |
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,8 @@ | ||
# Placeholder to pass CI and allow bundle generation | ||
--- | ||
apiVersion: awx.ansible.com/v1alpha1 | ||
kind: AWXMeshIngress | ||
metadata: | ||
name: example-awx-mesh-ingress | ||
spec: | ||
deployment_name: example-awx |
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,19 @@ | ||
# TODO: Add tests for AWXMeshIngress | ||
# --- | ||
# - name: Create the awx.ansible.com/v1alpha1.AWXMeshIngress | ||
# k8s: | ||
# state: present | ||
# namespace: '{{ namespace }}' | ||
# definition: "{{ lookup('template', '/'.join([samples_dir, cr_file])) | from_yaml }}" | ||
# wait: yes | ||
# wait_timeout: 300 | ||
# wait_condition: | ||
# type: Successful | ||
# status: "True" | ||
# vars: | ||
# cr_file: 'awx_v1alpha1_awxmeshingress.yaml' | ||
|
||
# - name: Add assertions here | ||
# assert: | ||
# that: false | ||
# fail_msg: FIXME Add real assertions for your operator |
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 @@ | ||
--- | ||
deployment_type: awx | ||
|
||
ingress_type: none | ||
ingress_api_version: 'networking.k8s.io/v1' | ||
ingress_annotations: '' | ||
ingress_class_name: '' | ||
ingress_controller: '' | ||
|
||
set_self_owneref: true | ||
|
||
_control_plane_ee_image: quay.io/ansible/awx-ee:latest | ||
_image_pull_policy: Always | ||
|
||
finalizer_run: false |
Oops, something went wrong.
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.
Leaving this out of CI runs for now. @TheRealHaoLiu will address this in a future PR.
This bit will resolve that.