Skip to content

Commit

Permalink
merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@nickwsuse
nickwsuse committed Apr 5, 2024
2 parents dc86ed2 + 638bfef commit df99199
Show file tree
Hide file tree
Showing 30 changed files with 1,421 additions and 11 deletions.
8 changes: 8 additions & 0 deletions Dockerfile-windows.dapper
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ RUN pushd c:\; \
popd;

RUN pushd c:\; \
<<<<<<< HEAD
$URL = 'https://github.com/golangci/golangci-lint/releases/download/v1.54.2/golangci-lint-1.54.2-windows-amd64.zip'; \
=======
$URL = 'https://github.com/golangci/golangci-lint/releases/download/v1.56.0/golangci-lint-1.56.0-windows-amd64.zip'; \
>>>>>>> 638bfef7d2400fbedd95b81a42f78438d1198b40
\
Write-Host ('Downloading golangci from {0} ...' -f $URL); \
curl.exe -sfL $URL -o c:\golangci-lint.zip; \
Expand All @@ -26,7 +30,11 @@ RUN pushd c:\; \
Remove-Item -Force -Recurse -Path c:\golangci-lint.zip; \
\
Write-Host 'Updating PATH ...'; \
<<<<<<< HEAD
[Environment]::SetEnvironmentVariable('PATH', ('c:\golangci-lint-1.54.2-windows-amd64\;{0}' -f $env:PATH), [EnvironmentVariableTarget]::Machine); \
=======
[Environment]::SetEnvironmentVariable('PATH', ('c:\golangci-lint-1.56.0-windows-amd64\;{0}' -f $env:PATH), [EnvironmentVariableTarget]::Machine); \
>>>>>>> 638bfef7d2400fbedd95b81a42f78438d1198b40
\
Write-Host 'Complete.'; \
popd;
Expand Down
13 changes: 13 additions & 0 deletions Dockerfile.dapper
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,13 @@ FROM registry.suse.com/bci/golang:1.22
ARG DAPPER_HOST_ARCH
ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH}
ENV CATTLE_HELM_VERSION v2.16.8-rancher2
<<<<<<< HEAD
ENV CATTLE_MACHINE_VERSION v0.15.0-rancher110
ENV CATTLE_K3S_VERSION v1.28.6+k3s2
=======
ENV CATTLE_MACHINE_VERSION v0.15.0-rancher109
ENV CATTLE_K3S_VERSION v1.27.10+k3s2
>>>>>>> 638bfef7d2400fbedd95b81a42f78438d1198b40
# helm 3 version
ENV HELM_VERSION v3.13.3
ENV KUSTOMIZE_VERSION v5.0.1
Expand All @@ -29,7 +34,11 @@ RUN if [ "${ARCH}" != "s390x" ]; then \

ENV GOLANGCI_LINT v1.56.0
RUN if [ "${ARCH}" == "amd64" ]; then \
<<<<<<< HEAD
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.54.2; \
=======
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s "${GOLANGCI_LINT}"; \
>>>>>>> 638bfef7d2400fbedd95b81a42f78438d1198b40
curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/spectrometer/master/install.sh | sh; \
fi

Expand Down Expand Up @@ -69,7 +78,11 @@ RUN mkdir /usr/tmp && \
chmod +x /usr/bin/kustomize

