From 966549fb00c3dfc7aed41e7fe3235ff94ba43844 Mon Sep 17 00:00:00 2001 From: jlarriba Date: Mon, 6 May 2024 12:32:31 +0200 Subject: [PATCH 01/10] [OSPRH-6761] Logging stays at status "Logging not started" forever --- controllers/logging_controller.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/controllers/logging_controller.go b/controllers/logging_controller.go index 55842eac..007d3c44 100644 --- a/controllers/logging_controller.go +++ b/controllers/logging_controller.go @@ -260,6 +260,8 @@ func (r *LoggingReconciler) reconcileNormal(ctx context.Context, instance *telem } return ctrl.Result{}, err } + instance.Status.Conditions.MarkTrue(telemetryv1.LoggingCLONamespaceReadyCondition, condition.ReadyMessage) + // Operators cannot own objects in different namespaces /*err := controllerutil.SetControllerReference(instance, service, r.Scheme) if err != nil { From 0ee887762a6cc51534278d7b7c1b79f8b2b50177 Mon Sep 17 00:00:00 2001 From: Chris Sibbitt Date: Mon, 6 May 2024 15:46:22 -0400 Subject: [PATCH 02/10] Add kuttl hints to README --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index 9887a774..2b8f9bc6 100644 --- a/README.md +++ b/README.md @@ -106,6 +106,18 @@ DATAPLANE_RUNNER_IMG= ANSIBLEEE_IMAGE_URL_DEFAULT= Date: Tue, 7 May 2024 09:33:06 +0200 Subject: [PATCH 03/10] [OSPRH-6791] Telemetry does not inform correctly about its running status --- controllers/telemetry_controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/telemetry_controller.go b/controllers/telemetry_controller.go index c17b56cf..b14eecfb 100644 --- a/controllers/telemetry_controller.go +++ b/controllers/telemetry_controller.go @@ -384,7 +384,7 @@ func (r TelemetryReconciler) reconcileAutoscaling(ctx context.Context, instance instance.Status.Conditions.Set(condition.UnknownCondition( telemetryv1.AutoscalingReadyCondition, condition.InitReason, - telemetryv1.AutoscalingReadyInitMessage, + telemetryv1.AutoscalingReadyRunningMessage, )) } else { // Mirror Autoscaling condition status From 192bb000f08260472696214a09fc15607435290a Mon Sep 17 00:00:00 2001 From: jlarriba Date: Tue, 7 May 2024 12:57:53 +0200 Subject: [PATCH 04/10] [OSPRH-6762] Logging does not have singular variant of the resource --- api/bases/telemetry.openstack.org_loggings.yaml | 2 ++ api/v1beta1/logging_types.go | 1 + config/crd/bases/telemetry.openstack.org_loggings.yaml | 2 ++ 3 files changed, 5 insertions(+) diff --git a/api/bases/telemetry.openstack.org_loggings.yaml b/api/bases/telemetry.openstack.org_loggings.yaml index 6f06c78f..dada776d 100644 --- a/api/bases/telemetry.openstack.org_loggings.yaml +++ b/api/bases/telemetry.openstack.org_loggings.yaml @@ -9,6 +9,8 @@ metadata: spec: group: telemetry.openstack.org names: + categories: + - logging kind: Logging listKind: LoggingList plural: loggings diff --git a/api/v1beta1/logging_types.go b/api/v1beta1/logging_types.go index f8659bc4..6e0d13e8 100644 --- a/api/v1beta1/logging_types.go +++ b/api/v1beta1/logging_types.go @@ -81,6 +81,7 @@ type LoggingStatus struct { //+kubebuilder:object:root=true //+kubebuilder:subresource:status +//+kubebuilder:resource:categories=logging // Logging is the Schema for the loggings API type Logging struct { diff --git a/config/crd/bases/telemetry.openstack.org_loggings.yaml b/config/crd/bases/telemetry.openstack.org_loggings.yaml index 6f06c78f..dada776d 100644 --- a/config/crd/bases/telemetry.openstack.org_loggings.yaml +++ b/config/crd/bases/telemetry.openstack.org_loggings.yaml @@ -9,6 +9,8 @@ metadata: spec: group: telemetry.openstack.org names: + categories: + - logging kind: Logging listKind: LoggingList plural: loggings From 08f6762aa734ff812c7f2f3c698e9fe9716861cd Mon Sep 17 00:00:00 2001 From: Jaromir Wysoglad Date: Thu, 9 May 2024 03:45:25 -0400 Subject: [PATCH 05/10] [zuul] Automate logging deployment --- ci/deploy-logging-dependencies.yml | 11 ++ .../files/cluster_log_forwarder.yaml | 19 +++ .../files/cluster_logging.yaml | 12 ++ .../files/loki_secret.yaml | 9 + .../files/lokistack.yaml | 16 ++ .../files/minio-dev.yaml | 98 +++++++++++ .../files/operators.yaml | 54 ++++++ ci/deploy-logging-dependencies/tasks/main.yml | 156 ++++++++++++++++++ ci/vars-logging.yml | 38 +++++ zuul.d/projects.yaml | 12 ++ 10 files changed, 425 insertions(+) create mode 100644 ci/deploy-logging-dependencies.yml create mode 100644 ci/deploy-logging-dependencies/files/cluster_log_forwarder.yaml create mode 100644 ci/deploy-logging-dependencies/files/cluster_logging.yaml create mode 100644 ci/deploy-logging-dependencies/files/loki_secret.yaml create mode 100644 ci/deploy-logging-dependencies/files/lokistack.yaml create mode 100644 ci/deploy-logging-dependencies/files/minio-dev.yaml create mode 100644 ci/deploy-logging-dependencies/files/operators.yaml create mode 100644 ci/deploy-logging-dependencies/tasks/main.yml create mode 100644 ci/vars-logging.yml diff --git a/ci/deploy-logging-dependencies.yml b/ci/deploy-logging-dependencies.yml new file mode 100644 index 00000000..be848c4e --- /dev/null +++ b/ci/deploy-logging-dependencies.yml @@ -0,0 +1,11 @@ +--- +- name: "Deploy logging dependencies" + hosts: "{{ cifmw_target_hook_host | default('localhost') }}" + gather_facts: false + environment: + KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}" + PATH: "{{ cifmw_path }}" + tasks: + - name: Deploy logging dependencies + ansible.builtin.import_role: + name: deploy-logging-dependencies diff --git a/ci/deploy-logging-dependencies/files/cluster_log_forwarder.yaml b/ci/deploy-logging-dependencies/files/cluster_log_forwarder.yaml new file mode 100644 index 00000000..f9b61c88 --- /dev/null +++ b/ci/deploy-logging-dependencies/files/cluster_log_forwarder.yaml @@ -0,0 +1,19 @@ +apiVersion: logging.openshift.io/v1 +kind: ClusterLogForwarder +metadata: + name: instance + namespace: openshift-logging +spec: + inputs: + - name: syslog + receiver: + type: syslog + syslog: + port: 10514 + pipelines: + - name: to-default + inputRefs: + - syslog + - application + outputRefs: + - default diff --git a/ci/deploy-logging-dependencies/files/cluster_logging.yaml b/ci/deploy-logging-dependencies/files/cluster_logging.yaml new file mode 100644 index 00000000..cd080439 --- /dev/null +++ b/ci/deploy-logging-dependencies/files/cluster_logging.yaml @@ -0,0 +1,12 @@ +apiVersion: logging.openshift.io/v1 +kind: ClusterLogging +metadata: + name: instance +spec: + managementState: Managed + logStore: + type: lokistack + lokistack: + name: logging-loki + collection: + type: vector diff --git a/ci/deploy-logging-dependencies/files/loki_secret.yaml b/ci/deploy-logging-dependencies/files/loki_secret.yaml new file mode 100644 index 00000000..63e367ba --- /dev/null +++ b/ci/deploy-logging-dependencies/files/loki_secret.yaml @@ -0,0 +1,9 @@ +apiVersion: v1 +kind: Secret +metadata: + name: logging-loki-s3 +stringData: + access_key_id: minio + access_key_secret: minio123 + bucketnames: loki + endpoint: http://minio.minio-dev.svc.cluster.local:9000 diff --git a/ci/deploy-logging-dependencies/files/lokistack.yaml b/ci/deploy-logging-dependencies/files/lokistack.yaml new file mode 100644 index 00000000..19072fd4 --- /dev/null +++ b/ci/deploy-logging-dependencies/files/lokistack.yaml @@ -0,0 +1,16 @@ +apiVersion: loki.grafana.com/v1 +kind: LokiStack +metadata: + name: logging-loki +spec: + size: 1x.demo + storage: + schemas: + - version: v12 + effectiveDate: "2022-06-01" + secret: + name: logging-loki-s3 + type: s3 + storageClassName: crc-csi-hostpath-provisioner + tenants: + mode: openshift-logging diff --git a/ci/deploy-logging-dependencies/files/minio-dev.yaml b/ci/deploy-logging-dependencies/files/minio-dev.yaml new file mode 100644 index 00000000..ed1c7a9c --- /dev/null +++ b/ci/deploy-logging-dependencies/files/minio-dev.yaml @@ -0,0 +1,98 @@ +# Deploys a new Namespace for the MinIO Pod +apiVersion: v1 +kind: Namespace +metadata: + name: minio-dev # Change this value if you want a different namespace name + labels: + name: minio-dev # Change this value to match metadata.name +--- +# Deploys a new MinIO Pod into the metadata.namespace Kubernetes namespace +# +apiVersion: v1 +kind: Pod +metadata: + labels: + app: minio + name: minio + namespace: minio-dev # Change this value to match the namespace metadata.name +spec: + containers: + - name: minio + image: quay.io/minio/minio:latest + command: + - /bin/bash + - -c + - | + mkdir -p /data/loki && \ + minio server /data + env: + - name: MINIO_ACCESS_KEY + value: minio + - name: MINIO_SECRET_KEY + value: minio123 + volumeMounts: + - mountPath: /data + name: storage # Corresponds to the `spec.volumes` Persistent Volume + volumes: + - name: storage + persistentVolumeClaim: + claimName: minio-pvc +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: minio-pvc + namespace: minio-dev +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 10Gi + storageClassName: crc-csi-hostpath-provisioner +--- +apiVersion: v1 +kind: Service +metadata: + name: minio + namespace: minio-dev +spec: + selector: + app: minio + ports: + - name: api + protocol: TCP + port: 9000 + - name: console + protocol: TCP + port: 9090 +--- +kind: Route +apiVersion: route.openshift.io/v1 +metadata: + name: minio-console + namespace: minio-dev +spec: + host: console-minio-dev.apps-crc.testing + to: + kind: Service + name: minio + weight: 100 + port: + targetPort: console + wildcardPolicy: None +--- +kind: Route +apiVersion: route.openshift.io/v1 +metadata: + name: minio-api + namespace: minio-dev +spec: + host: api-minio-dev.apps-crc.testing + to: + kind: Service + name: minio + weight: 100 + port: + targetPort: api + wildcardPolicy: None diff --git a/ci/deploy-logging-dependencies/files/operators.yaml b/ci/deploy-logging-dependencies/files/operators.yaml new file mode 100644 index 00000000..d298d9fb --- /dev/null +++ b/ci/deploy-logging-dependencies/files/operators.yaml @@ -0,0 +1,54 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: openshift-logging + labels: + name: openshift-logging +--- +apiVersion: v1 +kind: Namespace +metadata: + name: openshift-operators-redhat + labels: + name: openshift-operators-redhat +--- +apiVersion: operators.coreos.com/v1 +kind: OperatorGroup +metadata: + name: loki-operator + namespace: openshift-operators-redhat +spec: + upgradeStrategy: Default +--- +apiVersion: operators.coreos.com/v1 +kind: OperatorGroup +metadata: + name: cluster-logging + namespace: openshift-logging +spec: + targetNamespaces: + - openshift-logging +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: loki-operator + namespace: openshift-operators-redhat +spec: + channel: stable-5.9 + installPlanApproval: Automatic + name: loki-operator + source: redhat-operators + sourceNamespace: openshift-marketplace +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: cluster-logging + namespace: openshift-logging +spec: + channel: stable-5.9 + installPlanApproval: Automatic + name: cluster-logging + source: redhat-operators + sourceNamespace: openshift-marketplace diff --git a/ci/deploy-logging-dependencies/tasks/main.yml b/ci/deploy-logging-dependencies/tasks/main.yml new file mode 100644 index 00000000..06b69d2e --- /dev/null +++ b/ci/deploy-logging-dependencies/tasks/main.yml @@ -0,0 +1,156 @@ +- name: Create the CLO subscription and loki-operator subscriptions + ansible.builtin.shell: + cmd: | + oc apply -f {{ role_path }}/files/operators.yaml + + # need to have a wait here, since the csv is not created immediately. There is a slight delay, during which time, the oc wait command would fail, since there's no resource to watch +- name: Wait for the CLO csv to be created + ansible.builtin.command: + cmd: + oc get csv --namespace=openshift-logging -l operators.coreos.com/cluster-logging.openshift-logging + delay: 10 + retries: 20 + register: output + until: output.stdout_lines | length != 0 + +- name: Wait for the loki-operator csv to be created + ansible.builtin.command: + cmd: + oc get csv --namespace=openshift-operators-redhat -l operators.coreos.com/loki-operator.openshift-operators-redhat + delay: 10 + retries: 20 + register: output + until: output.stdout_lines | length != 0 + +- name: Wait for the CLO resources to be available + ansible.builtin.command: + cmd: | + oc wait --timeout=300s --for jsonpath="{.status.phase}"=Succeeded csv --namespace=openshift-logging -l operators.coreos.com/cluster-logging.openshift-logging + +- name: Wait for the Loki resources to be available + ansible.builtin.command: + cmd: | + oc wait --timeout=300s --for jsonpath="{.status.phase}"=Succeeded csv --namespace=openshift-operators-redhat -l operators.coreos.com/loki-operator.openshift-operators-redhat + +- name: Create minio deployment + ansible.builtin.shell: + cmd: | + oc apply -f {{ role_path }}/files/minio-dev.yaml + +- name: Wait for the minio pod to be created + ansible.builtin.command: + cmd: + oc get pods --namespace=minio-dev minio + delay: 10 + retries: 20 + register: output + until: output.stdout_lines | length != 0 + +- name: Wait for the minio pod to be running + ansible.builtin.command: + cmd: | + oc wait --timeout=300s --for jsonpath="{.status.phase}"=Running --namespace=minio-dev pod minio + ### + # TODO: delete + ignore_errors: true + +- name: TMP get minio pod + ansible.builtin.command: + cmd: | + oc get --namespace=minio-dev pod minio -oyaml + register: output + +- name: TMP debug output of minio pod + ansible.builtin.debug: + msg: "{{ output.stdout_lines }}" + ### + +- name: Create loki S3 secret + ansible.builtin.shell: + cmd: | + oc apply -f {{ role_path }}/files/loki_secret.yaml -n openshift-logging + +- name: Create loki stack + ansible.builtin.shell: + cmd: | + oc apply -f {{ role_path }}/files/lokistack.yaml -n openshift-logging + +- name: Wait for lokistack to be created + ansible.builtin.command: + cmd: + oc get lokistacks --namespace=openshift-logging logging-loki + delay: 10 + retries: 20 + register: output + until: output.stdout_lines | length != 0 + +- name: Wait for the lokistack to be ready + ansible.builtin.command: + cmd: | + oc wait --timeout=300s --for condition=Ready=True --namespace=openshift-logging lokistacks logging-loki + ### + # TODO: delete + ignore_errors: true + +- name: TMP get lokistack + ansible.builtin.command: + cmd: | + oc get --namespace=openshift-logging lokistacks logging-loki -oyaml + register: output + ignore_errors: true + +- name: TMP debug output of lokistack + ansible.builtin.debug: + msg: "{{ output.stdout_lines }}" + ignore_errors: true + +- name: TMP get lokistack pods + ansible.builtin.command: + cmd: | + oc get pods -n openshift-logging -oyaml -l app.kubernetes.io/instance=logging-loki + register: output + ignore_errors: true + +- name: TMP debug output of lokistack pods yaml + ansible.builtin.debug: + msg: "{{ output.stdout_lines }}" + ignore_errors: true + ### + +- name: Create cluster logging + ansible.builtin.shell: + cmd: | + oc apply -f {{ role_path }}/files/cluster_logging.yaml -n openshift-logging + +- name: Wait for cluster logging to be created + ansible.builtin.command: + cmd: + oc get clusterlogging --namespace=openshift-logging instance + delay: 10 + retries: 20 + register: output + until: output.stdout_lines | length != 0 + +- name: Wait for the cluster logging to be ready + ansible.builtin.command: + cmd: | + oc wait --timeout=300s --for condition=Ready=True --namespace=openshift-logging clusterlogging instance + +- name: Create cluster log forwarder + ansible.builtin.shell: + cmd: | + oc apply -f {{ role_path }}/files/cluster_log_forwarder.yaml -n openshift-logging + +- name: Wait for cluster log forwarder to be created + ansible.builtin.command: + cmd: + oc get clusterlogforwarder --namespace=openshift-logging instance + delay: 10 + retries: 20 + register: output + until: output.stdout_lines | length != 0 + +- name: Wait for the cluster log forwarder to be ready + ansible.builtin.command: + cmd: | + oc wait --timeout=300s --for condition=Ready=True --namespace=openshift-logging clusterlogforwarder instance diff --git a/ci/vars-logging.yml b/ci/vars-logging.yml new file mode 100644 index 00000000..186fa303 --- /dev/null +++ b/ci/vars-logging.yml @@ -0,0 +1,38 @@ +--- +pre_deploy: + - name: deploy_logging_dependencies + source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/deploy-logging-dependencies.yml" + type: playbook +cifmw_edpm_prepare_kustomizations: + - apiVersion: kustomize.config.k8s.io/v1beta1 + kind: Kustomization + namespace: openstack + patches: + - patch: |- + apiVersion: core.openstack.org/v1beta1 + kind: OpenStackControlPlane + metadata: + name: unused + spec: + telemetry: + enabled: true + template: + logging: + enabled: true + target: + kind: OpenStackControlPlane +cifmw_edpm_kustomize_content: + - apiVersion: kustomize.config.k8s.io/v1beta1 + kind: Kustomization + namespace: openstack + patches: + - patch: |- + apiVersion: dataplane.openstack.org/v1beta1 + kind: OpenStackDataPlaneNodeSet + metadata: + name: unused + spec: + services: + - logging + target: + kind: OpenStackDataPlaneNodeSet diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index f473652c..c49ea559 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -29,6 +29,17 @@ - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/ci-framework'].src_dir }}/scenarios/centos-9/multinode-ci.yml" - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-default-telemetry.yml" +- job: + name: telemetry-operator-multinode-logging + parent: podified-multinode-edpm-deployment-crc + dependencies: ["openstack-k8s-operators-content-provider"] + description: | + Deploy OpenStack with Logging features enabled + vars: + cifmw_extras: + - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/ci-framework'].src_dir }}/scenarios/centos-9/multinode-ci.yml" + - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-logging.yml" + - project-template: name: rdo-telemetry-tempest-plugin-jobs openstack-experimental: @@ -66,3 +77,4 @@ jobs: - telemetry-operator-multinode-autoscaling-tempest - telemetry-operator-multinode-default-telemetry + - telemetry-operator-multinode-logging From 1e39b488c817c4cbba5657c6553dcc6bbac2cc0d Mon Sep 17 00:00:00 2001 From: Jaromir Wysoglad Date: Mon, 13 May 2024 09:40:53 -0400 Subject: [PATCH 06/10] TMP: Include a logging fix from PR#385 --- controllers/logging_controller.go | 1 + 1 file changed, 1 insertion(+) diff --git a/controllers/logging_controller.go b/controllers/logging_controller.go index 55842eac..98d960d2 100644 --- a/controllers/logging_controller.go +++ b/controllers/logging_controller.go @@ -260,6 +260,7 @@ func (r *LoggingReconciler) reconcileNormal(ctx context.Context, instance *telem } return ctrl.Result{}, err } + instance.Status.Conditions.MarkTrue(telemetryv1.LoggingCLONamespaceReadyCondition, condition.ReadyMessage) // Operators cannot own objects in different namespaces /*err := controllerutil.SetControllerReference(instance, service, r.Scheme) if err != nil { From 65173b6e57730a80804f3143dad1e292aa017d05 Mon Sep 17 00:00:00 2001 From: Jaromir Wysoglad Date: Tue, 14 May 2024 02:17:31 -0400 Subject: [PATCH 07/10] Change the way of osdpns kustomization --- ci/deploy-logging-dependencies.yml | 16 ++ .../tasks/deploy-cluster-logging.yml | 37 ++++ .../tasks/deploy-loki.yml | 23 +++ .../tasks/deploy-minio.yml | 18 ++ .../tasks/deploy-operators.yml | 33 ++++ ci/deploy-logging-dependencies/tasks/main.yml | 161 +----------------- ci/vars-logging.yml | 15 -- 7 files changed, 135 insertions(+), 168 deletions(-) create mode 100644 ci/deploy-logging-dependencies/tasks/deploy-cluster-logging.yml create mode 100644 ci/deploy-logging-dependencies/tasks/deploy-loki.yml create mode 100644 ci/deploy-logging-dependencies/tasks/deploy-minio.yml create mode 100644 ci/deploy-logging-dependencies/tasks/deploy-operators.yml diff --git a/ci/deploy-logging-dependencies.yml b/ci/deploy-logging-dependencies.yml index be848c4e..1be49f76 100644 --- a/ci/deploy-logging-dependencies.yml +++ b/ci/deploy-logging-dependencies.yml @@ -9,3 +9,19 @@ - name: Deploy logging dependencies ansible.builtin.import_role: name: deploy-logging-dependencies + - name: Copy dataplane nodeset kustomization + ansible.builtin.copy: + dest: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/dataplane/90-kustomize-dataplane-logging-service.yaml" + content: |- + apiVersion: kustomize.config.k8s.io/v1beta1 + kind: Kustomization + resources: + namespace: {{ cifmw_install_yamls_defaults['NAMESPACE'] }} + patches: + - target: + kind: OpenStackDataPlaneNodeSet + name: .* + patch: |- + - op: add + path: /spec/services/- + value: logging diff --git a/ci/deploy-logging-dependencies/tasks/deploy-cluster-logging.yml b/ci/deploy-logging-dependencies/tasks/deploy-cluster-logging.yml new file mode 100644 index 00000000..1fc21816 --- /dev/null +++ b/ci/deploy-logging-dependencies/tasks/deploy-cluster-logging.yml @@ -0,0 +1,37 @@ +- name: Create cluster logging + ansible.builtin.shell: + cmd: | + oc apply -f {{ role_path }}/files/cluster_logging.yaml -n openshift-logging + +- name: Wait for cluster logging to be created + ansible.builtin.command: + cmd: + oc get clusterlogging --namespace=openshift-logging instance + delay: 10 + retries: 20 + register: output + until: output.stdout_lines | length != 0 + +- name: Wait for the cluster logging to be ready + ansible.builtin.command: + cmd: | + oc wait --timeout=300s --for condition=Ready=True --namespace=openshift-logging clusterlogging instance + +- name: Create cluster log forwarder + ansible.builtin.shell: + cmd: | + oc apply -f {{ role_path }}/files/cluster_log_forwarder.yaml -n openshift-logging + +- name: Wait for cluster log forwarder to be created + ansible.builtin.command: + cmd: + oc get clusterlogforwarder --namespace=openshift-logging instance + delay: 10 + retries: 20 + register: output + until: output.stdout_lines | length != 0 + +- name: Wait for the cluster log forwarder to be ready + ansible.builtin.command: + cmd: | + oc wait --timeout=300s --for condition=Ready=True --namespace=openshift-logging clusterlogforwarder instance diff --git a/ci/deploy-logging-dependencies/tasks/deploy-loki.yml b/ci/deploy-logging-dependencies/tasks/deploy-loki.yml new file mode 100644 index 00000000..6cfe4708 --- /dev/null +++ b/ci/deploy-logging-dependencies/tasks/deploy-loki.yml @@ -0,0 +1,23 @@ +- name: Create loki S3 secret + ansible.builtin.shell: + cmd: | + oc apply -f {{ role_path }}/files/loki_secret.yaml -n openshift-logging + +- name: Create loki stack + ansible.builtin.shell: + cmd: | + oc apply -f {{ role_path }}/files/lokistack.yaml -n openshift-logging + +- name: Wait for lokistack to be created + ansible.builtin.command: + cmd: + oc get lokistacks --namespace=openshift-logging logging-loki + delay: 10 + retries: 20 + register: output + until: output.stdout_lines | length != 0 + +- name: Wait for the lokistack to be ready + ansible.builtin.command: + cmd: | + oc wait --timeout=300s --for condition=Ready=True --namespace=openshift-logging lokistacks logging-loki diff --git a/ci/deploy-logging-dependencies/tasks/deploy-minio.yml b/ci/deploy-logging-dependencies/tasks/deploy-minio.yml new file mode 100644 index 00000000..7d3170e5 --- /dev/null +++ b/ci/deploy-logging-dependencies/tasks/deploy-minio.yml @@ -0,0 +1,18 @@ +- name: Create minio deployment + ansible.builtin.shell: + cmd: | + oc apply -f {{ role_path }}/files/minio-dev.yaml + +- name: Wait for the minio pod to be created + ansible.builtin.command: + cmd: + oc get pods --namespace=minio-dev minio + delay: 10 + retries: 20 + register: output + until: output.stdout_lines | length != 0 + +- name: Wait for the minio pod to be running + ansible.builtin.command: + cmd: | + oc wait --timeout=300s --for jsonpath="{.status.phase}"=Running --namespace=minio-dev pod minio diff --git a/ci/deploy-logging-dependencies/tasks/deploy-operators.yml b/ci/deploy-logging-dependencies/tasks/deploy-operators.yml new file mode 100644 index 00000000..51708952 --- /dev/null +++ b/ci/deploy-logging-dependencies/tasks/deploy-operators.yml @@ -0,0 +1,33 @@ +- name: Create the CLO subscription and loki-operator subscriptions + ansible.builtin.shell: + cmd: | + oc apply -f {{ role_path }}/files/operators.yaml + + # need to have a wait here, since the csv is not created immediately. There is a slight delay, during which time, the oc wait command would fail, since there's no resource to watch +- name: Wait for the CLO csv to be created + ansible.builtin.command: + cmd: + oc get csv --namespace=openshift-logging -l operators.coreos.com/cluster-logging.openshift-logging + delay: 10 + retries: 20 + register: output + until: output.stdout_lines | length != 0 + +- name: Wait for the loki-operator csv to be created + ansible.builtin.command: + cmd: + oc get csv --namespace=openshift-operators-redhat -l operators.coreos.com/loki-operator.openshift-operators-redhat + delay: 10 + retries: 20 + register: output + until: output.stdout_lines | length != 0 + +- name: Wait for the CLO resources to be available + ansible.builtin.command: + cmd: | + oc wait --timeout=300s --for jsonpath="{.status.phase}"=Succeeded csv --namespace=openshift-logging -l operators.coreos.com/cluster-logging.openshift-logging + +- name: Wait for the Loki resources to be available + ansible.builtin.command: + cmd: | + oc wait --timeout=300s --for jsonpath="{.status.phase}"=Succeeded csv --namespace=openshift-operators-redhat -l operators.coreos.com/loki-operator.openshift-operators-redhat diff --git a/ci/deploy-logging-dependencies/tasks/main.yml b/ci/deploy-logging-dependencies/tasks/main.yml index 06b69d2e..b6377b5c 100644 --- a/ci/deploy-logging-dependencies/tasks/main.yml +++ b/ci/deploy-logging-dependencies/tasks/main.yml @@ -1,156 +1,11 @@ -- name: Create the CLO subscription and loki-operator subscriptions - ansible.builtin.shell: - cmd: | - oc apply -f {{ role_path }}/files/operators.yaml +- name: Deploy CLO and loki-operator + ansible.builtin.import_tasks: deploy-operators.yml - # need to have a wait here, since the csv is not created immediately. There is a slight delay, during which time, the oc wait command would fail, since there's no resource to watch -- name: Wait for the CLO csv to be created - ansible.builtin.command: - cmd: - oc get csv --namespace=openshift-logging -l operators.coreos.com/cluster-logging.openshift-logging - delay: 10 - retries: 20 - register: output - until: output.stdout_lines | length != 0 +- name: Deploy minio + ansible.builtin.import_tasks: deploy-minio.yml -- name: Wait for the loki-operator csv to be created - ansible.builtin.command: - cmd: - oc get csv --namespace=openshift-operators-redhat -l operators.coreos.com/loki-operator.openshift-operators-redhat - delay: 10 - retries: 20 - register: output - until: output.stdout_lines | length != 0 +- name: Deploy CLO and loki-operator + ansible.builtin.import_tasks: deploy-loki.yml -- name: Wait for the CLO resources to be available - ansible.builtin.command: - cmd: | - oc wait --timeout=300s --for jsonpath="{.status.phase}"=Succeeded csv --namespace=openshift-logging -l operators.coreos.com/cluster-logging.openshift-logging - -- name: Wait for the Loki resources to be available - ansible.builtin.command: - cmd: | - oc wait --timeout=300s --for jsonpath="{.status.phase}"=Succeeded csv --namespace=openshift-operators-redhat -l operators.coreos.com/loki-operator.openshift-operators-redhat - -- name: Create minio deployment - ansible.builtin.shell: - cmd: | - oc apply -f {{ role_path }}/files/minio-dev.yaml - -- name: Wait for the minio pod to be created - ansible.builtin.command: - cmd: - oc get pods --namespace=minio-dev minio - delay: 10 - retries: 20 - register: output - until: output.stdout_lines | length != 0 - -- name: Wait for the minio pod to be running - ansible.builtin.command: - cmd: | - oc wait --timeout=300s --for jsonpath="{.status.phase}"=Running --namespace=minio-dev pod minio - ### - # TODO: delete - ignore_errors: true - -- name: TMP get minio pod - ansible.builtin.command: - cmd: | - oc get --namespace=minio-dev pod minio -oyaml - register: output - -- name: TMP debug output of minio pod - ansible.builtin.debug: - msg: "{{ output.stdout_lines }}" - ### - -- name: Create loki S3 secret - ansible.builtin.shell: - cmd: | - oc apply -f {{ role_path }}/files/loki_secret.yaml -n openshift-logging - -- name: Create loki stack - ansible.builtin.shell: - cmd: | - oc apply -f {{ role_path }}/files/lokistack.yaml -n openshift-logging - -- name: Wait for lokistack to be created - ansible.builtin.command: - cmd: - oc get lokistacks --namespace=openshift-logging logging-loki - delay: 10 - retries: 20 - register: output - until: output.stdout_lines | length != 0 - -- name: Wait for the lokistack to be ready - ansible.builtin.command: - cmd: | - oc wait --timeout=300s --for condition=Ready=True --namespace=openshift-logging lokistacks logging-loki - ### - # TODO: delete - ignore_errors: true - -- name: TMP get lokistack - ansible.builtin.command: - cmd: | - oc get --namespace=openshift-logging lokistacks logging-loki -oyaml - register: output - ignore_errors: true - -- name: TMP debug output of lokistack - ansible.builtin.debug: - msg: "{{ output.stdout_lines }}" - ignore_errors: true - -- name: TMP get lokistack pods - ansible.builtin.command: - cmd: | - oc get pods -n openshift-logging -oyaml -l app.kubernetes.io/instance=logging-loki - register: output - ignore_errors: true - -- name: TMP debug output of lokistack pods yaml - ansible.builtin.debug: - msg: "{{ output.stdout_lines }}" - ignore_errors: true - ### - -- name: Create cluster logging - ansible.builtin.shell: - cmd: | - oc apply -f {{ role_path }}/files/cluster_logging.yaml -n openshift-logging - -- name: Wait for cluster logging to be created - ansible.builtin.command: - cmd: - oc get clusterlogging --namespace=openshift-logging instance - delay: 10 - retries: 20 - register: output - until: output.stdout_lines | length != 0 - -- name: Wait for the cluster logging to be ready - ansible.builtin.command: - cmd: | - oc wait --timeout=300s --for condition=Ready=True --namespace=openshift-logging clusterlogging instance - -- name: Create cluster log forwarder - ansible.builtin.shell: - cmd: | - oc apply -f {{ role_path }}/files/cluster_log_forwarder.yaml -n openshift-logging - -- name: Wait for cluster log forwarder to be created - ansible.builtin.command: - cmd: - oc get clusterlogforwarder --namespace=openshift-logging instance - delay: 10 - retries: 20 - register: output - until: output.stdout_lines | length != 0 - -- name: Wait for the cluster log forwarder to be ready - ansible.builtin.command: - cmd: | - oc wait --timeout=300s --for condition=Ready=True --namespace=openshift-logging clusterlogforwarder instance +- name: Deploy cluster logging and cluster log forwarder + ansible.builtin.import_tasks: deploy-cluster-logging.yml diff --git a/ci/vars-logging.yml b/ci/vars-logging.yml index 186fa303..5222fd9a 100644 --- a/ci/vars-logging.yml +++ b/ci/vars-logging.yml @@ -21,18 +21,3 @@ cifmw_edpm_prepare_kustomizations: enabled: true target: kind: OpenStackControlPlane -cifmw_edpm_kustomize_content: - - apiVersion: kustomize.config.k8s.io/v1beta1 - kind: Kustomization - namespace: openstack - patches: - - patch: |- - apiVersion: dataplane.openstack.org/v1beta1 - kind: OpenStackDataPlaneNodeSet - metadata: - name: unused - spec: - services: - - logging - target: - kind: OpenStackDataPlaneNodeSet From fa29914891bbb6e3d9a476faa866938c0a05224d Mon Sep 17 00:00:00 2001 From: Juan Larriba Date: Thu, 23 May 2024 09:27:44 +0200 Subject: [PATCH 08/10] Update logging_controller.go --- controllers/logging_controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/logging_controller.go b/controllers/logging_controller.go index a609a56d..007d3c44 100644 --- a/controllers/logging_controller.go +++ b/controllers/logging_controller.go @@ -261,7 +261,7 @@ func (r *LoggingReconciler) reconcileNormal(ctx context.Context, instance *telem return ctrl.Result{}, err } instance.Status.Conditions.MarkTrue(telemetryv1.LoggingCLONamespaceReadyCondition, condition.ReadyMessage) - + // Operators cannot own objects in different namespaces /*err := controllerutil.SetControllerReference(instance, service, r.Scheme) if err != nil { From 1307a9f4e81e04fe24206a994acbcd3024c36014 Mon Sep 17 00:00:00 2001 From: Jaromir Wysoglad Date: Thu, 23 May 2024 10:40:21 -0400 Subject: [PATCH 09/10] Fix infinite ceilometer reconcile The endpointurls aren't sorted (they get returned in a different order every time). Unfortunatelly the hash function produces a different hash based on the order. This is fixed by sorting the urls --- controllers/ceilometer_controller.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/controllers/ceilometer_controller.go b/controllers/ceilometer_controller.go index 423d7503..307863e7 100644 --- a/controllers/ceilometer_controller.go +++ b/controllers/ceilometer_controller.go @@ -19,6 +19,7 @@ package controllers import ( "context" "fmt" + "sort" "time" appsv1 "k8s.io/api/apps/v1" @@ -456,6 +457,8 @@ func (r *CeilometerReconciler) reconcileNormal(ctx context.Context, instance *te // Hash all the endpointurls to trigger a redeployment everytime one of the internal endpoints changes or is added v := "internal" endpointurls, err := keystonev1.GetKeystoneEndpointUrls(ctx, helper, instance.Namespace, &v) + sort.Strings(endpointurls) + if err != nil { return ctrl.Result{}, err From 9f4748f06903e75f06a0287d552cc0f1cdfbf3b6 Mon Sep 17 00:00:00 2001 From: OpenStack K8s CI Date: Sun, 26 May 2024 10:43:45 +0000 Subject: [PATCH 10/10] Update openstack-k8s-operators --- api/go.mod | 32 +++++------ api/go.sum | 64 +++++++++++----------- go.mod | 80 +++++++++++++-------------- go.sum | 156 ++++++++++++++++++++++++++--------------------------- 4 files changed, 166 insertions(+), 166 deletions(-) diff --git a/api/go.mod b/api/go.mod index 2da02e97..0d275185 100644 --- a/api/go.mod +++ b/api/go.mod @@ -3,14 +3,14 @@ module github.com/openstack-k8s-operators/telemetry-operator/api go 1.20 require ( - github.com/onsi/ginkgo/v2 v2.17.2 - github.com/onsi/gomega v1.33.0 - github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240429104248-25176c735750 - github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240429052447-09a614506ca6 + github.com/onsi/ginkgo/v2 v2.18.0 + github.com/onsi/gomega v1.33.1 + github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240525122647-715f01bb2987 + github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240525110728-367272c05a7a github.com/rhobs/observability-operator v0.0.28 - k8s.io/api v0.28.9 - k8s.io/apimachinery v0.28.9 - k8s.io/client-go v0.28.9 + k8s.io/api v0.28.10 + k8s.io/apimachinery v0.28.10 + k8s.io/client-go v0.28.10 sigs.k8s.io/controller-runtime v0.16.5 ) @@ -22,7 +22,7 @@ require ( github.com/evanphx/json-patch v5.7.0+incompatible // indirect github.com/evanphx/json-patch/v5 v5.9.0 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/zapr v1.3.0 // indirect github.com/go-openapi/jsonpointer v0.20.2 // indirect github.com/go-openapi/jsonreference v0.20.4 // indirect @@ -54,24 +54,24 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8 // indirect - golang.org/x/net v0.24.0 // indirect + golang.org/x/net v0.25.0 // indirect golang.org/x/oauth2 v0.16.0 // indirect - golang.org/x/sys v0.19.0 // indirect - golang.org/x/term v0.19.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/sys v0.20.0 // indirect + golang.org/x/term v0.20.0 // indirect + golang.org/x/text v0.15.0 // indirect golang.org/x/time v0.5.0 // indirect - golang.org/x/tools v0.20.0 // indirect + golang.org/x/tools v0.21.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiextensions-apiserver v0.28.9 // indirect - k8s.io/component-base v0.28.9 // indirect + k8s.io/apiextensions-apiserver v0.28.10 // indirect + k8s.io/component-base v0.28.10 // indirect k8s.io/klog/v2 v2.120.1 // indirect k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect - k8s.io/utils v0.0.0-20240423183400-0849a56e8f22 // indirect + k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect sigs.k8s.io/yaml v1.4.0 // indirect diff --git a/api/go.sum b/api/go.sum index 8bc78322..4e93ea56 100644 --- a/api/go.sum +++ b/api/go.sum @@ -14,8 +14,8 @@ github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0 github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ= github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg= github.com/go-openapi/jsonpointer v0.20.2 h1:mQc3nmndL8ZBzStEo3JYF8wzmeWffDH4VbXz58sAx6Q= @@ -66,14 +66,14 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g= -github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= -github.com/onsi/gomega v1.33.0 h1:snPCflnZrpMsy94p4lXVEkHo12lmPnc3vY5XBbreexE= -github.com/onsi/gomega v1.33.0/go.mod h1:+925n5YtiFsLzzafLUHzVMBpvvRAzrydIBiSIxjX3wY= -github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240429104248-25176c735750 h1:buuvAo48wCKOrn1gT1Br3Z2EMh0726m0Flc+1VVhyLU= -github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240429104248-25176c735750/go.mod h1:QN2DJpfEc+mbvvfhoCuJ/UhQzvw12Mf+8nS0QX1HGIg= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240429052447-09a614506ca6 h1:WLsG3Ko+phW5xZJjncypLWGASoLqKrt05qN9Zxsad6g= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240429052447-09a614506ca6/go.mod h1:lYhFzul37AR/6gAhTAA1KKWbOlzB3F/7014lejn883c= +github.com/onsi/ginkgo/v2 v2.18.0 h1:W9Y7IWXxPUpAit9ieMOLI7PJZGaW22DTKgiVAuhDTLc= +github.com/onsi/ginkgo/v2 v2.18.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= +github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= +github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= +github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240525122647-715f01bb2987 h1:QKCvlSmU3toGuGmLIIazSnfAGtPc9WYWJHUh6qTyH+s= +github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240525122647-715f01bb2987/go.mod h1:TnXnCaOQjjbAsj7v1F4Aynrb1abBvTTUdqxSx4HXUw0= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240525110728-367272c05a7a h1:UfWsbyp9B03LFt2qi3TdZqxB31NnbK58uXOn3qhrp9A= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240525110728-367272c05a7a/go.mod h1:u8x8OCTVqrDdP7ppgeciEsyVVKzCjY51hM97xCI1me0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -120,8 +120,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= -golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -135,18 +135,18 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= -golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q= -golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= +golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -154,8 +154,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY= -golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg= +golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw= +golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -177,22 +177,22 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.28.9 h1:E7VEXXCAlSrp+08zq4zgd+ko6Ttu0Mw+XoXlIkDTVW0= -k8s.io/api v0.28.9/go.mod h1:AnCsDYf3SHjfa8mPG5LGYf+iF4mie+3peLQR51MMCgw= -k8s.io/apiextensions-apiserver v0.28.9 h1:yzPHp+4IASHeu7XIPkAKJrY4UjWdjiAjOcQMd6oNKj0= -k8s.io/apiextensions-apiserver v0.28.9/go.mod h1:Rjhvq5y3JESdZgV2UOByldyefCfRrUguVpBLYOAIbVs= -k8s.io/apimachinery v0.28.9 h1:aXz4Zxsw+Pk4KhBerAtKRxNN1uSMWKfciL/iOdBfXvA= -k8s.io/apimachinery v0.28.9/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o= -k8s.io/client-go v0.28.9 h1:mmMvejwc/KDjMLmDpyaxkWNzlWRCJ6ht7Qsbsnwn39Y= -k8s.io/client-go v0.28.9/go.mod h1:GFDy3rUNId++WGrr0hRaBrs+y1eZz5JtVZODEalhRMo= -k8s.io/component-base v0.28.9 h1:ySM2PR8Z/xaUSG1Akd3yM6dqUezTltI7S5aV41MMuuc= -k8s.io/component-base v0.28.9/go.mod h1:QtWzscEhCKRfHV24/S+11BwWjVxhC6fd3RYoEgZcWFU= +k8s.io/api v0.28.10 h1:q1Y+h3F+siuwP/qCQuqgqGJjaIuQWN0yFE7z367E3Q0= +k8s.io/api v0.28.10/go.mod h1:u6EzGdzmEC2vfhyw4sD89i7OIc/2v1EAwvd1t4chQac= +k8s.io/apiextensions-apiserver v0.28.10 h1:oPw2OHjwmnAxeHsIsWcxks27UzNv1bTSQ7ei5xYStgY= +k8s.io/apiextensions-apiserver v0.28.10/go.mod h1:1ZHGxGUZO9ta7f1J6/CoaTYzYABufZolc5JkE1ekUe4= +k8s.io/apimachinery v0.28.10 h1:cWonrYsJK3lbuf9IgMs5+L5Jzw6QR3ZGA3hzwG0HDeI= +k8s.io/apimachinery v0.28.10/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o= +k8s.io/client-go v0.28.10 h1:y+mvUei3+RU0rE7r2BZFA2ApTAsXSN1glGs4QfULLt4= +k8s.io/client-go v0.28.10/go.mod h1:JLwjCWhQhvm1F4J+7YAr9WVhSRNmfkRofPWU43m8LZk= +k8s.io/component-base v0.28.10 h1:q2GEIfUOeVTzAVawbLsl2HVJ40aEYMmMgo61ACwJt2A= +k8s.io/component-base v0.28.10/go.mod h1:6NORKNW2SWoximcDE8GZlO0nXVtyVfiM5R5xSVNTRK8= k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= -k8s.io/utils v0.0.0-20240423183400-0849a56e8f22 h1:ao5hUqGhsqdm+bYbjH/pRkCs0unBGe9UyDahzs9zQzQ= -k8s.io/utils v0.0.0-20240423183400-0849a56e8f22/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCIXHaathvJg1C3ak= +k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/controller-runtime v0.16.5 h1:yr1cEJbX08xsTW6XEIzT13KHHmIyX8Umvme2cULvFZw= sigs.k8s.io/controller-runtime v0.16.5/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= diff --git a/go.mod b/go.mod index 98ed0071..aab3e410 100644 --- a/go.mod +++ b/go.mod @@ -5,24 +5,24 @@ go 1.20 replace github.com/openstack-k8s-operators/telemetry-operator/api => ./api require ( - github.com/go-logr/logr v1.4.1 + github.com/go-logr/logr v1.4.2 github.com/gophercloud/gophercloud v1.11.0 - github.com/onsi/ginkgo/v2 v2.17.2 - github.com/onsi/gomega v1.33.0 - github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20240430064940-efe1bb725a94 - github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240430090712-e6c78e4ea887 - github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240429104248-25176c735750 - github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240429164853-7e1e3b111ee9 - github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240429052447-09a614506ca6 - github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240429052447-09a614506ca6 - github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240429121622-952f44520872 - github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240429095317-40ac2890007c + github.com/onsi/ginkgo/v2 v2.18.0 + github.com/onsi/gomega v1.33.1 + github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20240524121152-67f1c18d6443 + github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240523111136-ec8b6fd7b0a9 + github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240525122647-715f01bb2987 + github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240525111221-1e3ee314289c + github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240525110728-367272c05a7a + github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240525110728-367272c05a7a + github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240514152407-b2bea62f05db + github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240523083214-397d3fd0da29 github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.69.0-rhobs1 github.com/rhobs/observability-operator v0.0.28 - k8s.io/api v0.28.9 - k8s.io/apimachinery v0.28.9 - k8s.io/client-go v0.28.9 - k8s.io/utils v0.0.0-20240423183400-0849a56e8f22 + k8s.io/api v0.28.10 + k8s.io/apimachinery v0.28.10 + k8s.io/client-go v0.28.10 + k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 sigs.k8s.io/controller-runtime v0.16.5 ) @@ -41,7 +41,7 @@ require ( github.com/go-openapi/swag v0.22.9 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.19.0 // indirect + github.com/go-playground/validator/v10 v10.20.0 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect @@ -62,22 +62,22 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/openshift/api v3.9.0+incompatible // indirect - github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240430093730-98d5b0130ca1 // indirect - github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240430093732-100f539bb6e6 // indirect - github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240430093157-c474602ef7e6 // indirect - github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240430052712-841fde32d943 // indirect - github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240430085044-cf46cfe9e9aa // indirect - github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240430085043-5c245a596d9b // indirect - github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240429052447-09a614506ca6 // indirect - github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240430085856-68c83fbc3041 // indirect - github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240430093731-289b1f3dcb7b // indirect - github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240430105436-c12810299aa4 // indirect - github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240430094542-9927da9728ff // indirect - github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240429153157-9a04c56acdf5 // indirect - github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240430080927-7e2f8cebbb38 // indirect - github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240429134440-8053d9864949 // indirect - github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240430085612-67bdcd653187 // indirect - github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240430102407-435ee7d3bfdf // indirect + github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240523081006-98dc23995369 // indirect + github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240523111135-76faf2ff9542 // indirect + github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240523092716-301e74907910 // indirect + github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240526095629-50018c5539c5 // indirect + github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240515093015-9d2609bb0015 // indirect + github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240523093522-7a25580a799d // indirect + github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240525110728-367272c05a7a // indirect + github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240523092949-4ce774522565 // indirect + github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240523093521-639e83314a88 // indirect + github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240522182146-9eeda511bbe1 // indirect + github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240523092718-22ea0a3c5100 // indirect + github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240523005930-c332745390c8 // indirect + github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240524113618-b68cb4ab53fb // indirect + github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240522132732-6d6cd2162ea3 // indirect + github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240522174844-950b72813aa5 // indirect + github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240523121736-379011b2cfac // indirect github.com/pkg/errors v0.9.1 // indirect github.com/prometheus/client_golang v1.18.0 // indirect github.com/prometheus/client_model v0.5.0 // indirect @@ -88,23 +88,23 @@ require ( github.com/spf13/pflag v1.0.5 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/crypto v0.22.0 // indirect + golang.org/x/crypto v0.23.0 // indirect golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8 // indirect - golang.org/x/net v0.24.0 // indirect + golang.org/x/net v0.25.0 // indirect golang.org/x/oauth2 v0.16.0 // indirect - golang.org/x/sys v0.19.0 // indirect - golang.org/x/term v0.19.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/sys v0.20.0 // indirect + golang.org/x/term v0.20.0 // indirect + golang.org/x/text v0.15.0 // indirect golang.org/x/time v0.5.0 // indirect - golang.org/x/tools v0.20.0 // indirect + golang.org/x/tools v0.21.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiextensions-apiserver v0.28.9 // indirect - k8s.io/component-base v0.28.9 // indirect + k8s.io/apiextensions-apiserver v0.28.10 // indirect + k8s.io/component-base v0.28.10 // indirect k8s.io/klog/v2 v2.120.1 // indirect k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect sigs.k8s.io/gateway-api v0.8.0 // indirect diff --git a/go.sum b/go.sum index eb4bc316..7daa384b 100644 --- a/go.sum +++ b/go.sum @@ -17,8 +17,8 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ= github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg= github.com/go-openapi/jsonpointer v0.20.2 h1:mQc3nmndL8ZBzStEo3JYF8wzmeWffDH4VbXz58sAx6Q= @@ -32,8 +32,8 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= -github.com/go-playground/validator/v10 v10.19.0 h1:ol+5Fu+cSq9JD7SoSqe04GMI92cbn0+wvQ3bZ8b/AU4= -github.com/go-playground/validator/v10 v10.19.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= +github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBExVwjEviJTixqxL8= +github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= @@ -84,60 +84,60 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g= -github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= -github.com/onsi/gomega v1.33.0 h1:snPCflnZrpMsy94p4lXVEkHo12lmPnc3vY5XBbreexE= -github.com/onsi/gomega v1.33.0/go.mod h1:+925n5YtiFsLzzafLUHzVMBpvvRAzrydIBiSIxjX3wY= +github.com/onsi/ginkgo/v2 v2.18.0 h1:W9Y7IWXxPUpAit9ieMOLI7PJZGaW22DTKgiVAuhDTLc= +github.com/onsi/ginkgo/v2 v2.18.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= +github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= +github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7 h1:rncLxJBpFGqBztyxCMwNRnMjhhIDOWHJowi6q8G6koI= github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7/go.mod h1:ctXNyWanKEjGj8sss1KjjHQ3ENKFm33FFnS5BKaIPh4= -github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240430093730-98d5b0130ca1 h1:upbLPHtukY6OFiLDmRhps1xrGgeb+ENGMs5cc1awtxY= -github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240430093730-98d5b0130ca1/go.mod h1:9Q8Pkquc8LcFN2/fUVUXn27ClMGhN17r2KLC4JEG6qA= -github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240430093732-100f539bb6e6 h1:OgD/skqNdiuzjSIjcYQwVnF7+YC4okqel5Ir28HsQk8= -github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240430093732-100f539bb6e6/go.mod h1:5qQAgXQ8xOqRd8zmJkooVut6uWxKpeq47JsfXhlpbaM= -github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20240430064940-efe1bb725a94 h1:UlCJZfbxdSHkolrlDxgLuZobDKjV6q/2s6+VBATRjlc= -github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20240430064940-efe1bb725a94/go.mod h1:TgW0ykQrBJaaKsHwIbB5ypEXD97fvU9nxq2lWSWTsqw= -github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240430093157-c474602ef7e6 h1:+ntqywFT+BIj1QUi0vLLD7JbvLRk1kaG2buVcG9rEnc= -github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240430093157-c474602ef7e6/go.mod h1:XFkEcVuWOtDbQegS1gJwAqiGT4cw2kEM6Rhu1hILGCA= -github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240430052712-841fde32d943 h1:oeXYpHtDETNPWEq0TlzwJTq0+n9soz08fTspABKrG/k= -github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240430052712-841fde32d943/go.mod h1:Xql742LKrGr2QN5BhH1zniqe1INQ5QegQ5IDjsg+2Kk= -github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240430090712-e6c78e4ea887 h1:un2kRi2P6DYKFWStvrep8LUPAiNbTH1mn8jiG1rAvQI= -github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240430090712-e6c78e4ea887/go.mod h1:s9yK6Nt6s4Ce+ivtlKrsvCSCWSXVGc2Sj19A0hO/Af4= -github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240430085044-cf46cfe9e9aa h1:VSD3+UljDe4LXxTMA8HJRA1xhmSbIg6jgqNPmBNjOco= -github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240430085044-cf46cfe9e9aa/go.mod h1:1ddkgh0JPbFIc8TuV0o7fR29WcDV0aH3uuovpCGfTlg= -github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240429104248-25176c735750 h1:buuvAo48wCKOrn1gT1Br3Z2EMh0726m0Flc+1VVhyLU= -github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240429104248-25176c735750/go.mod h1:QN2DJpfEc+mbvvfhoCuJ/UhQzvw12Mf+8nS0QX1HGIg= -github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240430085043-5c245a596d9b h1:0tPMaSzwnVftS84updkyaSFaugWOMd0yg6CDx5xJhI4= -github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240430085043-5c245a596d9b/go.mod h1:8aiTtazP4WUG+cW78YWqb1Hr22L0kk0eRo+56W9WpW8= -github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240429164853-7e1e3b111ee9 h1:aS7xUxC/uOXfw0T4ARTu0G1qb6eJ0WnB2JRv9donPOE= -github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240429164853-7e1e3b111ee9/go.mod h1:Y/ge/l24phVaJb9S8mYRjtnDkohFkX/KEOUXLArcyvQ= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240429052447-09a614506ca6 h1:WLsG3Ko+phW5xZJjncypLWGASoLqKrt05qN9Zxsad6g= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240429052447-09a614506ca6/go.mod h1:lYhFzul37AR/6gAhTAA1KKWbOlzB3F/7014lejn883c= -github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240429052447-09a614506ca6 h1:/mhzQQ9FF70z00zZD7dpgOoNXvEu9q68oob3oAiJW08= -github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240429052447-09a614506ca6/go.mod h1:mrRNYeg8jb1zgGsufpN1/IB3sdbaST8btTBLwQ+taaA= -github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240429052447-09a614506ca6 h1:NNSOEpTZCa9RL5sZiF4ZOlB+agBrL7q7FB9pC58d4S8= -github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240429052447-09a614506ca6/go.mod h1:C/qUWW4lW3687riZxYd+YRCtOyHZKURu3Imv6S9OP7U= -github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240430085856-68c83fbc3041 h1:hXfSkszqidRpnx8kYYpNYSI+hF52WcGDadnZ37ozC5Y= -github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240430085856-68c83fbc3041/go.mod h1:ojRpS1KO7qWpQUTg3It+DLGeoZuZ3EnWtIL74VtSvxs= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240429121622-952f44520872 h1:ViWyS1AQ2mTn/sS0CA9GVw0+BuGpazpUSjSBUzdX3NE= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240429121622-952f44520872/go.mod h1:tJbu9FBKNOpgN7T8SHhFGFnmKOg2EQsBWRKqE8+CPPA= -github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240430093731-289b1f3dcb7b h1:nt/UjLlPFRr/CAX6NkaPz/6CnXpJw+GCrzgxm+RgtZg= -github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240430093731-289b1f3dcb7b/go.mod h1:dXRdA2lH7Ibo1ZexlLuUBCeunw85D7s2FK/W6Xes2/c= -github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240430105436-c12810299aa4 h1:rsHDlSJKVtH8Sj0FqWElNOJ8w733OMSrPpE7Zudr/eY= -github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240430105436-c12810299aa4/go.mod h1:zk1v1pEqPlfRucHijswLTeWHb/Qsn9hEy35pePBb1uw= -github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240430094542-9927da9728ff h1:wI23cPyJCPJegZarBj16k00t4chg3k6aGYCM19FPFbw= -github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240430094542-9927da9728ff/go.mod h1:Dpn/imi5Z+dLSra5mkP1TCxwLChqt9wQOaP1EupV1QY= -github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240429153157-9a04c56acdf5 h1:uRZxszC7fq9MnIDO+k4oepKA6NyH2j/DhJO3VcC/Bc8= -github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240429153157-9a04c56acdf5/go.mod h1:z+mHw+0/ehsh5bPzeuurxY5uahRNtH1KcOkYg8Bl678= -github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240430080927-7e2f8cebbb38 h1:If29JYCnscQSMwgWn5IFQ7hQiq5hID5EWrvq7oLndvY= -github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240430080927-7e2f8cebbb38/go.mod h1:zUum6wkPJmgzQeA25N53THoc5LC+0R8Ub7Q9PJMEXgA= -github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240429134440-8053d9864949 h1:lG8eZOJVk5cOqZZNrvvIDH4LSivUpQPub90OyZX2Lvg= -github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240429134440-8053d9864949/go.mod h1:xChesp2Z/GkHcWo/FJkUNVlQdfwOMmMhkEnh+AFnlaE= -github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240430085612-67bdcd653187 h1:XFmZIf1EFOov5Cuwhuby5dKR/oERmYZudykcpYd3kvA= -github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240430085612-67bdcd653187/go.mod h1:9iZxVsbkIeX29ZWWcXtmN4zNxChcyAoyiCZ+rK8MzpQ= +github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240523081006-98dc23995369 h1:gUZVKIEC/awfN+BkMDpBlcY8exT90DAXM0SSh/zGwH8= +github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240523081006-98dc23995369/go.mod h1:GkisiXRP0lvef7h19rR9WRMCLN0+X+gdTt5Zs5ZyzBo= +github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240523111135-76faf2ff9542 h1:o/d8ZEWwyBl+//K4YGCcZgkK3Gz3rNX0U2tKje2oFz0= +github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240523111135-76faf2ff9542/go.mod h1:8Wn6ZAPaJshxozJVPI7uq4qrcUXZmECGAPJK7Ed+uGQ= +github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20240524121152-67f1c18d6443 h1:vziLZuNABZmr/vqs7hjUKyYz+lCikA87c+Mctzthzf4= +github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20240524121152-67f1c18d6443/go.mod h1:zzJVwgLi/RckvW7vgjgkPad24/zO1UKo4uYaX+ZJOZE= +github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240523092716-301e74907910 h1:+X3BJFFBPKhSPDoIW5glQAJ13/ndmNXYvNOWPfGBJNs= +github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240523092716-301e74907910/go.mod h1:grWcSpsvvrTUARs8XGFcobA5y51RtSU+FuKWGOutwAQ= +github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240526095629-50018c5539c5 h1:yFiT0W/NR60wjUWLjiVr/5tiLIycswL2Og7NgfMp3bA= +github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240526095629-50018c5539c5/go.mod h1:U2//y4ZsgL+OqVW6y0zsdrA4Ir8JB7nqbfMmK5+Hccw= +github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240523111136-ec8b6fd7b0a9 h1:G6p+C2ajguQtTMc/JHThvZN2OY3VWvLjApt1numoRZY= +github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240523111136-ec8b6fd7b0a9/go.mod h1:qtz54iJmU01tVS9qMmnnDN4/p+CMuEYfPQDqf11nxfM= +github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240515093015-9d2609bb0015 h1:eWXh/0ECebuM+R42T+C+RWFQIkn+zOiOhHLbOVPm6D4= +github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240515093015-9d2609bb0015/go.mod h1:1ddkgh0JPbFIc8TuV0o7fR29WcDV0aH3uuovpCGfTlg= +github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240525122647-715f01bb2987 h1:QKCvlSmU3toGuGmLIIazSnfAGtPc9WYWJHUh6qTyH+s= +github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240525122647-715f01bb2987/go.mod h1:TnXnCaOQjjbAsj7v1F4Aynrb1abBvTTUdqxSx4HXUw0= +github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240523093522-7a25580a799d h1:tgT+mww9s0srwvWG5KZraTxR+y4g4fG5zhi/50fh0lY= +github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240523093522-7a25580a799d/go.mod h1:rltaem4x0R2LE4fTdUOVNAp7nBwzTSpKBdhfrQxZIX8= +github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240525111221-1e3ee314289c h1:DLvy+ngJJiXjh4KEnCR15EieFkiCM4Wkp43Col5HnGc= +github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240525111221-1e3ee314289c/go.mod h1:TnNxraQbQGIoP1pLlhTsBPJ5sWbpAS4amCaQ0XNnEAs= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240525110728-367272c05a7a h1:UfWsbyp9B03LFt2qi3TdZqxB31NnbK58uXOn3qhrp9A= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240525110728-367272c05a7a/go.mod h1:u8x8OCTVqrDdP7ppgeciEsyVVKzCjY51hM97xCI1me0= +github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240525110728-367272c05a7a h1:OC6MBKJ+GweFpOrV57dPAT9aN4KCK+z78esqk+ujCtA= +github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240525110728-367272c05a7a/go.mod h1:xTuLARvJxJ/3Ai6yePSsD0zsa0YtOhB9GW242jDhfZc= +github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240525110728-367272c05a7a h1:cse77ziJGS1PNCDP+u7XIfigtBOXFzpcuigmRIQfWio= +github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240525110728-367272c05a7a/go.mod h1:sp71zOBcn+FhvmmmE6ms8djfgIij8i93QanJEVxASp4= +github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240523092949-4ce774522565 h1:51HyQ5Ac8wx+nZWhPniv2Ne3CXwpAOq7ry87fg1VrI4= +github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240523092949-4ce774522565/go.mod h1:ApDWszjGRuzWymKJr6k40E7emHGyqcDoEYYX0rt9v5w= +github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240514152407-b2bea62f05db h1:9Egd/Hs/ZKyWl4vXkbivu/MG52Ww/kDrzE9KNYKuj7M= +github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240514152407-b2bea62f05db/go.mod h1:tJbu9FBKNOpgN7T8SHhFGFnmKOg2EQsBWRKqE8+CPPA= +github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240523093521-639e83314a88 h1:6/FPRHhgvh6WTmTmXsY3rUvvAGghZVIvN5+Y+PM7trU= +github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240523093521-639e83314a88/go.mod h1:6FiuVfxj/Vlcewfh2Q042wppqYyZAho4ntsd3Gwma0E= +github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240522182146-9eeda511bbe1 h1:w4FTYF/9OLkZdCB3xkPh69Mi6Ao7FRbocw5UyOQGviM= +github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240522182146-9eeda511bbe1/go.mod h1:zk1v1pEqPlfRucHijswLTeWHb/Qsn9hEy35pePBb1uw= +github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240523092718-22ea0a3c5100 h1:O47DgUcPoozPsAtqacKtWbgzJKiirWO/HgV3cEfnfqc= +github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240523092718-22ea0a3c5100/go.mod h1:AWiNsUW/IQARQfEt0RDknT879JszjK4AOVHkjhs/Svk= +github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240523005930-c332745390c8 h1:R1MeuR4dPhMop5i9Q4s0PKwqII/uzB6+sVhF9DeWk78= +github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240523005930-c332745390c8/go.mod h1:z+mHw+0/ehsh5bPzeuurxY5uahRNtH1KcOkYg8Bl678= +github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240524113618-b68cb4ab53fb h1:6qgqYhttkvL97P5rQXdUOEpUa+iUmhs24npPgGYfLYE= +github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240524113618-b68cb4ab53fb/go.mod h1:25Njc/iaQajDsurlVyU02fpM4Kia4WM9tUixwE1qgqk= +github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240522132732-6d6cd2162ea3 h1:7PhNMxXxOOeuvu2qEvq5eXOjOAJP3RZK+Ks3XMyfLF0= +github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240522132732-6d6cd2162ea3/go.mod h1:xChesp2Z/GkHcWo/FJkUNVlQdfwOMmMhkEnh+AFnlaE= +github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240522174844-950b72813aa5 h1:dQdp2WOIXTNYU7OHJHVLpwuvsyRcYeyGeTVPWb4wF9Y= +github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240522174844-950b72813aa5/go.mod h1:Za/xVLzuFJTg20PjoRjxJXUQYutlW3cp8ZoSGYRoU2I= github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240313124519-961a0ee8bf7f h1:wWaOCAkCym4t+NZWXYT/LErGhKujDdKgc7Qy/3vX4uU= github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240313124519-961a0ee8bf7f/go.mod h1:Zryxg5YgbPUFcLSCcKpf10il8kIRAK5HloNo6khhdis= -github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240430102407-435ee7d3bfdf h1:dJhTUEjfQ+dYtpU0OkyEAoqYTx6fYB9EPVZteAuyLs0= -github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240430102407-435ee7d3bfdf/go.mod h1:uBmJFNegyuK5fruDxkIjG+17wvw2DjnqpYvQYgrcjEA= +github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240523121736-379011b2cfac h1:h/7TiNBMsbnN8+n4hHyigk8sd7QulEfTgvftIU30lrA= +github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240523121736-379011b2cfac/go.mod h1:qCO/0ZLhijlvPbeMKThUqIZWely/0zoaWXFFqTuovhY= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -175,8 +175,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= -golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= +golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8 h1:ESSUROHIBHg7USnszlcdmjBEwdMj9VUvU+OPk4yl2mc= golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -189,8 +189,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= -golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -205,19 +205,19 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= -golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q= -golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= +golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -225,8 +225,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY= -golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg= +golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw= +golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -248,22 +248,22 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.28.9 h1:E7VEXXCAlSrp+08zq4zgd+ko6Ttu0Mw+XoXlIkDTVW0= -k8s.io/api v0.28.9/go.mod h1:AnCsDYf3SHjfa8mPG5LGYf+iF4mie+3peLQR51MMCgw= -k8s.io/apiextensions-apiserver v0.28.9 h1:yzPHp+4IASHeu7XIPkAKJrY4UjWdjiAjOcQMd6oNKj0= -k8s.io/apiextensions-apiserver v0.28.9/go.mod h1:Rjhvq5y3JESdZgV2UOByldyefCfRrUguVpBLYOAIbVs= -k8s.io/apimachinery v0.28.9 h1:aXz4Zxsw+Pk4KhBerAtKRxNN1uSMWKfciL/iOdBfXvA= -k8s.io/apimachinery v0.28.9/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o= -k8s.io/client-go v0.28.9 h1:mmMvejwc/KDjMLmDpyaxkWNzlWRCJ6ht7Qsbsnwn39Y= -k8s.io/client-go v0.28.9/go.mod h1:GFDy3rUNId++WGrr0hRaBrs+y1eZz5JtVZODEalhRMo= -k8s.io/component-base v0.28.9 h1:ySM2PR8Z/xaUSG1Akd3yM6dqUezTltI7S5aV41MMuuc= -k8s.io/component-base v0.28.9/go.mod h1:QtWzscEhCKRfHV24/S+11BwWjVxhC6fd3RYoEgZcWFU= +k8s.io/api v0.28.10 h1:q1Y+h3F+siuwP/qCQuqgqGJjaIuQWN0yFE7z367E3Q0= +k8s.io/api v0.28.10/go.mod h1:u6EzGdzmEC2vfhyw4sD89i7OIc/2v1EAwvd1t4chQac= +k8s.io/apiextensions-apiserver v0.28.10 h1:oPw2OHjwmnAxeHsIsWcxks27UzNv1bTSQ7ei5xYStgY= +k8s.io/apiextensions-apiserver v0.28.10/go.mod h1:1ZHGxGUZO9ta7f1J6/CoaTYzYABufZolc5JkE1ekUe4= +k8s.io/apimachinery v0.28.10 h1:cWonrYsJK3lbuf9IgMs5+L5Jzw6QR3ZGA3hzwG0HDeI= +k8s.io/apimachinery v0.28.10/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o= +k8s.io/client-go v0.28.10 h1:y+mvUei3+RU0rE7r2BZFA2ApTAsXSN1glGs4QfULLt4= +k8s.io/client-go v0.28.10/go.mod h1:JLwjCWhQhvm1F4J+7YAr9WVhSRNmfkRofPWU43m8LZk= +k8s.io/component-base v0.28.10 h1:q2GEIfUOeVTzAVawbLsl2HVJ40aEYMmMgo61ACwJt2A= +k8s.io/component-base v0.28.10/go.mod h1:6NORKNW2SWoximcDE8GZlO0nXVtyVfiM5R5xSVNTRK8= k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= -k8s.io/utils v0.0.0-20240423183400-0849a56e8f22 h1:ao5hUqGhsqdm+bYbjH/pRkCs0unBGe9UyDahzs9zQzQ= -k8s.io/utils v0.0.0-20240423183400-0849a56e8f22/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCIXHaathvJg1C3ak= +k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/controller-runtime v0.16.5 h1:yr1cEJbX08xsTW6XEIzT13KHHmIyX8Umvme2cULvFZw= sigs.k8s.io/controller-runtime v0.16.5/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0= sigs.k8s.io/gateway-api v0.8.0 h1:isQQ3Jx2qFP7vaA3ls0846F0Amp9Eq14P08xbSwVbQg=