diff --git a/cmd/rook/api.go b/cmd/rook/api.go index 8a26dcb44..9b52536ce 100644 --- a/cmd/rook/api.go +++ b/cmd/rook/api.go @@ -44,7 +44,7 @@ func init() { apiCmd.Flags().StringVar(&namespace, "namespace", "", "the namespace in which the api service is running") addCephFlags(apiCmd) - flags.SetFlagsFromEnv(apiCmd.Flags(), "ROOKD") + flags.SetFlagsFromEnv(apiCmd.Flags(), "ROOK") apiCmd.RunE = startAPI } diff --git a/cmd/rook/main.go b/cmd/rook/main.go index 7935a6b25..0f9f9c819 100644 --- a/cmd/rook/main.go +++ b/cmd/rook/main.go @@ -82,15 +82,15 @@ func main() { // Initialize the configuration parameters. The precedence from lowest to highest is: // 1) default value (at compilation) -// 2) environment variables (upper case, replace - with _, and rook prefix. For example, discovery-url is ROOKD_DISCOVERY_URL) +// 2) environment variables (upper case, replace - with _, and rook prefix. For example, discovery-url is ROOK_DISCOVERY_URL) // 3) command line parameter func init() { addStandaloneRookFlags(rootCmd) rootCmd.PersistentFlags().StringVar(&logLevelRaw, "log-level", "INFO", "logging level for logging/tracing output (valid values: CRITICAL,ERROR,WARNING,NOTICE,INFO,DEBUG,TRACE)") // load the environment variables - flags.SetFlagsFromEnv(rootCmd.Flags(), "ROOKD") - flags.SetFlagsFromEnv(rootCmd.PersistentFlags(), "ROOKD") + flags.SetFlagsFromEnv(rootCmd.Flags(), "ROOK") + flags.SetFlagsFromEnv(rootCmd.PersistentFlags(), "ROOK") rootCmd.RunE = startJoinCluster } diff --git a/cmd/rook/mds.go b/cmd/rook/mds.go index a66f0982b..e7b691f67 100644 --- a/cmd/rook/mds.go +++ b/cmd/rook/mds.go @@ -41,7 +41,7 @@ func init() { mdsCmd.Flags().StringVar(&mdsKeyring, "mds-keyring", "", "the mds keyring") addCephFlags(mdsCmd) - flags.SetFlagsFromEnv(mdsCmd.Flags(), "ROOKD") + flags.SetFlagsFromEnv(mdsCmd.Flags(), "ROOK") mdsCmd.RunE = startMDS } diff --git a/cmd/rook/mgr.go b/cmd/rook/mgr.go index 0b5fad914..96616a453 100644 --- a/cmd/rook/mgr.go +++ b/cmd/rook/mgr.go @@ -41,7 +41,7 @@ func init() { mgrCmd.Flags().StringVar(&mgrKeyring, "mgr-keyring", "", "the mgr keyring") addCephFlags(mgrCmd) - flags.SetFlagsFromEnv(mgrCmd.Flags(), "ROOKD") + flags.SetFlagsFromEnv(mgrCmd.Flags(), "ROOK") mgrCmd.RunE = startMgr } diff --git a/cmd/rook/mon.go b/cmd/rook/mon.go index 15cb36301..a17311b37 100644 --- a/cmd/rook/mon.go +++ b/cmd/rook/mon.go @@ -52,7 +52,7 @@ func init() { monCmd.Flags().IntVar(&monPort, "port", 0, "port of the monitor") addCephFlags(monCmd) - flags.SetFlagsFromEnv(monCmd.Flags(), "ROOKD") + flags.SetFlagsFromEnv(monCmd.Flags(), "ROOK") monCmd.RunE = startMon } diff --git a/cmd/rook/operator.go b/cmd/rook/operator.go index 7313934fa..4c178b249 100644 --- a/cmd/rook/operator.go +++ b/cmd/rook/operator.go @@ -37,7 +37,7 @@ https://github.com/rook/rook`, } func init() { - flags.SetFlagsFromEnv(operatorCmd.Flags(), "ROOKD") + flags.SetFlagsFromEnv(operatorCmd.Flags(), "ROOK") operatorCmd.RunE = startOperator } diff --git a/cmd/rook/osd.go b/cmd/rook/osd.go index f2e2ef73e..956c0538f 100644 --- a/cmd/rook/osd.go +++ b/cmd/rook/osd.go @@ -55,7 +55,7 @@ func addOSDFlags(command *cobra.Command) { func init() { addOSDFlags(osdCmd) addCephFlags(osdCmd) - flags.SetFlagsFromEnv(osdCmd.Flags(), "ROOKD") + flags.SetFlagsFromEnv(osdCmd.Flags(), "ROOK") osdCmd.RunE = startOSD } diff --git a/cmd/rook/rgw.go b/cmd/rook/rgw.go index b93130a57..a91d92134 100644 --- a/cmd/rook/rgw.go +++ b/cmd/rook/rgw.go @@ -43,7 +43,7 @@ func init() { rgwCmd.Flags().IntVar(&rgwPort, "rgw-port", 0, "rgw port number") addCephFlags(rgwCmd) - flags.SetFlagsFromEnv(rgwCmd.Flags(), "ROOKD") + flags.SetFlagsFromEnv(rgwCmd.Flags(), "ROOK") rgwCmd.RunE = startRGW } diff --git a/demo/helm/rook-operator/templates/deployment.yaml b/demo/helm/rook-operator/templates/deployment.yaml index 5e08dda5a..fffcfc875 100644 --- a/demo/helm/rook-operator/templates/deployment.yaml +++ b/demo/helm/rook-operator/templates/deployment.yaml @@ -20,7 +20,7 @@ spec: imagePullPolicy: {{ .Values.image.pullPolicy }} args: ["operator"] env: - - name: ROOKD_REPO_PREFIX + - name: ROOK_REPO_PREFIX value: {{ .Values.image.prefix }} resources: {{ toYaml .Values.resources | indent 10 }} diff --git a/demo/kubernetes/1.5/rook-operator.yaml b/demo/kubernetes/1.5/rook-operator.yaml index 68da53bb0..969d6015f 100644 --- a/demo/kubernetes/1.5/rook-operator.yaml +++ b/demo/kubernetes/1.5/rook-operator.yaml @@ -14,5 +14,5 @@ spec: image: rook/rook:master args: ["operator"] env: - - name: ROOKD_REPO_PREFIX + - name: ROOK_REPO_PREFIX value: rook diff --git a/demo/kubernetes/rook-operator.yaml b/demo/kubernetes/rook-operator.yaml index ec410c05b..66267fb23 100644 --- a/demo/kubernetes/rook-operator.yaml +++ b/demo/kubernetes/rook-operator.yaml @@ -113,5 +113,5 @@ spec: image: rook/rook:master args: ["operator"] env: - - name: ROOKD_REPO_PREFIX + - name: ROOK_REPO_PREFIX value: rook diff --git a/demo/kubernetes/rook-tools.yaml b/demo/kubernetes/rook-tools.yaml index 61cc22878..02eab81bc 100644 --- a/demo/kubernetes/rook-tools.yaml +++ b/demo/kubernetes/rook-tools.yaml @@ -10,7 +10,7 @@ spec: imagePullPolicy: IfNotPresent args: ["sleep", "36500d"] env: - - name: ROOKD_ADMIN_SECRET + - name: ROOK_ADMIN_SECRET valueFrom: secretKeyRef: name: rook-ceph-mon diff --git a/demo/standalone/cloud-config.yml.in b/demo/standalone/cloud-config.yml.in index 8219ee693..db30f6cb9 100644 --- a/demo/standalone/cloud-config.yml.in +++ b/demo/standalone/cloud-config.yml.in @@ -11,8 +11,8 @@ coreos: - name: 10-db-size.conf content: | [Service] - Environment=ROOKD_OSD_DATABASE_SIZE=1024 - Environment=ROOKD_OSD_JOURNAL_SIZE=1024 + Environment=ROOK_OSD_DATABASE_SIZE=1024 + Environment=ROOK_OSD_JOURNAL_SIZE=1024 content: | [Unit] Description=Rook Daemon - software defined storage @@ -25,15 +25,15 @@ coreos: KillMode=process Environment=RKT_OPTIONS=%%aci_options%% - Environment=ROOKD_ACI=%%aci_location%% - Environment=ROOKD_PUBLIC_IPV4=$public_ipv4 - Environment=ROOKD_PRIVATE_IPV4=$private_ipv4 - Environment=ROOKD_DATA_DIR=/var/lib/rook - Environment=ROOKD_DISCOVERY_URL=%%discovery_token%% - Environment=ROOKD_DATA_DEVICES=sda,sdb,sdc,sdd - Environment=ROOKD_CEPH_CONFIG_OVERRIDE=/var/lib/rook/ceph-override.conf + Environment=ROOK_ACI=%%aci_location%% + Environment=ROOK_PUBLIC_IPV4=$public_ipv4 + Environment=ROOK_PRIVATE_IPV4=$private_ipv4 + Environment=ROOK_DATA_DIR=/var/lib/rook + Environment=ROOK_DISCOVERY_URL=%%discovery_token%% + Environment=ROOK_DATA_DEVICES=sda,sdb,sdc,sdd + Environment=ROOK_CEPH_CONFIG_OVERRIDE=/var/lib/rook/ceph-override.conf - ExecStartPre=/usr/bin/mkdir -p ${ROOKD_DATA_DIR} + ExecStartPre=/usr/bin/mkdir -p ${ROOK_DATA_DIR} ExecStart=/usr/bin/rkt run \ --trust-keys-from-https \ @@ -44,7 +44,7 @@ coreos: --volume var-lib-rook,kind=host,source=/var/lib/rook \ --mount volume=var-lib-rook,target=/var/lib/rook \ $RKT_OPTIONS \ - $ROOKD_ACI + $ROOK_ACI [Install] WantedBy=multi-user.target diff --git a/images/rook/Makefile b/images/rook/Makefile index 661008746..e42448812 100755 --- a/images/rook/Makefile +++ b/images/rook/Makefile @@ -17,10 +17,10 @@ include ../image.mk # ==================================================================================== # Image Build Options -ROOKD_IMAGE = $(BUILD_REGISTRY)/rook-$(GOARCH) -ROOKD_BASE_IMAGE = $(BUILD_REGISTRY)/rook-base-$(GOARCH) -IMAGES = $(ROOKD_IMAGE) $(ROOKD_BASE_IMAGE) -CACHE_IMAGES = $(ROOKD_BASE_IMAGE) +ROOK_IMAGE = $(BUILD_REGISTRY)/rook-$(GOARCH) +ROOK_BASE_IMAGE = $(BUILD_REGISTRY)/rook-base-$(GOARCH) +IMAGES = $(ROOK_IMAGE) $(ROOK_BASE_IMAGE) +CACHE_IMAGES = $(ROOK_BASE_IMAGE) BASEIMAGE = $(BUILD_REGISTRY)/base-$(GOARCH) @@ -51,34 +51,34 @@ CEPH_TARBALL_FILENAME = ceph-install.tar CEPH_TARBALL = $(TEMP)/$(CEPH_TARBALL_FILENAME) $(CEPH_TARBALL): - @echo === building ceph for $(ROOKD_IMAGE) + @echo === building ceph for $(ROOK_IMAGE) @$(MAKE) -C ../ceph GOARCH=$(GOARCH) CEPH_ALLOCATOR=$(CEPH_ALLOCATOR) CEPH_BUILD_TYPE=$(CEPH_BUILD_TYPE) $(CEPH_TARBALL) # ==================================================================================== # Build Rook rook-base-image: $(CEPH_TARBALL) - @echo === docker build $(ROOKD_BASE_IMAGE) + @echo === docker build $(ROOK_BASE_IMAGE) @cp Dockerfile.base $(TEMP)/Dockerfile @cd $(TEMP) && $(SED_CMD) 's|BASEIMAGE|$(BASEIMAGE)|g' Dockerfile - @docker build $(BUILD_ARGS) --build-arg EXTRALIBS=$(EXTRA_LIBS) -t $(ROOKD_BASE_IMAGE) $(TEMP) + @docker build $(BUILD_ARGS) --build-arg EXTRALIBS=$(EXTRA_LIBS) -t $(ROOK_BASE_IMAGE) $(TEMP) # since this is a leaf image we avoid leaving around a lot of dangling images # by removing the last build of the final rook image -OLD_IMAGE_ID := $(shell docker images -q $(ROOKD_IMAGE)) -CURRENT_IMAGE_ID := $$(docker images -q $(ROOKD_IMAGE)) +OLD_IMAGE_ID := $(shell docker images -q $(ROOK_IMAGE)) +CURRENT_IMAGE_ID := $$(docker images -q $(ROOK_IMAGE)) IMAGE_FILENAME := $(IMAGE_OUTPUT_DIR)/rook.tar.gz do.build: rook-base-image - @echo === docker build $(ROOKD_IMAGE) + @echo === docker build $(ROOK_IMAGE) @cp Dockerfile $(TEMP) @cp $(OUTPUT_DIR)/bin/linux_$(GOARCH)/rook $(TEMP) - @cd $(TEMP) && $(SED_CMD) 's|BASEIMAGE|$(ROOKD_BASE_IMAGE)|g' Dockerfile - @docker build $(BUILD_ARGS) -t $(ROOKD_IMAGE) $(TEMP) + @cd $(TEMP) && $(SED_CMD) 's|BASEIMAGE|$(ROOK_BASE_IMAGE)|g' Dockerfile + @docker build $(BUILD_ARGS) -t $(ROOK_IMAGE) $(TEMP) @[ "$(OLD_IMAGE_ID)" != "$(CURRENT_IMAGE_ID)" ] && [ -n "$(OLD_IMAGE_ID)" ] && docker rmi $(OLD_IMAGE_ID) || true @if [ ! -e "$(IMAGE_FILENAME)" ] || [ "$(OLD_IMAGE_ID)" != "$(CURRENT_IMAGE_ID)" ] || [ -n "$(OLD_IMAGE_ID)" ]; then \ - echo === saving image $(ROOKD_IMAGE); \ + echo === saving image $(ROOK_IMAGE); \ mkdir -p $(IMAGE_OUTPUT_DIR); \ - docker save $(ROOKD_IMAGE) | gzip -c > $(IMAGE_FILENAME); \ + docker save $(ROOK_IMAGE) | gzip -c > $(IMAGE_FILENAME); \ fi @rm -fr $(TEMP) diff --git a/images/toolbox/toolbox.sh b/images/toolbox/toolbox.sh index c7ad6a659..9bdd996db 100755 --- a/images/toolbox/toolbox.sh +++ b/images/toolbox/toolbox.sh @@ -56,7 +56,7 @@ EOF cat < ${KEYRING_FILE} [client.admin] -key = ${ROOKD_ADMIN_SECRET} +key = ${ROOK_ADMIN_SECRET} EOF fi diff --git a/pkg/operator/api/api.go b/pkg/operator/api/api.go index b14a9936c..66c08db8d 100644 --- a/pkg/operator/api/api.go +++ b/pkg/operator/api/api.go @@ -199,7 +199,7 @@ func (c *Cluster) apiContainer() v1.Container { {Name: k8sutil.DataDirVolume, MountPath: k8sutil.DataDir}, }, Env: []v1.EnvVar{ - {Name: "ROOKD_VERSION_TAG", Value: c.Version}, + {Name: "ROOK_VERSION_TAG", Value: c.Version}, k8sutil.NamespaceEnvVar(), k8sutil.RepoPrefixEnvVar(), opmon.SecretEnvVar(), diff --git a/pkg/operator/api/api_test.go b/pkg/operator/api/api_test.go index 2358f26c1..c01adc678 100644 --- a/pkg/operator/api/api_test.go +++ b/pkg/operator/api/api_test.go @@ -78,7 +78,7 @@ func TestPodSpecs(t *testing.T) { assert.Equal(t, 1, len(cont.VolumeMounts)) assert.Equal(t, 7, len(cont.Env)) for _, v := range cont.Env { - assert.True(t, strings.HasPrefix(v.Name, "ROOKD_")) + assert.True(t, strings.HasPrefix(v.Name, "ROOK_")) } assert.Equal(t, "api", cont.Args[0]) diff --git a/pkg/operator/k8sutil/pod.go b/pkg/operator/k8sutil/pod.go index 27d8b4fc8..8e6301547 100644 --- a/pkg/operator/k8sutil/pod.go +++ b/pkg/operator/k8sutil/pod.go @@ -36,9 +36,9 @@ const ( // VersionAttr version label VersionAttr = "rook_version" // PublicIPEnvVar public IP env var - PublicIPEnvVar = "ROOKD_PUBLIC_IPV4" + PublicIPEnvVar = "ROOK_PUBLIC_IPV4" // PrivateIPEnvVar pod IP env var - PrivateIPEnvVar = "ROOKD_PRIVATE_IPV4" + PrivateIPEnvVar = "ROOK_PRIVATE_IPV4" // DefaultRepoPrefix repo prefix DefaultRepoPrefix = "rook" @@ -46,7 +46,7 @@ const ( ConfigOverrideName = "rook-config-override" // ConfigOverrideVal config override value ConfigOverrideVal = "config" - repoPrefixEnvVar = "ROOKD_REPO_PREFIX" + repoPrefixEnvVar = "ROOK_REPO_PREFIX" defaultVersion = "latest" configMountDir = "/etc/rook" overrideFilename = "override.conf" @@ -66,7 +66,7 @@ func ConfigOverrideVolume() v1.Volume { // ConfigOverrideEnvVar config override env var func ConfigOverrideEnvVar() v1.EnvVar { - return v1.EnvVar{Name: "ROOKD_CEPH_CONFIG_OVERRIDE", Value: path.Join(configMountDir, overrideFilename)} + return v1.EnvVar{Name: "ROOK_CEPH_CONFIG_OVERRIDE", Value: path.Join(configMountDir, overrideFilename)} } // PodIPEnvVar private ip env var @@ -76,7 +76,7 @@ func PodIPEnvVar(property string) v1.EnvVar { // NamespaceEnvVar namespace env var func NamespaceEnvVar() v1.EnvVar { - return v1.EnvVar{Name: "ROOKD_NAMESPACE", ValueFrom: &v1.EnvVarSource{FieldRef: &v1.ObjectFieldSelector{FieldPath: "metadata.namespace"}}} + return v1.EnvVar{Name: "ROOK_NAMESPACE", ValueFrom: &v1.EnvVarSource{FieldRef: &v1.ObjectFieldSelector{FieldPath: "metadata.namespace"}}} } // RepoPrefixEnvVar repo prefix env var @@ -86,7 +86,7 @@ func RepoPrefixEnvVar() v1.EnvVar { // ConfigDirEnvVar config dir env var func ConfigDirEnvVar() v1.EnvVar { - return v1.EnvVar{Name: "ROOKD_CONFIG_DIR", Value: DataDir} + return v1.EnvVar{Name: "ROOK_CONFIG_DIR", Value: DataDir} } func repoPrefix() string { diff --git a/pkg/operator/mds/mds.go b/pkg/operator/mds/mds.go index 76cf4d265..938a632e1 100644 --- a/pkg/operator/mds/mds.go +++ b/pkg/operator/mds/mds.go @@ -165,7 +165,7 @@ func (c *Cluster) mdsContainer(id string) v1.Container { k8sutil.ConfigOverrideMount(), }, Env: []v1.EnvVar{ - {Name: "ROOKD_MDS_KEYRING", ValueFrom: &v1.EnvVarSource{SecretKeyRef: &v1.SecretKeySelector{LocalObjectReference: v1.LocalObjectReference{Name: appName}, Key: keyringName}}}, + {Name: "ROOK_MDS_KEYRING", ValueFrom: &v1.EnvVarSource{SecretKeyRef: &v1.SecretKeySelector{LocalObjectReference: v1.LocalObjectReference{Name: appName}, Key: keyringName}}}, opmon.ClusterNameEnvVar(c.Namespace), opmon.EndpointEnvVar(), opmon.SecretEnvVar(), diff --git a/pkg/operator/mgr/mgr.go b/pkg/operator/mgr/mgr.go index eb42968ca..bec390848 100644 --- a/pkg/operator/mgr/mgr.go +++ b/pkg/operator/mgr/mgr.go @@ -125,8 +125,8 @@ func (c *Cluster) mgrContainer(name string) v1.Container { k8sutil.ConfigOverrideMount(), }, Env: []v1.EnvVar{ - {Name: "ROOKD_MGR_NAME", Value: name}, - {Name: "ROOKD_MGR_KEYRING", ValueFrom: &v1.EnvVarSource{SecretKeyRef: &v1.SecretKeySelector{LocalObjectReference: v1.LocalObjectReference{Name: name}, Key: keyringName}}}, + {Name: "ROOK_MGR_NAME", Value: name}, + {Name: "ROOK_MGR_KEYRING", ValueFrom: &v1.EnvVarSource{SecretKeyRef: &v1.SecretKeySelector{LocalObjectReference: v1.LocalObjectReference{Name: name}, Key: keyringName}}}, k8sutil.PodIPEnvVar(k8sutil.PrivateIPEnvVar), k8sutil.PodIPEnvVar(k8sutil.PublicIPEnvVar), opmon.ClusterNameEnvVar(c.Namespace), diff --git a/pkg/operator/mon/spec.go b/pkg/operator/mon/spec.go index 213d8f238..c7a078d0c 100644 --- a/pkg/operator/mon/spec.go +++ b/pkg/operator/mon/spec.go @@ -34,25 +34,25 @@ func PublicIPEnvVar(publicIP string) v1.EnvVar { // ClusterNameEnvVar is the cluster name environment var func ClusterNameEnvVar(name string) v1.EnvVar { - return v1.EnvVar{Name: "ROOKD_CLUSTER_NAME", Value: name} + return v1.EnvVar{Name: "ROOK_CLUSTER_NAME", Value: name} } // EndpointEnvVar is the mon endpoint environment var func EndpointEnvVar() v1.EnvVar { ref := &v1.ConfigMapKeySelector{LocalObjectReference: v1.LocalObjectReference{Name: EndpointConfigMapName}, Key: EndpointDataKey} - return v1.EnvVar{Name: "ROOKD_MON_ENDPOINTS", ValueFrom: &v1.EnvVarSource{ConfigMapKeyRef: ref}} + return v1.EnvVar{Name: "ROOK_MON_ENDPOINTS", ValueFrom: &v1.EnvVarSource{ConfigMapKeyRef: ref}} } // SecretEnvVar is the mon secret environment var func SecretEnvVar() v1.EnvVar { ref := &v1.SecretKeySelector{LocalObjectReference: v1.LocalObjectReference{Name: appName}, Key: monSecretName} - return v1.EnvVar{Name: "ROOKD_MON_SECRET", ValueFrom: &v1.EnvVarSource{SecretKeyRef: ref}} + return v1.EnvVar{Name: "ROOK_MON_SECRET", ValueFrom: &v1.EnvVarSource{SecretKeyRef: ref}} } // AdminSecretEnvVar is the admin secret environment var func AdminSecretEnvVar() v1.EnvVar { ref := &v1.SecretKeySelector{LocalObjectReference: v1.LocalObjectReference{Name: appName}, Key: adminSecretName} - return v1.EnvVar{Name: "ROOKD_ADMIN_SECRET", ValueFrom: &v1.EnvVarSource{SecretKeyRef: ref}} + return v1.EnvVar{Name: "ROOK_ADMIN_SECRET", ValueFrom: &v1.EnvVarSource{SecretKeyRef: ref}} } func (c *Cluster) getLabels(name string) map[string]string { diff --git a/pkg/operator/osd/osd.go b/pkg/operator/osd/osd.go index cb76ac286..c41e5b653 100644 --- a/pkg/operator/osd/osd.go +++ b/pkg/operator/osd/osd.go @@ -260,41 +260,41 @@ func (c *Cluster) osdContainer(devices []Device, directories []Directory, select } func nodeNameEnvVar() v1.EnvVar { - return v1.EnvVar{Name: "ROOKD_NODE_NAME", ValueFrom: &v1.EnvVarSource{FieldRef: &v1.ObjectFieldSelector{FieldPath: "spec.nodeName"}}} + return v1.EnvVar{Name: "ROOK_NODE_NAME", ValueFrom: &v1.EnvVarSource{FieldRef: &v1.ObjectFieldSelector{FieldPath: "spec.nodeName"}}} } func dataDevicesEnvVar(dataDevices string) v1.EnvVar { - return v1.EnvVar{Name: "ROOKD_DATA_DEVICES", Value: dataDevices} + return v1.EnvVar{Name: "ROOK_DATA_DEVICES", Value: dataDevices} } func deviceFilterEnvVar(filter string) v1.EnvVar { - return v1.EnvVar{Name: "ROOKD_DATA_DEVICE_FILTER", Value: filter} + return v1.EnvVar{Name: "ROOK_DATA_DEVICE_FILTER", Value: filter} } func metadataDeviceEnvVar(metadataDevice string) v1.EnvVar { - return v1.EnvVar{Name: "ROOKD_METADATA_DEVICE", Value: metadataDevice} + return v1.EnvVar{Name: "ROOK_METADATA_DEVICE", Value: metadataDevice} } func dataDirectoriesEnvVar(dataDirectories string) v1.EnvVar { - return v1.EnvVar{Name: "ROOKD_DATA_DIRECTORIES", Value: dataDirectories} + return v1.EnvVar{Name: "ROOK_DATA_DIRECTORIES", Value: dataDirectories} } func osdStoreEnvVar(osdStore string) v1.EnvVar { - return v1.EnvVar{Name: "ROOKD_OSD_STORE", Value: osdStore} + return v1.EnvVar{Name: "ROOK_OSD_STORE", Value: osdStore} } func osdDatabaseSizeEnvVar(databaseSize int) v1.EnvVar { - return v1.EnvVar{Name: "ROOKD_OSD_DATABASE_SIZE", Value: strconv.Itoa(databaseSize)} + return v1.EnvVar{Name: "ROOK_OSD_DATABASE_SIZE", Value: strconv.Itoa(databaseSize)} } func osdWalSizeEnvVar(walSize int) v1.EnvVar { - return v1.EnvVar{Name: "ROOKD_OSD_WAL_SIZE", Value: strconv.Itoa(walSize)} + return v1.EnvVar{Name: "ROOK_OSD_WAL_SIZE", Value: strconv.Itoa(walSize)} } func osdJournalSizeEnvVar(journalSize int) v1.EnvVar { - return v1.EnvVar{Name: "ROOKD_OSD_JOURNAL_SIZE", Value: strconv.Itoa(journalSize)} + return v1.EnvVar{Name: "ROOK_OSD_JOURNAL_SIZE", Value: strconv.Itoa(journalSize)} } func locationEnvVar(location string) v1.EnvVar { - return v1.EnvVar{Name: "ROOKD_LOCATION", Value: location} + return v1.EnvVar{Name: "ROOK_LOCATION", Value: location} } diff --git a/pkg/operator/osd/osd_test.go b/pkg/operator/osd/osd_test.go index 6d667f5bb..a9c8209e8 100644 --- a/pkg/operator/osd/osd_test.go +++ b/pkg/operator/osd/osd_test.go @@ -97,18 +97,18 @@ func testPodDevices(t *testing.T, dataDir, deviceFilter string, allDevices bool) assert.Equal(t, "osd", cont.Args[0]) // verify the config dir env var - verifyEnvVar(t, cont.Env, "ROOKD_CONFIG_DIR", "/var/lib/rook", true) + verifyEnvVar(t, cont.Env, "ROOK_CONFIG_DIR", "/var/lib/rook", true) // verify the osd store type env var uses the default - verifyEnvVar(t, cont.Env, "ROOKD_OSD_STORE", cephosd.DefaultStore, true) + verifyEnvVar(t, cont.Env, "ROOK_OSD_STORE", cephosd.DefaultStore, true) // verify the device filter env var if deviceFilter != "" { - verifyEnvVar(t, cont.Env, "ROOKD_DATA_DEVICE_FILTER", deviceFilter, true) + verifyEnvVar(t, cont.Env, "ROOK_DATA_DEVICE_FILTER", deviceFilter, true) } else if allDevices { - verifyEnvVar(t, cont.Env, "ROOKD_DATA_DEVICE_FILTER", "all", true) + verifyEnvVar(t, cont.Env, "ROOK_DATA_DEVICE_FILTER", "all", true) } else { - verifyEnvVar(t, cont.Env, "ROOKD_DATA_DEVICE_FILTER", "", false) + verifyEnvVar(t, cont.Env, "ROOK_DATA_DEVICE_FILTER", "", false) } } @@ -156,8 +156,8 @@ func TestStorageSpecDevicesAndDirectories(t *testing.T) { assert.Equal(t, "/rook/dir1", container.VolumeMounts[3].MountPath) // container command should have the given dir and device - verifyEnvVar(t, container.Env, "ROOKD_DATA_DIRECTORIES", "/rook/dir1", true) - verifyEnvVar(t, container.Env, "ROOKD_DATA_DEVICES", "sda", true) + verifyEnvVar(t, container.Env, "ROOK_DATA_DIRECTORIES", "/rook/dir1", true) + verifyEnvVar(t, container.Env, "ROOK_DATA_DEVICES", "sda", true) } func TestStorageSpecConfig(t *testing.T) { @@ -188,9 +188,9 @@ func TestStorageSpecConfig(t *testing.T) { container := replicaSet.Spec.Template.Spec.Containers[0] assert.NotNil(t, container) - verifyEnvVar(t, container.Env, "ROOKD_OSD_STORE", cephosd.Bluestore, true) - verifyEnvVar(t, container.Env, "ROOKD_OSD_DATABASE_SIZE", strconv.Itoa(10), true) - verifyEnvVar(t, container.Env, "ROOKD_OSD_WAL_SIZE", strconv.Itoa(20), true) - verifyEnvVar(t, container.Env, "ROOKD_OSD_JOURNAL_SIZE", strconv.Itoa(30), true) - verifyEnvVar(t, container.Env, "ROOKD_LOCATION", "rack=foo", true) + verifyEnvVar(t, container.Env, "ROOK_OSD_STORE", cephosd.Bluestore, true) + verifyEnvVar(t, container.Env, "ROOK_OSD_DATABASE_SIZE", strconv.Itoa(10), true) + verifyEnvVar(t, container.Env, "ROOK_OSD_WAL_SIZE", strconv.Itoa(20), true) + verifyEnvVar(t, container.Env, "ROOK_OSD_JOURNAL_SIZE", strconv.Itoa(30), true) + verifyEnvVar(t, container.Env, "ROOK_LOCATION", "rack=foo", true) } diff --git a/pkg/operator/rgw/rgw.go b/pkg/operator/rgw/rgw.go index 55c8c9e3d..37f804d14 100644 --- a/pkg/operator/rgw/rgw.go +++ b/pkg/operator/rgw/rgw.go @@ -168,7 +168,7 @@ func (c *Cluster) rgwContainer() v1.Container { k8sutil.ConfigOverrideMount(), }, Env: []v1.EnvVar{ - {Name: "ROOKD_RGW_KEYRING", ValueFrom: &v1.EnvVarSource{SecretKeyRef: &v1.SecretKeySelector{LocalObjectReference: v1.LocalObjectReference{Name: appName}, Key: keyringName}}}, + {Name: "ROOK_RGW_KEYRING", ValueFrom: &v1.EnvVarSource{SecretKeyRef: &v1.SecretKeySelector{LocalObjectReference: v1.LocalObjectReference{Name: appName}, Key: keyringName}}}, k8sutil.PodIPEnvVar(k8sutil.PrivateIPEnvVar), k8sutil.PodIPEnvVar(k8sutil.PublicIPEnvVar), opmon.ClusterNameEnvVar(c.Namespace), diff --git a/tests/framework/installer/install_data.go b/tests/framework/installer/install_data.go index 9f97105d8..191d312aa 100644 --- a/tests/framework/installer/install_data.go +++ b/tests/framework/installer/install_data.go @@ -46,7 +46,7 @@ spec: image: rook/rook:master args: ["operator"] env: - - name: ROOKD_REPO_PREFIX + - name: ROOK_REPO_PREFIX value: roo` } @@ -165,7 +165,7 @@ spec: image: rook/rook:master args: ["operator"] env: - - name: ROOKD_REPO_PREFIX + - name: ROOK_REPO_PREFIX value: rook` } @@ -254,7 +254,7 @@ spec: imagePullPolicy: IfNotPresent args: ["sleep", "36500d"] env: - - name: ROOKD_ADMIN_SECRET + - name: ROOK_ADMIN_SECRET valueFrom: secretKeyRef: name: rook-ceph-mon