# Set up K3s: copy the necessary binaries from the K3s image.
<<<<<<< HEAD
COPY --from=rancher/k3s:v1.28.6-k3s2 \
=======
COPY --from=rancher/k3s:v1.27.10-k3s2 \
>>>>>>> 638bfef7d2400fbedd95b81a42f78438d1198b40
/bin/blkid \
/bin/bandwidth \
/bin/cni \
Expand Down
7 changes: 7 additions & 0 deletions build.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
<<<<<<< HEAD
webhookVersion: 103.0.2+up0.4.3
cspAdapterMinVersion: 103.0.1+up3.0.1
defaultShellVersion: rancher/shell:v0.1.23
fleetVersion: 103.1.2+up0.9.2
=======
webhookVersion: 104.0.0+up0.5.0-rc8
cspAdapterMinVersion: 103.0.0+up3.0.0
defaultShellVersion: rancher/shell:v0.1.22
fleetVersion: 104.0.0+up0.10.0-rc.4
>>>>>>> 638bfef7d2400fbedd95b81a42f78438d1198b40
134 changes: 134 additions & 0 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@ replace (

github.com/knative/pkg => github.com/rancher/pkg v0.0.0-20190514055449-b30ab9de040e
github.com/matryer/moq => github.com/rancher/moq v0.0.0-20200712062324-13d1f37d2d77
<<<<<<< HEAD
github.com/opencontainers/image-spec => github.com/opencontainers/image-spec v1.1.0-rc2 // needed for containers/image/v5
github.com/opencontainers/runc => github.com/opencontainers/runc v1.1.12

=======
>>>>>>> 638bfef7d2400fbedd95b81a42f78438d1198b40
github.com/rancher/rancher/pkg/apis => ./pkg/apis
github.com/rancher/rancher/pkg/client => ./pkg/client

Expand All @@ -24,6 +27,7 @@ replace (
go.opentelemetry.io/proto/otlp => go.opentelemetry.io/proto/otlp v0.19.0
go.qase.io/client => github.com/rancher/qase-go/client v0.0.0-20240308221502-c3b2635212be

<<<<<<< HEAD
helm.sh/helm/v3 => github.com/rancher/helm/v3 v3.13.3-rancher1
k8s.io/api => k8s.io/api v0.28.6
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.6
Expand Down Expand Up @@ -65,6 +69,48 @@ require (
github.com/rancher/rancher/pkg/apis v0.0.0-20240126142034-676c3eb3dfa5
github.com/rancher/shepherd v0.0.0-20240401195459-dd0f1e7e8dca
go.qase.io/client v0.0.0-20231114201952-65195ec001fa
=======
helm.sh/helm/v3 => github.com/rancher/helm/v3 v3.12.3-rancher1
k8s.io/api => k8s.io/api v0.27.9
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.9
k8s.io/apimachinery => k8s.io/apimachinery v0.27.9
k8s.io/apiserver => k8s.io/apiserver v0.27.9
k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.9
k8s.io/client-go => github.com/rancher/client-go v1.27.4-rancher1
k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.9
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.9
k8s.io/code-generator => k8s.io/code-generator v0.27.9
k8s.io/component-base => k8s.io/component-base v0.27.9
k8s.io/component-helpers => k8s.io/component-helpers v0.27.9
k8s.io/controller-manager => k8s.io/controller-manager v0.27.9
k8s.io/cri-api => k8s.io/cri-api v0.27.9
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.9
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.9
k8s.io/kms => k8s.io/kms v0.27.9
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.9
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.9
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.9
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.9
k8s.io/kubectl => k8s.io/kubectl v0.27.9
k8s.io/kubelet => k8s.io/kubelet v0.27.9
k8s.io/kubernetes => k8s.io/kubernetes v1.27.9
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.9
k8s.io/metrics => k8s.io/metrics v0.27.9
k8s.io/mount-utils => k8s.io/mount-utils v0.27.9
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.9
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.9
oras.land/oras-go => oras.land/oras-go v1.2.2 // for docker 20.10.x compatibility
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.5.0
>>>>>>> 638bfef7d2400fbedd95b81a42f78438d1198b40
)

require (
github.com/antihax/optional v1.0.0
github.com/containers/image/v5 v5.26.0
github.com/rancher/rancher/pkg/apis v0.0.0-20240126142034-676c3eb3dfa5
github.com/rancher/shepherd v0.0.0-20240405191643-ef88013799bb
go.qase.io/client v0.0.0-20231114201952-65195ec001fa
)

require (
Expand Down Expand Up @@ -95,7 +141,12 @@ require (
github.com/golang-jwt/jwt/v4 v4.5.0
github.com/golang/mock v1.6.0
github.com/golang/protobuf v1.5.3
<<<<<<< HEAD
github.com/google/go-querystring v1.1.0 // indirect
=======
github.com/google/gnostic v0.6.9
github.com/google/go-containerregistry v0.15.2
>>>>>>> 638bfef7d2400fbedd95b81a42f78438d1198b40
github.com/gorilla/mux v1.8.0
github.com/gorilla/websocket v1.5.0
github.com/hashicorp/go-multierror v1.1.1
Expand All @@ -116,6 +167,7 @@ require (
github.com/prometheus/client_golang v1.16.0
github.com/prometheus/client_model v0.4.0
github.com/prometheus/common v0.44.0
<<<<<<< HEAD
github.com/rancher/aks-operator v1.2.1
github.com/rancher/apiserver v0.0.0-20240207153744-69b3c2b56f3f
github.com/rancher/channelserver v0.6.1-0.20240212155841-07630c8295da
Expand All @@ -131,6 +183,23 @@ require (
github.com/rancher/remotedialer v0.3.0
github.com/rancher/rke v1.5.7
github.com/rancher/steve v0.0.0-20240305150728-3943409601f1
=======
github.com/rancher/aks-operator v1.3.0-rc5
github.com/rancher/apiserver v0.0.0-20240207153957-4fd7d821d952
github.com/rancher/channelserver v0.6.1-0.20240212155841-07630c8295da
github.com/rancher/dynamiclistener v0.5.0-rc2
github.com/rancher/eks-operator v1.4.0-rc5
github.com/rancher/fleet/pkg/apis v0.0.0-20231017140638-93432f288e79
github.com/rancher/gke-operator v1.3.0-rc6
github.com/rancher/kubernetes-provider-detector v0.1.5
github.com/rancher/lasso v0.0.0-20240123150939-7055397d6dfa
github.com/rancher/machine v0.15.0-rancher109
github.com/rancher/norman v0.0.0-20240207153100-3bb70b772b52
github.com/rancher/rancher/pkg/client v0.0.0
github.com/rancher/remotedialer v0.3.0
github.com/rancher/rke v1.5.3
github.com/rancher/steve v0.0.0-20240314145706-870824dc8f49
>>>>>>> 638bfef7d2400fbedd95b81a42f78438d1198b40
github.com/rancher/system-upgrade-controller/pkg/apis v0.0.0-20210727200656-10b094e30007
github.com/rancher/wrangler/v2 v2.1.4
github.com/robfig/cron v1.1.0
Expand All @@ -151,11 +220,17 @@ require (
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
gopkg.in/natefinch/lumberjack.v2 v2.2.1
gopkg.in/yaml.v2 v2.4.0
<<<<<<< HEAD
helm.sh/helm/v3 v3.9.0
=======
gopkg.in/yaml.v3 v3.0.1
helm.sh/helm/v3 v3.14.2
>>>>>>> 638bfef7d2400fbedd95b81a42f78438d1198b40
k8s.io/api v0.28.6
k8s.io/apiextensions-apiserver v0.28.6
k8s.io/apimachinery v0.28.6
k8s.io/apiserver v0.28.6
<<<<<<< HEAD
k8s.io/cli-runtime v0.28.6
k8s.io/client-go v12.0.0+incompatible
k8s.io/gengo v0.0.0-20230306165830-ab3349d207d4
Expand All @@ -177,15 +252,36 @@ require (
github.com/rancher/rancher/pkg/apis v0.0.0-20240213233515-935d309ebad4
github.com/rancher/shepherd v0.0.0-20240401195504-0972bb8df2ec
go.qase.io/client v0.0.0-20231114201952-65195ec001fa
=======
k8s.io/cli-runtime v0.27.9
k8s.io/client-go v12.0.0+incompatible
k8s.io/gengo v0.0.0-20240129211411-f967bbeff4b4
k8s.io/helm v2.16.9+incompatible
k8s.io/kube-aggregator v0.28.6
k8s.io/kubectl v0.27.9
k8s.io/kubernetes v1.27.9
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
oras.land/oras-go/v2 v2.4.0
sigs.k8s.io/aws-iam-authenticator v0.6.17
sigs.k8s.io/cluster-api v1.5.0
sigs.k8s.io/controller-runtime v0.15.3
sigs.k8s.io/yaml v1.4.0
>>>>>>> 638bfef7d2400fbedd95b81a42f78438d1198b40
)

require (
cloud.google.com/go/compute/metadata v0.2.3 // indirect
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/VividCortex/ewma v1.2.0 // indirect
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
<<<<<<< HEAD
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
=======
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/containerd/log v0.1.0 // indirect
>>>>>>> 638bfef7d2400fbedd95b81a42f78438d1198b40
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
github.com/containers/ocicrypt v1.1.7 // indirect
Expand All @@ -201,8 +297,12 @@ require (
github.com/go-openapi/spec v0.20.9 // indirect
github.com/go-openapi/strfmt v0.21.7 // indirect
github.com/go-openapi/validate v0.22.1 // indirect
<<<<<<< HEAD
github.com/google/cel-go v0.16.1 // indirect
github.com/google/go-containerregistry v0.14.0 // indirect
=======
github.com/google/cel-go v0.12.7 // indirect
>>>>>>> 638bfef7d2400fbedd95b81a42f78438d1198b40
github.com/google/go-intervals v0.0.2 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
Expand Down Expand Up @@ -244,12 +344,21 @@ require (
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
<<<<<<< HEAD
gopkg.in/go-jose/go-jose.v2 v2.6.1 // indirect
k8s.io/cloud-provider v0.27.4 // indirect
k8s.io/controller-manager v0.28.6 // indirect
k8s.io/kms v0.28.6 // indirect
k8s.io/kubelet v0.27.4 // indirect
k8s.io/pod-security-admission v0.28.6 // indirect
=======
gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect
k8s.io/cloud-provider v0.27.9 // indirect
k8s.io/controller-manager v0.27.9 // indirect
k8s.io/kms v0.27.9 // indirect
k8s.io/kubelet v0.27.9 // indirect
k8s.io/pod-security-admission v0.27.6 // indirect
>>>>>>> 638bfef7d2400fbedd95b81a42f78438d1198b40
)

require (
Expand All @@ -269,7 +378,11 @@ require (
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/squirrel v1.5.4 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
<<<<<<< HEAD
github.com/Microsoft/hcsshim v0.11.0 // indirect
=======
github.com/Microsoft/hcsshim v0.11.4 // indirect
>>>>>>> 638bfef7d2400fbedd95b81a42f78438d1198b40
github.com/adrg/xdg v0.4.0 // indirect
github.com/apparentlymart/go-cidr v1.1.0 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
Expand All @@ -285,7 +398,11 @@ require (
github.com/cyphar/filepath-securejoin v0.2.4
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dimchansky/utfbom v1.1.1 // indirect
<<<<<<< HEAD
github.com/docker/cli v24.0.6+incompatible // indirect
=======
github.com/docker/cli v23.0.5+incompatible // indirect
>>>>>>> 638bfef7d2400fbedd95b81a42f78438d1198b40
github.com/docker/docker-credential-helpers v0.7.0 // indirect
github.com/docker/go-metrics v0.0.1 // indirect
github.com/docker/go-units v0.5.0 // indirect
Expand Down Expand Up @@ -365,9 +482,13 @@ require (
github.com/morikuni/aec v1.0.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
<<<<<<< HEAD
github.com/onsi/gomega v1.31.1 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
=======
github.com/onsi/gomega v1.30.0 // indirect
>>>>>>> 638bfef7d2400fbedd95b81a42f78438d1198b40
github.com/opencontainers/runc v1.1.12 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pkg/sftp v1.13.5 // indirect
Expand All @@ -376,8 +497,13 @@ require (
github.com/rivo/uniseg v0.4.4 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/rs/xid v1.2.1 // indirect
<<<<<<< HEAD
github.com/rubenv/sql-migrate v1.5.2 // indirect
github.com/russellhaering/goxmldsig v1.2.0 // indirect
=======
github.com/rubenv/sql-migrate v1.3.1 // indirect
github.com/russellhaering/goxmldsig v1.3.0 // indirect
>>>>>>> 638bfef7d2400fbedd95b81a42f78438d1198b40
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/spf13/cast v1.5.1 // indirect
Expand Down Expand Up @@ -421,11 +547,19 @@ require (
k8s.io/cluster-bootstrap v0.27.2 // indirect
k8s.io/code-generator v0.28.6 // indirect
k8s.io/component-base v0.28.6 // indirect
<<<<<<< HEAD
k8s.io/component-helpers v0.28.6 // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
oras.land/oras-go v1.2.4 // indirect
=======
k8s.io/component-helpers v0.27.9 // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
oras.land/oras-go v1.2.3 // indirect
>>>>>>> 638bfef7d2400fbedd95b81a42f78438d1198b40
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
sigs.k8s.io/cli-utils v0.28.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
Expand Down
Loading

0 comments on commit df99199

Please sign in to comment.