diff --git a/Dockerfile b/Dockerfile index ed1242a..955bd15 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,16 @@ -ARG OPERATOR_SDK_VERSION=v1.28.1 +ARG OPERATOR_SDK_VERSION=v1.37.1 FROM quay.io/operator-framework/ansible-operator:$OPERATOR_SDK_VERSION USER 0 COPY tools/upgrades/migrate-pathfinder-assessments.py /usr/local/bin/migrate-pathfinder-assessments.py COPY tools/upgrades/jwt.sh /usr/local/bin/jwt.sh RUN dnf -y install openssl && dnf clean all -RUN echo -e "[almalinux8-appstream]" \ - "\nname = almalinux8-appstream" \ - "\nbaseurl = https://repo.almalinux.org/almalinux/8/AppStream/\$basearch/os/" \ +RUN echo -e "[almalinux9-appstream]" \ + "\nname = almalinux9-appstream" \ + "\nbaseurl = https://repo.almalinux.org/almalinux/9/AppStream/\$basearch/os/" \ "\nenabled = 1" \ "\ngpgcheck = 0" > /etc/yum.repos.d/almalinux.repo -RUN dnf -y module enable postgresql:15 && dnf -y install postgresql python38-psycopg2 && dnf clean all +RUN dnf -y module enable postgresql:15 && dnf -y install postgresql python3.12-psycopg2 && dnf clean all USER 1001 COPY requirements.yml ${HOME}/requirements.yml diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index ea58004..91fcfca 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -3,18 +3,12 @@ dependency: name: galaxy driver: name: delegated -lint: | - set -e - yamllint -d "{extends: relaxed, rules: {line-length: {max: 120}}}" . platforms: - name: cluster groups: - k8s provisioner: name: ansible - lint: | - set -e - ansible-lint inventory: group_vars: all: @@ -31,6 +25,3 @@ provisioner: K8S_AUTH_KUBECONFIG: ${KUBECONFIG:-"~/.kube/config"} verifier: name: ansible - lint: | - set -e - ansible-lint diff --git a/molecule/kind/molecule.yml b/molecule/kind/molecule.yml index d4361f3..534c8ce 100644 --- a/molecule/kind/molecule.yml +++ b/molecule/kind/molecule.yml @@ -3,9 +3,6 @@ dependency: name: galaxy driver: name: delegated -lint: | - set -e - yamllint -d "{extends: relaxed, rules: {line-length: {max: 120}}}" . platforms: - name: cluster groups: @@ -15,9 +12,6 @@ provisioner: playbooks: prepare: ../default/prepare.yml verify: ../default/verify.yml - lint: | - set -e - ansible-lint inventory: group_vars: all: @@ -37,6 +31,3 @@ provisioner: KUBECONFIG: ${MOLECULE_EPHEMERAL_DIRECTORY}/kubeconfig verifier: name: ansible - lint: | - set -e - ansible-lint diff --git a/requirements.yml b/requirements.yml index 14fd37a..495df86 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,10 +1,12 @@ --- collections: - name: operator_sdk.util - version: "0.4.0" + version: "0.5.0" - name: kubernetes.core version: "2.4.0" - name: cloud.common version: "2.1.1" - name: community.general version: "4.8.11" + - name: community.postgresql + version: "3.10.2"