Skip to content

Merge from openshift-hive/openshift #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ironcladlou merged 6 commits into from
Jan 22, 2021
Merged

Merge from openshift-hive/openshift #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
faa5439
Move kube controller manager arguments to command line
csrwng Jan 21, 2021
eaa39c1
config: update example cluster release image
sjenning Jan 21, 2021
7e948b3
Makefile: make runtime switchable
sjenning Jan 21, 2021
c136bd0
Merge pull request #40 from sjenning/runtime-select
csrwng Jan 21, 2021
c5530da
Merge pull request #38 from csrwng/fix_kcm
ironcladlou Jan 21, 2021
174817b
Merge pull request #39 from sjenning/update-release-image
ironcladlou Jan 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ DIR := ${CURDIR}
IMG ?= hypershift:latest
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
CRD_OPTIONS ?= "crd:trivialVersions=true"
# Runtime CLI to use for building and pushing images
RUNTIME ?= docker

CONTROLLER_GEN=GO111MODULE=on GOFLAGS=-mod=vendor go run ./vendor/sigs.k8s.io/controller-tools/cmd/controller-gen
BINDATA=GO111MODULE=on GOFLAGS=-mod=vendor go run ./vendor/github.com/kevinburke/go-bindata/go-bindata
Expand Down Expand Up @@ -79,11 +81,11 @@ vet:

# Build the docker image
docker-build:
docker build . -t ${IMG}
${RUNTIME} build . -t ${IMG}

# Push the docker image
docker-push:
docker push ${IMG}
${RUNTIME} push ${IMG}

run-local:
bin/hypershift-operator run
Expand Down
4 changes: 2 additions & 2 deletions config/example-cluster/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: example
spec:
release:
image: quay.io/openshift-release-dev/ocp-release:4.6.7-x86_64
image: quay.io/openshift-release-dev/ocp-release:4.7.0-fc.3-x86_64
initialComputeReplicas: 2
serviceCIDR: 172.31.0.0/16
podCIDR: 10.132.0.0/14
Expand All @@ -13,4 +13,4 @@ spec:
sshKey:
name: ssh-key
providerCreds:
name: provider-creds
name: provider-creds
24 changes: 12 additions & 12 deletions hypershift-operator/assets/controlplane/hypershift/bindata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading