diff --git a/ansible/templates/operator.yml.j2 b/ansible/templates/operator.yml.j2 index f425633..078f75f 100644 --- a/ansible/templates/operator.yml.j2 +++ b/ansible/templates/operator.yml.j2 @@ -33,6 +33,8 @@ spec: value: awx-operator - name: ANSIBLE_GATHERING value: explicit + - name: OPERATOR_VERSION + value: "{{ operator_version }}" livenessProbe: httpGet: path: /healthz diff --git a/deploy/awx-operator.yaml b/deploy/awx-operator.yaml index 6a57e91..e682d08 100644 --- a/deploy/awx-operator.yaml +++ b/deploy/awx-operator.yaml @@ -635,6 +635,8 @@ spec: value: awx-operator - name: ANSIBLE_GATHERING value: explicit + - name: OPERATOR_VERSION + value: "0.9.0" livenessProbe: httpGet: path: /healthz diff --git a/roles/installer/tasks/main.yml b/roles/installer/tasks/main.yml index b23703b..fe6d718 100644 --- a/roles/installer/tasks/main.yml +++ b/roles/installer/tasks/main.yml @@ -15,6 +15,7 @@ app.kubernetes.io/part-of: '{{ meta.name }}' app.kubernetes.io/managed-by: '{{ deployment_type }}-operator' app.kubernetes.io/component: '{{ deployment_type }}' + app.kubernetes.io/operator-version: '{{ lookup("env", "OPERATOR_VERSION") }}' - name: Include secret key configuration tasks include_tasks: secret_key_configuration.yml diff --git a/roles/installer/templates/tower_admin_password_secret.yaml.j2 b/roles/installer/templates/tower_admin_password_secret.yaml.j2 index 85b08f1..2b93390 100644 --- a/roles/installer/templates/tower_admin_password_secret.yaml.j2 +++ b/roles/installer/templates/tower_admin_password_secret.yaml.j2 @@ -9,5 +9,6 @@ metadata: app.kubernetes.io/part-of: '{{ meta.name }}' app.kubernetes.io/managed-by: '{{ deployment_type }}-operator' app.kubernetes.io/component: '{{ deployment_type }}' + app.kubernetes.io/operator-version: '{{ lookup("env", "OPERATOR_VERSION") }}' stringData: password: '{{ lookup('password', '/dev/null length=32 chars=ascii_letters,digits') }}' diff --git a/roles/installer/templates/tower_app_credentials.yaml.j2 b/roles/installer/templates/tower_app_credentials.yaml.j2 index d17dbdf..5605217 100644 --- a/roles/installer/templates/tower_app_credentials.yaml.j2 +++ b/roles/installer/templates/tower_app_credentials.yaml.j2 @@ -10,6 +10,7 @@ metadata: app.kubernetes.io/part-of: '{{ meta.name }}' app.kubernetes.io/managed-by: '{{ deployment_type }}-operator' app.kubernetes.io/component: '{{ deployment_type }}' + app.kubernetes.io/operator-version: '{{ lookup("env", "OPERATOR_VERSION") }}' data: credentials.py: "{{ lookup('template', 'credentials.py.j2') | b64encode }}" ldap.py: "{{ lookup('template', 'ldap.py.j2') | b64encode }}" diff --git a/roles/installer/templates/tower_broadcast_websocket_secret.yaml.j2 b/roles/installer/templates/tower_broadcast_websocket_secret.yaml.j2 index 9b45d9c..852f8cb 100644 --- a/roles/installer/templates/tower_broadcast_websocket_secret.yaml.j2 +++ b/roles/installer/templates/tower_broadcast_websocket_secret.yaml.j2 @@ -9,5 +9,6 @@ metadata: app.kubernetes.io/part-of: '{{ meta.name }}' app.kubernetes.io/managed-by: '{{ deployment_type }}-operator' app.kubernetes.io/component: '{{ deployment_type }}' + app.kubernetes.io/operator-version: '{{ lookup("env", "OPERATOR_VERSION") }}' stringData: secret: '{{ lookup('password', '/dev/null length=32 chars=ascii_letters,digits') }}' diff --git a/roles/installer/templates/tower_config.yaml.j2 b/roles/installer/templates/tower_config.yaml.j2 index 7b017b1..b885696 100644 --- a/roles/installer/templates/tower_config.yaml.j2 +++ b/roles/installer/templates/tower_config.yaml.j2 @@ -10,6 +10,7 @@ metadata: app.kubernetes.io/part-of: '{{ meta.name }}' app.kubernetes.io/managed-by: '{{ deployment_type }}-operator' app.kubernetes.io/component: '{{ deployment_type }}' + app.kubernetes.io/operator-version: '{{ lookup("env", "OPERATOR_VERSION") }}' data: environment: | AWX_SKIP_MIGRATIONS=true diff --git a/roles/installer/templates/tower_deployment.yaml.j2 b/roles/installer/templates/tower_deployment.yaml.j2 index e080dd3..c041ea0 100644 --- a/roles/installer/templates/tower_deployment.yaml.j2 +++ b/roles/installer/templates/tower_deployment.yaml.j2 @@ -11,6 +11,7 @@ metadata: app.kubernetes.io/part-of: '{{ meta.name }}' app.kubernetes.io/managed-by: '{{ deployment_type }}-operator' app.kubernetes.io/component: '{{ deployment_type }}' + app.kubernetes.io/operator-version: '{{ lookup("env", "OPERATOR_VERSION") }}' spec: replicas: {{ tower_replicas }} selector: diff --git a/roles/installer/templates/tower_ingress.yaml.j2 b/roles/installer/templates/tower_ingress.yaml.j2 index 1a4c751..e78a722 100644 --- a/roles/installer/templates/tower_ingress.yaml.j2 +++ b/roles/installer/templates/tower_ingress.yaml.j2 @@ -10,6 +10,7 @@ metadata: app.kubernetes.io/part-of: '{{ meta.name }}' app.kubernetes.io/managed-by: '{{ deployment_type }}-operator' app.kubernetes.io/component: '{{ deployment_type }}' + app.kubernetes.io/operator-version: '{{ lookup("env", "OPERATOR_VERSION") }}' {% if tower_ingress_annotations %} annotations: {{ tower_ingress_annotations | indent(width=4) }} @@ -43,6 +44,7 @@ metadata: app.kubernetes.io/part-of: '{{ meta.name }}' app.kubernetes.io/managed-by: '{{ deployment_type }}-operator' app.kubernetes.io/component: '{{ deployment_type }}' + app.kubernetes.io/operator-version: '{{ lookup("env", "OPERATOR_VERSION") }}' spec: {% if tower_route_host != '' %} host: {{ tower_route_host }} diff --git a/roles/installer/templates/tower_persistent.yaml.j2 b/roles/installer/templates/tower_persistent.yaml.j2 index d224236..8240f01 100644 --- a/roles/installer/templates/tower_persistent.yaml.j2 +++ b/roles/installer/templates/tower_persistent.yaml.j2 @@ -5,10 +5,11 @@ metadata: name: '{{ meta.name }}-projects-claim' namespace: '{{ meta.namespace }}' labels: - app.kubernetes.io/name: '{{ meta.name }}' - app.kubernetes.io/part-of: '{{ meta.name }}' - app.kubernetes.io/managed-by: '{{ deployment_type }}-operator' - app.kubernetes.io/component: '{{ deployment_type }}' + app.kubernetes.io/name: '{{ meta.name }}' + app.kubernetes.io/part-of: '{{ meta.name }}' + app.kubernetes.io/managed-by: '{{ deployment_type }}-operator' + app.kubernetes.io/component: '{{ deployment_type }}' + app.kubernetes.io/operator-version: '{{ lookup("env", "OPERATOR_VERSION") }}' spec: accessModes: - {{ tower_projects_storage_access_mode }} diff --git a/roles/installer/templates/tower_postgres.yaml.j2 b/roles/installer/templates/tower_postgres.yaml.j2 index d252db5..c53d2e1 100644 --- a/roles/installer/templates/tower_postgres.yaml.j2 +++ b/roles/installer/templates/tower_postgres.yaml.j2 @@ -9,6 +9,7 @@ metadata: app.kubernetes.io/name: '{{ meta.name }}-postgres' app.kubernetes.io/part-of: '{{ meta.name }}' app.kubernetes.io/managed-by: '{{ deployment_type }}-operator' + app.kubernetes.io/operator-version: '{{ lookup("env", "OPERATOR_VERSION") }}' app.kubernetes.io/component: database spec: selector: @@ -110,6 +111,7 @@ metadata: app.kubernetes.io/name: '{{ meta.name }}-postgres' app.kubernetes.io/part-of: '{{ meta.name }}' app.kubernetes.io/managed-by: '{{ deployment_type }}-operator' + app.kubernetes.io/operator-version: '{{ lookup("env", "OPERATOR_VERSION") }}' app.kubernetes.io/component: database spec: ports: diff --git a/roles/installer/templates/tower_postgres_secret.yaml.j2 b/roles/installer/templates/tower_postgres_secret.yaml.j2 index 9c0a65f..5e803c1 100644 --- a/roles/installer/templates/tower_postgres_secret.yaml.j2 +++ b/roles/installer/templates/tower_postgres_secret.yaml.j2 @@ -10,6 +10,7 @@ metadata: app.kubernetes.io/part-of: '{{ meta.name }}' app.kubernetes.io/managed-by: '{{ deployment_type }}-operator' app.kubernetes.io/component: '{{ deployment_type }}' + app.kubernetes.io/operator-version: '{{ lookup("env", "OPERATOR_VERSION") }}' stringData: password: '{{ lookup('password', '/dev/null length=32 chars=ascii_letters,digits') }}' username: '{{ database_username }}' diff --git a/roles/installer/templates/tower_secret_key.yaml.j2 b/roles/installer/templates/tower_secret_key.yaml.j2 index 504b068..015be73 100644 --- a/roles/installer/templates/tower_secret_key.yaml.j2 +++ b/roles/installer/templates/tower_secret_key.yaml.j2 @@ -9,5 +9,6 @@ metadata: app.kubernetes.io/part-of: '{{ meta.name }}' app.kubernetes.io/managed-by: '{{ deployment_type }}-operator' app.kubernetes.io/component: '{{ deployment_type }}' + app.kubernetes.io/operator-version: '{{ lookup("env", "OPERATOR_VERSION") }}' stringData: secret_key: '{{ lookup('password', '/dev/null length=32 chars=ascii_letters,digits') }}' diff --git a/roles/installer/templates/tower_service.yaml.j2 b/roles/installer/templates/tower_service.yaml.j2 index ea303c6..b2af4c3 100644 --- a/roles/installer/templates/tower_service.yaml.j2 +++ b/roles/installer/templates/tower_service.yaml.j2 @@ -9,6 +9,7 @@ metadata: app.kubernetes.io/part-of: '{{ meta.name }}' app.kubernetes.io/managed-by: '{{ deployment_type }}-operator' app.kubernetes.io/component: '{{ deployment_type }}' + app.kubernetes.io/operator-version: '{{ lookup("env", "OPERATOR_VERSION") }}' {{ tower_service_labels | indent(width=4) }} {% if tower_ingress_type | lower == 'loadbalancer' and tower_loadbalancer_annotations %} annotations: diff --git a/roles/installer/templates/tower_service_account.yaml.j2 b/roles/installer/templates/tower_service_account.yaml.j2 index 2df5684..6c9313f 100644 --- a/roles/installer/templates/tower_service_account.yaml.j2 +++ b/roles/installer/templates/tower_service_account.yaml.j2 @@ -9,6 +9,7 @@ metadata: app.kubernetes.io/part-of: '{{ meta.name }}' app.kubernetes.io/managed-by: '{{ deployment_type }}-operator' app.kubernetes.io/component: '{{ deployment_type }}' + app.kubernetes.io/operator-version: '{{ lookup("env", "OPERATOR_VERSION") }}' --- apiVersion: rbac.authorization.k8s.io/v1 kind: Role