Skip to content

Commit

Permalink
Merge branch 'main' into kubeconfig_incluster_mode
Browse files Browse the repository at this point in the history
  • Loading branch information
greyerof authored Oct 20, 2023
2 parents 06ed8ef + c1d9365 commit 7c150e4
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.access.redhat.com/ubi8/ubi:8.8-1067.1696517599 AS build
FROM registry.access.redhat.com/ubi8/ubi:8.8-1067.1697633337 AS build
ENV TNF_DIR=/usr/tnf
ENV \
TNF_SRC_DIR=${TNF_DIR}/tnf-src \
Expand Down Expand Up @@ -99,7 +99,7 @@ FROM quay.io/testnetworkfunction/oct:latest AS db

# Copy the state into a new flattened image to reduce size.
# TODO run as non-root
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1072.1696517598
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1072.1697626218

ENV \
TNF_DIR=/usr/tnf \
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -216,12 +216,12 @@ require (
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.4.0
github.com/manifoldco/promptui v0.9.0
github.com/openshift/machine-config-operator v0.0.1-0.20230515070935-49f32d46538e
github.com/redhat-openshift-ecosystem/openshift-preflight v0.0.0-20230926153703-7ab81a71d043
github.com/redhat-openshift-ecosystem/openshift-preflight v0.0.0-20231018165107-f04b78186455
github.com/test-network-function/oct v0.0.1
github.com/test-network-function/privileged-daemonset v1.0.12
gopkg.in/yaml.v3 v3.0.1
gotest.tools/v3 v3.5.1
k8s.io/kubectl v0.28.2
)

replace github.com/redhat-openshift-ecosystem/openshift-preflight => github.com/redhat-openshift-ecosystem/openshift-preflight v0.0.0-20230926153703-7ab81a71d043
replace github.com/redhat-openshift-ecosystem/openshift-preflight => github.com/redhat-openshift-ecosystem/openshift-preflight v0.0.0-20231018165107-f04b78186455
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -524,8 +524,8 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT
github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg=
github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
github.com/redhat-openshift-ecosystem/openshift-preflight v0.0.0-20230926153703-7ab81a71d043 h1:x6acjQkmSzRpxesD2VCj1ORtvWExu1koGKEL7lwh0JQ=
github.com/redhat-openshift-ecosystem/openshift-preflight v0.0.0-20230926153703-7ab81a71d043/go.mod h1:nBrN/6sJ+U7b8OdGOImefq6wMm/9voN8oac0fjwM7wU=
github.com/redhat-openshift-ecosystem/openshift-preflight v0.0.0-20231018165107-f04b78186455 h1:ZF268LdtLMQHFFM40SMc2dPMrNrNQFA5k/MM37lnSNc=
github.com/redhat-openshift-ecosystem/openshift-preflight v0.0.0-20231018165107-f04b78186455/go.mod h1:nBrN/6sJ+U7b8OdGOImefq6wMm/9voN8oac0fjwM7wU=
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
Expand Down

0 comments on commit 7c150e4

Please sign in to comment.